Skip to content

Commit a5ebb76

Browse files
committed
Merge tag 'edac_urgent_for_v7.3_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fix from Borislav Petkov: - amd64_edac: Shorten the ErrorInformation field read from the MCA_SYND MSR to only two bits. It is perfectly fine to do so because no system ever supported more than 2 bits of information (the Chip Selects used were only 4 maximum) and newer hardware will use only 2 bits anyway * tag 'edac_urgent_for_v7.3_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: EDAC/amd64: Mask UMC chip select to the four implemented selects
2 parents bb934c2 + 7484bc4 commit a5ebb76

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎drivers/edac/amd64_edac.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2796,13 +2796,13 @@ static inline void decode_bus_error(int node_id, struct mce *m)
27962796
* the instance_id. For example, instance_id=0xYXXXXX where Y is the channel
27972797
* number.
27982798
*
2799-
* For DRAM ECC errors, the Chip Select number is given in bits [2:0] of
2799+
* For DRAM ECC errors, the Chip Select number is given in bits [1:0] of
28002800
* the MCA_SYND[ErrorInformation] field.
28012801
*/
28022802
static void umc_get_err_info(struct mce *m, struct err_info *err)
28032803
{
28042804
err->channel = (m->ipid & GENMASK(31, 0)) >> 20;
2805-
err->csrow = m->synd & 0x7;
2805+
err->csrow = m->synd & 0x3;
28062806
}
28072807

28082808
static void decode_umc_error(int node_id, struct mce *m)

0 commit comments

Comments
 (0)