evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

amd64_edac: cleanup f10_early_channel_count

Browse source 
Do not read DCLR[01] again since this is done in
amd64_read_mc_registers() earlier. There can be more than two physical
DIMMs present so clamp the channels value to max 2. Also, do not report
DCT data width - it is also done earlier.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
This commit is contained in:
Borislav Petkov 2009-10-16 19:55:49 +02:00
parent 8566c4df16
commit d16149e8c3
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/edac/amd64_edac.c
View file

@ -1204,28 +1204,21 @@ static int f10_early_channel_count(struct amd64_pvt *pvt)
int i, j, channels = 0; int i, j, channels = 0;
u32 dbam; u32 dbam;
if (amd64_read_pci_cfg(pvt->dram_f2_ctl, F10_DCLR_0, &pvt->dclr0))
goto err_reg;
if (amd64_read_pci_cfg(pvt->dram_f2_ctl, F10_DCLR_1, &pvt->dclr1))
goto err_reg;
/* If we are in 128 bit mode, then we are using 2 channels */ /* If we are in 128 bit mode, then we are using 2 channels */
if (pvt->dclr0 & F10_WIDTH_128) { if (pvt->dclr0 & F10_WIDTH_128) {
debugf0("Data WIDTH is 128 bits - 2 channels\n");
channels = 2; channels = 2;
return channels; return channels;
} }
/* /*
* Need to check if in UN-ganged mode: In such, there are 2 channels, * Need to check if in unganged mode: In such, there are 2 channels,
* but they are NOT in 128 bit mode and thus the above 'dcl0' status bit * but they are not in 128 bit mode and thus the above 'dclr0' status
* will be OFF. * bit will be OFF.
* *
* Need to check DCT0[0] and DCT1[0] to see if only one of them has * Need to check DCT0[0] and DCT1[0] to see if only one of them has
* their CSEnable bit on. If so, then SINGLE DIMM case. * their CSEnable bit on. If so, then SINGLE DIMM case.
*/ */
debugf0("Data WIDTH is NOT 128 bits - need more decoding\n"); debugf0("Data width is not 128 bits - need more decoding\n");
/* /*
* Check DRAM Bank Address Mapping values for each DIMM to see if there * Check DRAM Bank Address Mapping values for each DIMM to see if there
@ -1244,6 +1237,9 @@ static int f10_early_channel_count(struct amd64_pvt *pvt)
} }
} }
if (channels > 2)
channels = 2;
debugf0("MCT channel count: %d\n", channels); debugf0("MCT channel count: %d\n", channels);
return channels; return channels;