diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-02 12:52:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-02 12:52:31 -0400 |
| commit | 4b78c119f0ba715b4e29b190bf4d7bce810ea0d6 (patch) | |
| tree | 92bd694fab05988654849e77c789a4fcd18d8f8f /drivers | |
| parent | 97e0214044d9f279a3d6286c9f859696ef0b7ebe (diff) | |
| parent | 41c310447fe06bcedc22b75752c18b60e0b9521b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Fix syndrome calculation on K8
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/amd64_edac.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index cf17dbb8014f..ac9f7985096d 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c | |||
| @@ -1958,20 +1958,20 @@ static int get_channel_from_ecc_syndrome(struct mem_ctl_info *mci, u16 syndrome) | |||
| 1958 | u32 value = 0; | 1958 | u32 value = 0; |
| 1959 | int err_sym = 0; | 1959 | int err_sym = 0; |
| 1960 | 1960 | ||
| 1961 | amd64_read_pci_cfg(pvt->misc_f3_ctl, 0x180, &value); | 1961 | if (boot_cpu_data.x86 == 0x10) { |
| 1962 | 1962 | ||
| 1963 | /* F3x180[EccSymbolSize]=1, x8 symbols */ | 1963 | amd64_read_pci_cfg(pvt->misc_f3_ctl, 0x180, &value); |
| 1964 | if (boot_cpu_data.x86 == 0x10 && | 1964 | |
| 1965 | boot_cpu_data.x86_model > 7 && | 1965 | /* F3x180[EccSymbolSize]=1 => x8 symbols */ |
| 1966 | value & BIT(25)) { | 1966 | if (boot_cpu_data.x86_model > 7 && |
| 1967 | err_sym = decode_syndrome(syndrome, x8_vectors, | 1967 | value & BIT(25)) { |
| 1968 | ARRAY_SIZE(x8_vectors), 8); | 1968 | err_sym = decode_syndrome(syndrome, x8_vectors, |
| 1969 | return map_err_sym_to_channel(err_sym, 8); | 1969 | ARRAY_SIZE(x8_vectors), 8); |
| 1970 | } else { | 1970 | return map_err_sym_to_channel(err_sym, 8); |
| 1971 | err_sym = decode_syndrome(syndrome, x4_vectors, | 1971 | } |
| 1972 | ARRAY_SIZE(x4_vectors), 4); | ||
| 1973 | return map_err_sym_to_channel(err_sym, 4); | ||
| 1974 | } | 1972 | } |
| 1973 | err_sym = decode_syndrome(syndrome, x4_vectors, ARRAY_SIZE(x4_vectors), 4); | ||
| 1974 | return map_err_sym_to_channel(err_sym, 4); | ||
| 1975 | } | 1975 | } |
| 1976 | 1976 | ||
| 1977 | /* | 1977 | /* |