[RFC 3/6] x86, NMI, Rename memory parity error to PCI SERR error

Huang Ying
2010-09-10T02:51:13Z

memory parity error is only valid for IBM PC-AT, newer machine use 7
bit (0x80) of 0x61 port for PCI SERR. While memory error is usually
reported via MCE. So corresponding function name and kernel log string
is changed.

Signed-off-by: Huang Ying <ying.huang@intel.com>
---
arch/x86/include/asm/mach_traps.h | 6 +++---
arch/x86/kernel/traps.c | 24 ++++++------------------
2 files changed, 9 insertions(+), 21 deletions(-)

--- a/arch/x86/include/asm/mach_traps.h
+++ b/arch/x86/include/asm/mach_traps.h
@@ -9,11 +9,11 @@

#define NMI_REASON_PORT 0x61

-#define NMI_REASON_MEMPAR 0x80
+#define NMI_REASON_SERR 0x80
#define NMI_REASON_IOCHK 0x40
-#define NMI_REASON_MASK (NMI_REASON_MEMPAR | NMI_REASON_IOCHK)
+#define NMI_REASON_MASK (NMI_REASON_SERR | NMI_REASON_IOCHK)

-#define NMI_REASON_CLEAR_MEMPAR 0x04
+#define NMI_REASON_CLEAR_SERR 0x04
#define NMI_REASON_CLEAR_IOCHK 0x08
#define NMI_REASON_CLEAR_MASK 0x0f

--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -301,29 +301,17 @@ gp_in_kernel:
}

static notrace __kprobes void
-mem_parity_error(unsigned char reason, struct pt_regs *regs)
+pci_serr_error(unsigned char reason, struct pt_regs *regs)
{
- printk(KERN_EMERG
- "Uhhuh. NMI received for unknown reason %02x on CPU %d.\n",
- reason, smp_processor_id());
-
- printk(KERN_EMERG
- "You have some hardware problem, likely on the PCI bus.\n");
-
-#if defined(CONFIG_EDAC)
- if (edac_handler_set()) {
- edac_atomic_assert_error();
- return;
- }
-#endif
+ printk(KERN_EMERG "NMI: PCI system error (SERR).\n");

if (panic_on_unrecovered_nmi)
panic("NMI: Not continuing");

printk(KERN_EMERG "Dazed and confused, but trying to continue\n");

- /* Clear and disable the memory parity error line. */
- reason = (reason & NMI_REASON_CLEAR_MASK) | NMI_REASON_CLEAR_MEMPAR;
+ /* Clear and disable the PCI SERR error line. */
+ reason = (reason & NMI_REASON_CLEAR_MASK) | NMI_REASON_CLEAR_SERR;
outb(reason, NMI_REASON_PORT);
}

@@ -420,8 +408,8 @@ static notrace __kprobes void default_do
return;

/* AK: following checks seem to be broken on modern chipsets. FIXME */
- if (reason & NMI_REASON_MEMPAR)
- mem_parity_error(reason, regs);
+ if (reason & NMI_REASON_SERR)
+ pci_serr_error(reason, regs);
if (reason & NMI_REASON_IOCHK)
io_check_error(reason, regs);
#ifdef CONFIG_X86_32