Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+12
-12
+12
-12
drivers/edac/amd64_edac.c
+12
-12
drivers/edac/amd64_edac.c
···
1958
1958
u32 value = 0;
1959
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 */
1964
-
if (boot_cpu_data.x86 == 0x10 &&
1965
-
boot_cpu_data.x86_model > 7 &&
1966
-
value & BIT(25)) {
1967
-
err_sym = decode_syndrome(syndrome, x8_vectors,
1968
-
ARRAY_SIZE(x8_vectors), 8);
1969
-
return map_err_sym_to_channel(err_sym, 8);
1970
-
} else {
1971
-
err_sym = decode_syndrome(syndrome, x4_vectors,
1972
-
ARRAY_SIZE(x4_vectors), 4);
1973
-
return map_err_sym_to_channel(err_sym, 4);
1963
+
amd64_read_pci_cfg(pvt->misc_f3_ctl, 0x180, &value);
1964
+
1965
+
/* F3x180[EccSymbolSize]=1 => x8 symbols */
1966
+
if (boot_cpu_data.x86_model > 7 &&
1967
+
value & BIT(25)) {
1968
+
err_sym = decode_syndrome(syndrome, x8_vectors,
1969
+
ARRAY_SIZE(x8_vectors), 8);
1970
+
return map_err_sym_to_channel(err_sym, 8);
1971
+
}
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
/*