Commit ccd3cd36 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/mce: Move 64-bit machine check code into mce.c 



We already have mce.c which is built for 64bit and contains other parts
of the machine check code, so move these bits in there too.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 7f3f819e

arch/powerpc/kernel/mce.c

+33 −0
Original line number Original line Diff line number Diff line
@@ -22,11 +22,14 @@ 
#undef DEBUG

#undef DEBUG

#define pr_fmt(fmt) "mce: " fmt

#define pr_fmt(fmt) "mce: " fmt





#include <linux/hardirq.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/ptrace.h>

#include <linux/ptrace.h>

#include <linux/percpu.h>

#include <linux/percpu.h>

#include <linux/export.h>

#include <linux/export.h>

#include <linux/irq_work.h>

#include <linux/irq_work.h>



#include <asm/machdep.h>

#include <asm/mce.h>

#include <asm/mce.h>





static DEFINE_PER_CPU(int, mce_nest_count);

static DEFINE_PER_CPU(int, mce_nest_count);
@@ -446,3 +449,33 @@ uint64_t get_mce_fault_addr(struct machine_check_event *evt) 
	return 0;

	return 0;

}

}

EXPORT_SYMBOL(get_mce_fault_addr);

EXPORT_SYMBOL(get_mce_fault_addr);



/*

 * This function is called in real mode. Strictly no printk's please.

 *

 * regs->nip and regs->msr contains srr0 and ssr1.

 */

long machine_check_early(struct pt_regs *regs)

{

	long handled = 0;



	__this_cpu_inc(irq_stat.mce_exceptions);



	if (cur_cpu_spec && cur_cpu_spec->machine_check_early)

		handled = cur_cpu_spec->machine_check_early(regs);

	return handled;

}



long hmi_exception_realmode(struct pt_regs *regs)

{

	__this_cpu_inc(irq_stat.hmi_exceptions);



	wait_for_subcore_guest_exit();



	if (ppc_md.hmi_exception_early)

		ppc_md.hmi_exception_early(regs);



	wait_for_tb_resync();



	return 0;

}

arch/powerpc/kernel/traps.c

+0 −33
Original line number Original line Diff line number Diff line
@@ -314,39 +314,6 @@ void system_reset_exception(struct pt_regs *regs) 
	/* What should we do here? We could issue a shutdown or hard reset. */

	/* What should we do here? We could issue a shutdown or hard reset. */

}

}





#ifdef CONFIG_PPC64

/*

 * This function is called in real mode. Strictly no printk's please.

 *

 * regs->nip and regs->msr contains srr0 and ssr1.

 */

long machine_check_early(struct pt_regs *regs)

{

	long handled = 0;



	__this_cpu_inc(irq_stat.mce_exceptions);



	if (cur_cpu_spec && cur_cpu_spec->machine_check_early)

		handled = cur_cpu_spec->machine_check_early(regs);

	return handled;

}



long hmi_exception_realmode(struct pt_regs *regs)

{

	__this_cpu_inc(irq_stat.hmi_exceptions);



	wait_for_subcore_guest_exit();



	if (ppc_md.hmi_exception_early)

		ppc_md.hmi_exception_early(regs);



	wait_for_tb_resync();



	return 0;

}



#endif



/*

/*

 * I/O accesses can cause machine checks on powermacs.

 * I/O accesses can cause machine checks on powermacs.

 * Check if the NIP corresponds to the address of a sync

 * Check if the NIP corresponds to the address of a sync