mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-25 10:59:05 +00:00
powerpc/8xx: Move 8xx machine check handlers into platforms/8xx
In the same spirit as what was done for 4xx and 44x, move the 8xx machine check into platforms/8xx Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
0e23e7b32b
commit
f70b1e8d17
@ -560,31 +560,6 @@ int machine_check_e200(struct pt_regs *regs)
|
||||
|
||||
return 0;
|
||||
}
|
||||
#elif defined(CONFIG_PPC_8xx)
|
||||
int machine_check_8xx(struct pt_regs *regs)
|
||||
{
|
||||
unsigned long reason = regs->msr;
|
||||
|
||||
pr_err("Machine check in kernel mode.\n");
|
||||
pr_err("Caused by (from SRR1=%lx): ", reason);
|
||||
if (reason & 0x40000000)
|
||||
pr_err("Fetch error at address %lx\n", regs->nip);
|
||||
else
|
||||
pr_err("Data access error at address %lx\n", regs->dar);
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
/* the qspan pci read routines can cause machine checks -- Cort
|
||||
*
|
||||
* yuck !!! that totally needs to go away ! There are better ways
|
||||
* to deal with that than having a wart in the mcheck handler.
|
||||
* -- BenH
|
||||
*/
|
||||
bad_page_fault(regs, regs->dar, SIGBUS);
|
||||
return 1;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
#elif defined(CONFIG_PPC32)
|
||||
int machine_check_generic(struct pt_regs *regs)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for the PowerPC 8xx linux kernel.
|
||||
#
|
||||
obj-y += m8xx_setup.o
|
||||
obj-y += m8xx_setup.o machine_check.o
|
||||
obj-$(CONFIG_MPC885ADS) += mpc885ads_setup.o
|
||||
obj-$(CONFIG_MPC86XADS) += mpc86xads_setup.o
|
||||
obj-$(CONFIG_PPC_EP88XC) += ep88xc.o
|
||||
|
37
arch/powerpc/platforms/8xx/machine_check.c
Normal file
37
arch/powerpc/platforms/8xx/machine_check.c
Normal file
@ -0,0 +1,37 @@
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/printk.h>
|
||||
#include <linux/ptrace.h>
|
||||
|
||||
#include <asm/reg.h>
|
||||
|
||||
int machine_check_8xx(struct pt_regs *regs)
|
||||
{
|
||||
unsigned long reason = regs->msr;
|
||||
|
||||
pr_err("Machine check in kernel mode.\n");
|
||||
pr_err("Caused by (from SRR1=%lx): ", reason);
|
||||
if (reason & 0x40000000)
|
||||
pr_err("Fetch error at address %lx\n", regs->nip);
|
||||
else
|
||||
pr_err("Data access error at address %lx\n", regs->dar);
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
/* the qspan pci read routines can cause machine checks -- Cort
|
||||
*
|
||||
* yuck !!! that totally needs to go away ! There are better ways
|
||||
* to deal with that than having a wart in the mcheck handler.
|
||||
* -- BenH
|
||||
*/
|
||||
bad_page_fault(regs, regs->dar, SIGBUS);
|
||||
return 1;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
Loading…
Reference in New Issue
Block a user