Attachment 299810 Details for Bug 438471 – EDAC refactor

EDAC refactor

patch-refactor-opstate-RH-v1 (text/plain), 10.90 KB, created by IBM Bug Proxy on 2008-04-01 02:48:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2008-04-01 02:48:47 UTC

Size: 10.90 KB

patch

obsolete

>diff -urN linux-2.6.24.3.x86_64/drivers/edac/amd76x_edac.c kernel-2.6.24.3-work/drivers/edac/amd76x_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/amd76x_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/amd76x_edac.c	2008-03-15 18:35:31.000000000 -0400
>@@ -344,6 +344,9 @@
> 
> static int __init amd76x_init(void)
> {
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	return pci_register_driver(&amd76x_driver);
> }
> 
>@@ -358,3 +361,6 @@
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh");
> MODULE_DESCRIPTION("MC support for AMD 76x memory controllers");
>+
>+module_param(edac_op_state, int, 0444);
>+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/e752x_edac.c kernel-2.6.24.3-work/drivers/edac/e752x_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/e752x_edac.c	2008-03-15 18:49:43.000000000 -0400
>+++ kernel-2.6.24.3-work/drivers/edac/e752x_edac.c	2008-03-15 18:51:01.000000000 -0400
>@@ -949,16 +949,6 @@
> 	debugf0("%s(): mci\n", __func__);
> 	debugf0("Starting Probe1\n");
> 
>-	/* make sure error reporting method is sane */
>-	switch (edac_op_state) {
>-	case EDAC_OPSTATE_POLL:
>-	case EDAC_OPSTATE_NMI:
>-		break;
>-	default:
>-		edac_op_state = EDAC_OPSTATE_POLL;
>-		break;
>-	}
>-
> 	/* check to see if device 0 function 1 is enabled; if it isn't, we
> 	 * assume the BIOS has reserved it for a reason and is expecting
> 	 * exclusive access, we take care not to violate that assumption and
>@@ -1128,6 +1118,10 @@
> 	int pci_rc;
> 
> 	debugf3("%s()\n", __func__);
>+
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	pci_rc = pci_register_driver(&e752x_driver);
> 	return (pci_rc < 0) ? pci_rc : 0;
> }
>@@ -1148,5 +1142,6 @@
> module_param(force_function_unhide, int, 0444);
> MODULE_PARM_DESC(force_function_unhide, "if BIOS sets Dev0:Fun1 up as hidden:"
> 		 " 1=force unhide and hope BIOS doesn't fight driver for Dev0:Fun1 access");
>+
> module_param(edac_op_state, int, 0444);
> MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/e7xxx_edac.c kernel-2.6.24.3-work/drivers/edac/e7xxx_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/e7xxx_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/e7xxx_edac.c	2008-03-15 18:35:31.000000000 -0400
>@@ -414,16 +414,6 @@
> 
> 	debugf0("%s(): mci\n", __func__);
> 
>-	/* make sure error reporting method is sane */
>-	switch (edac_op_state) {
>-	case EDAC_OPSTATE_POLL:
>-	case EDAC_OPSTATE_NMI:
>-		break;
>-	default:
>-		edac_op_state = EDAC_OPSTATE_POLL;
>-		break;
>-	}
>-
> 	pci_read_config_dword(pdev, E7XXX_DRC, &drc);
> 
> 	drc_chan = dual_channel_active(drc, dev_idx);
>@@ -565,6 +555,9 @@
> 
> static int __init e7xxx_init(void)
> {
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	return pci_register_driver(&e7xxx_driver);
> }
> 
>@@ -581,4 +574,7 @@
> 		"Based on.work by Dan Hollis et al");
> MODULE_DESCRIPTION("MC support for Intel e7xxx memory controllers");
> module_param(edac_op_state, int, 0444);
>+
>+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>+module_param(edac_op_state, int, 0444);
> MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/i3000_edac.c kernel-2.6.24.3-work/drivers/edac/i3000_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/i3000_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/i3000_edac.c	2008-03-15 18:42:50.000000000 -0400
>@@ -453,6 +453,10 @@
> 	int pci_rc;
> 
> 	debugf3("MC: %s()\n", __func__);
>+
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	pci_rc = pci_register_driver(&i3000_driver);
> 	if (pci_rc < 0)
> 		goto fail0;
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/i5000_edac.c kernel-2.6.24.3-work/drivers/edac/i5000_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/i5000_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/i5000_edac.c	2008-03-15 18:35:37.000000000 -0400
>@@ -1286,16 +1286,6 @@
> 	if (PCI_FUNC(pdev->devfn) != 0)
> 		return -ENODEV;
> 
>-	/* make sure error reporting method is sane */
>-	switch (edac_op_state) {
>-	case EDAC_OPSTATE_POLL:
>-	case EDAC_OPSTATE_NMI:
>-		break;
>-	default:
>-		edac_op_state = EDAC_OPSTATE_POLL;
>-		break;
>-	}
>-
> 	/* Ask the devices for the number of CSROWS and CHANNELS so
> 	 * that we can calculate the memory resources, etc
> 	 *
>@@ -1478,6 +1468,9 @@
> 
> 	debugf2("MC: " __FILE__ ": %s()\n", __func__);
> 
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	pci_rc = pci_register_driver(&i5000_driver);
> 
> 	return (pci_rc < 0) ? pci_rc : 0;
>@@ -1501,5 +1494,6 @@
>     ("Linux Networx (http://lnxi.com) Doug Thompson <norsk5@xmission.com>");
> MODULE_DESCRIPTION("MC Driver for Intel I5000 memory controllers - "
> 		I5000_REVISION);
>+
> module_param(edac_op_state, int, 0444);
> MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/i82443bxgx_edac.c kernel-2.6.24.3-work/drivers/edac/i82443bxgx_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/i82443bxgx_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/i82443bxgx_edac.c	2008-03-15 18:35:31.000000000 -0400
>@@ -29,6 +29,7 @@
> 
> #include <linux/slab.h>
> 
>+#include <linux/edac.h>
> #include "edac_core.h"
> 
> #define I82443_REVISION	"0.1"
>@@ -386,6 +387,9 @@
> 
> static int __init i82443bxgx_edacmc_init(void)
> {
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	return pci_register_driver(&i82443bxgx_edacmc_driver);
> }
> 
>@@ -400,3 +404,6 @@
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Tim Small <tim@buttersideup.com> - WPAD");
> MODULE_DESCRIPTION("EDAC MC support for Intel 82443BX/GX memory controllers");
>+
>+module_param(edac_op_state, int, 0444);
>+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/i82860_edac.c kernel-2.6.24.3-work/drivers/edac/i82860_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/i82860_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/i82860_edac.c	2008-03-15 18:35:31.000000000 -0400
>@@ -14,6 +14,7 @@
> #include <linux/pci.h>
> #include <linux/pci_ids.h>
> #include <linux/slab.h>
>+#include <linux/edac.h>
> #include "edac_core.h"
> 
> #define  I82860_REVISION " Ver: 2.0.2 " __DATE__
>@@ -294,6 +295,9 @@
> 
> 	debugf3("%s()\n", __func__);
> 
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	if ((pci_rc = pci_register_driver(&i82860_driver)) < 0)
> 		goto fail0;
> 
>@@ -345,3 +349,6 @@
> MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com) "
> 		"Ben Woodard <woodard@redhat.com>");
> MODULE_DESCRIPTION("ECC support for Intel 82860 memory hub controllers");
>+
>+module_param(edac_op_state, int, 0444);
>+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/i82875p_edac.c kernel-2.6.24.3-work/drivers/edac/i82875p_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/i82875p_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/i82875p_edac.c	2008-03-15 18:35:31.000000000 -0400
>@@ -18,6 +18,7 @@
> #include <linux/pci.h>
> #include <linux/pci_ids.h>
> #include <linux/slab.h>
>+#include <linux/edac.h>
> #include "edac_core.h"
> 
> #define I82875P_REVISION	" Ver: 2.0.2 " __DATE__
>@@ -393,6 +394,7 @@
> 	struct i82875p_error_info discard;
> 
> 	debugf0("%s()\n", __func__);
>+
> 	ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);
> 
> 	if (i82875p_setup_overfl_dev(pdev, &ovrfl_pdev, &ovrfl_window))
>@@ -532,6 +534,10 @@
> 	int pci_rc;
> 
> 	debugf3("%s()\n", __func__);
>+
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	pci_rc = pci_register_driver(&i82875p_driver);
> 
> 	if (pci_rc < 0)
>@@ -586,3 +592,6 @@
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh");
> MODULE_DESCRIPTION("MC support for Intel 82875 memory hub controllers");
>+
>+module_param(edac_op_state, int, 0444);
>+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/i82975x_edac.c kernel-2.6.24.3-work/drivers/edac/i82975x_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/i82975x_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/i82975x_edac.c	2008-03-15 18:35:31.000000000 -0400
>@@ -14,7 +14,7 @@
> #include <linux/pci.h>
> #include <linux/pci_ids.h>
> #include <linux/slab.h>
>-
>+#include <linux/edac.h>
> #include "edac_core.h"
> 
> #define I82975X_REVISION	" Ver: 1.0.0 " __DATE__
>@@ -611,6 +611,9 @@
> 
> 	debugf3("%s()\n", __func__);
> 
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	pci_rc = pci_register_driver(&i82975x_driver);
> 	if (pci_rc < 0)
> 		goto fail0;
>@@ -664,3 +667,6 @@
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Arvind R. <arvind@acarlab.com>");
> MODULE_DESCRIPTION("MC support for Intel 82975 memory hub controllers");
>+
>+module_param(edac_op_state, int, 0444);
>+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/pasemi_edac.c kernel-2.6.24.3-work/drivers/edac/pasemi_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/pasemi_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/pasemi_edac.c	2008-03-15 18:43:43.000000000 -0400
>@@ -284,6 +284,9 @@
> 
> static int __init pasemi_edac_init(void)
> {
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	return pci_register_driver(&pasemi_edac_driver);
> }
>
>diff -urN linux-2.6.24.3.x86_64/drivers/edac/r82600_edac.c kernel-2.6.24.3-work/drivers/edac/r82600_edac.c
>--- linux-2.6.24.3.x86_64/drivers/edac/r82600_edac.c	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/drivers/edac/r82600_edac.c	2008-03-15 18:35:37.000000000 -0400
>@@ -393,6 +393,9 @@
> 
> static int __init r82600_init(void)
> {
>+	/* Ensure that the OPSTATE is set correctly for POLL or NMI */
>+	opstate_init();
>+
> 	return pci_register_driver(&r82600_driver);
> }
> 
>@@ -412,3 +415,6 @@
> module_param(disable_hardware_scrub, bool, 0644);
> MODULE_PARM_DESC(disable_hardware_scrub,
> 		 "If set, disable the chipset's automatic scrub for CEs");
>+
>+module_param(edac_op_state, int, 0444);
>+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
>diff -urN linux-2.6.24.3.x86_64/include/linux/edac.h kernel-2.6.24.3-work/include/linux/edac.h
>--- linux-2.6.24.3.x86_64/include/linux/edac.h	2008-01-24 17:58:37.000000000 -0500
>+++ kernel-2.6.24.3-work/include/linux/edac.h	2008-03-15 18:35:31.000000000 -0400
>@@ -26,4 +26,16 @@
> extern int edac_handler_set(void);
> extern void edac_atomic_assert_error(void);
> 
>+static inline void opstate_init(void)
>+{
>+  switch(edac_op_state) {
>+  case EDAC_OPSTATE_POLL:
>+  case EDAC_OPSTATE_NMI:
>+    break;
>+  default:
>+    edac_op_state = EDAC_OPSTATE_POLL;
>+  }
>+  return;
>+}
>+
> #endif

Actions: View

Attachments on bug 438471: 299808 | 299809 | 299810 | 299811 | 299812