diff options
Diffstat (limited to 'drivers/edac/amd64_edac.c')
| -rw-r--r-- | drivers/edac/amd64_edac.c | 9 | 
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 858fe603722..e2a10bcba7a 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -868,6 +868,8 @@ static void amd64_read_dbam_reg(struct amd64_pvt *pvt)  			goto err_reg;  	} +	return; +  err_reg:  	debugf0("Error reading F2x%03x.\n", reg);  } @@ -970,7 +972,7 @@ static void amd64_read_dct_base_mask(struct amd64_pvt *pvt)  	}  	for (cs = 0; cs < pvt->num_dcsm; cs++) { -		reg = K8_DCSB0 + (cs * 4); +		reg = K8_DCSM0 + (cs * 4);  		err = pci_read_config_dword(pvt->dram_f2_ctl, reg,  					&pvt->dcsm0[cs]);  		if (unlikely(err)) @@ -2634,6 +2636,8 @@ static void amd64_read_mc_registers(struct amd64_pvt *pvt)  	amd64_dump_misc_regs(pvt); +	return; +  err_reg:  	debugf0("Reading an MC register failed\n"); @@ -2977,6 +2981,9 @@ static int amd64_check_ecc_enabled(struct amd64_pvt *pvt)  			"ECC is enabled by BIOS, Proceeding "  			"with EDAC module initialization\n"); +		/* Signal good ECC status */ +		ret = 0; +  		/* CLEAR the override, since BIOS controlled it */  		ecc_enable_override = 0;  	}  |