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

Commit 749ede57 authored by Dave Peterson's avatar Dave Peterson Committed by Linus Torvalds
Browse files

[PATCH] EDAC: cleanup code for clearing initial errors 



Fix xxx_probe1() functions so they call xxx_get_error_info() functions
to clear initial errors.  This is simpler and cleaner than duplicating
the low-level code for accessing PCI config space.

Signed-off-by: default avatarDavid S. Peterson <dsp@llnl.gov>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d38fde84

drivers/edac/amd76x_edac.c

+2 −3
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
	};

	u32 ems;

	u32 ems_mode;

	struct amd76x_error_info discard;



	debugf0("%s()\n", __func__);
@@ -270,9 +271,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
		csrow->edac_mode = ems_modes[ems_mode];

	}



	/* clear counters */

	pci_write_bits32(mci->pdev, AMD76X_ECC_MODE_STATUS, (u32) (0x3 << 8),

			 (u32) (0x3 << 8));

	amd76x_get_error_info(mci, &discard);  /* clear counters */



	if (edac_mc_add_mc(mci)) {

		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);

drivers/edac/e752x_edac.c

+2 −20
Original line number Diff line number Diff line
@@ -747,8 +747,6 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
	int rc = -ENODEV;

	int index;

	u16 pci_data;

	u32 stat32;

	u16 stat16;

	u8 stat8;

	struct mem_ctl_info *mci = NULL;

	struct e752x_pvt *pvt = NULL;
@@ -760,6 +758,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
	u32 dra;

	unsigned long last_cumul_size;

	struct pci_dev *dev = NULL;

	struct e752x_error_info discard;



	debugf0("%s(): mci\n", __func__);

	debugf0("Starting Probe1\n");
@@ -938,24 +937,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
	pci_write_config_byte(dev, E752X_DRAM_ERRMASK, 0x00);

	pci_write_config_byte(dev, E752X_DRAM_SMICMD, 0x00);

	/* clear other MCH errors */

	pci_read_config_dword(dev, E752X_FERR_GLOBAL, &stat32);

	pci_write_config_dword(dev, E752X_FERR_GLOBAL, stat32);

	pci_read_config_dword(dev, E752X_NERR_GLOBAL, &stat32);

	pci_write_config_dword(dev, E752X_NERR_GLOBAL, stat32);

	pci_read_config_byte(dev, E752X_HI_FERR, &stat8);

	pci_write_config_byte(dev, E752X_HI_FERR, stat8);

	pci_read_config_byte(dev, E752X_HI_NERR, &stat8);

	pci_write_config_byte(dev, E752X_HI_NERR, stat8);

	pci_read_config_dword(dev, E752X_SYSBUS_FERR, &stat32);

	pci_write_config_dword(dev, E752X_SYSBUS_FERR, stat32);

	pci_read_config_byte(dev, E752X_BUF_FERR, &stat8);

	pci_write_config_byte(dev, E752X_BUF_FERR, stat8);

	pci_read_config_byte(dev, E752X_BUF_NERR, &stat8);

	pci_write_config_byte(dev, E752X_BUF_NERR, stat8);

	pci_read_config_word(dev, E752X_DRAM_FERR, &stat16);

	pci_write_config_word(dev, E752X_DRAM_FERR, stat16);

	pci_read_config_word(dev, E752X_DRAM_NERR, &stat16);

	pci_write_config_word(dev, E752X_DRAM_NERR, stat16);

	e752x_get_error_info(mci, &discard);



	/* get this far and it's successful */

	debugf3("%s(): success\n", __func__);

drivers/edac/e7xxx_edac.c

+2 −3
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) 
	int drc_ddim;		/* DRAM Data Integrity Mode 0=none,2=edac */

	u32 dra;

	unsigned long last_cumul_size;



	struct e7xxx_error_info discard;



	debugf0("%s(): mci\n", __func__);
@@ -470,8 +470,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) 
		     pvt->tolm, pvt->remapbase, pvt->remaplimit);



	/* clear any pending errors, or initial state bits */

	pci_write_bits8(pvt->bridge_ck, E7XXX_DRAM_FERR, 0x03, 0x03);

	pci_write_bits8(pvt->bridge_ck, E7XXX_DRAM_NERR, 0x03, 0x03);

	e7xxx_get_error_info(mci, &discard);



	if (edac_mc_add_mc(mci) != 0) {

		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);

drivers/edac/edac_mc.c

+0 −3
Original line number Diff line number Diff line
@@ -2095,9 +2095,6 @@ static int __init edac_mc_init(void) 
	 */

	clear_pci_parity_errors();



	/* perform check for first time to harvest boot leftovers */

	do_edac_check();



	/* Create the MC sysfs entires */

	if (edac_sysfs_memctrl_setup()) {

		edac_printk(KERN_ERR, EDAC_MC,

drivers/edac/i82860_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx) 
	int index;

	struct mem_ctl_info *mci = NULL;

	unsigned long last_cumul_size;

	struct i82860_error_info discard;



	u16 mchcfg_ddim;	/* DRAM Data Integrity Mode 0=none,2=edac */
@@ -200,8 +201,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx) 
		csrow->edac_mode = mchcfg_ddim ? EDAC_SECDED : EDAC_NONE;

	}



	/* clear counters */

	pci_write_bits16(mci->pdev, I82860_ERRSTS, 0x0003, 0x0003);

	i82860_get_error_info(mci, &discard);  /* clear counters */



	if (edac_mc_add_mc(mci)) {

		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);