Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3c52bce authored by Hitoshi Mitake's avatar Hitoshi Mitake Committed by Linus Torvalds
Browse files

edac: fix module initialization on several modules 2nd time 



I implemented opstate_init() as a inline function in linux/edac.h.

added calling opstate_init() to:
	i82443bxgx_edac.c
	i82860_edac.c
	i82875p_edac.c
	i82975x_edac.c

I wrote a fixed patch of
edac-fix-module-initialization-on-several-modules.patch,
and tested building 2.6.25-rc7 with applying this. It was succeed.
I think the patch is now correct.

Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarHitoshi Mitake <h.mitake@gmail.com>
Signed-off-by: default avatarDoug Thompson <dougthompson@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1a45027d

drivers/edac/amd76x_edac.c

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/pci.h>

#include <linux/pci_ids.h>

#include <linux/slab.h>

#include <linux/edac.h>

#include "edac_core.h"



#define AMD76X_REVISION	" Ver: 2.0.2 "  __DATE__
@@ -344,6 +345,9 @@ static struct pci_driver amd76x_driver = { 


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 +362,6 @@ module_exit(amd76x_exit); 
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");

drivers/edac/e752x_edac.c

+5 −10
Original line number Diff line number Diff line
@@ -1117,16 +1117,6 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
	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
@@ -1303,6 +1293,10 @@ static int __init e752x_init(void) 
	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;

}
@@ -1323,6 +1317,7 @@ MODULE_DESCRIPTION("MC support for Intel e752x/3100 memory controllers"); 
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");

drivers/edac/e7xxx_edac.c

+3 −10
Original line number Diff line number Diff line
@@ -414,16 +414,6 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) 


	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 struct pci_driver e7xxx_driver = { 


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);

}

drivers/edac/i3000_edac.c

+4 −9
Original line number Diff line number Diff line
@@ -326,15 +326,6 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) 
		return -ENODEV;

	}



	switch (edac_op_state) {

	case EDAC_OPSTATE_POLL:

	case EDAC_OPSTATE_NMI:

		break;

	default:

		edac_op_state = EDAC_OPSTATE_POLL;

		break;

	}



	c0dra[0] = readb(window + I3000_C0DRA + 0);	/* ranks 0,1 */

	c0dra[1] = readb(window + I3000_C0DRA + 1);	/* ranks 2,3 */

	c1dra[0] = readb(window + I3000_C1DRA + 0);	/* ranks 0,1 */
@@ -503,6 +494,10 @@ static int __init i3000_init(void) 
	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;

drivers/edac/i5000_edac.c

+4 −10
Original line number Diff line number Diff line
@@ -1286,16 +1286,6 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx) 
	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 @@ static int __init i5000_init(void) 


	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 @@ MODULE_AUTHOR 
    ("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");