Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c31044 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

amd64_edac: Fix syndrome calculation on K8 



When calculating the DCT channel from the syndrome we need to know the
syndrome type (x4 vs x8). On F10h, this is read out from extended PCI
cfg space register F3x180 while on K8 we only support x4 syndromes and
don't have extended PCI config space anyway.

Make the code accessing F3x180 F10h only and fall back to x4 syndromes
on everything else.

Cc: <stable@kernel.org> # .33.x .34.x
Reported-by: default avatarJeffrey Merkey <jeffmerkey@gmail.com>
Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
parent 7e27d6e7

drivers/edac/amd64_edac.c

+12 −12
Original line number Diff line number Diff line
@@ -1958,21 +1958,21 @@ static int get_channel_from_ecc_syndrome(struct mem_ctl_info *mci, u16 syndrome) 
	u32 value = 0;

	int err_sym = 0;



	if (boot_cpu_data.x86 == 0x10) {



		amd64_read_pci_cfg(pvt->misc_f3_ctl, 0x180, &value);



	/* F3x180[EccSymbolSize]=1, x8 symbols */

	if (boot_cpu_data.x86 == 0x10 &&

	    boot_cpu_data.x86_model > 7 &&

		/* F3x180[EccSymbolSize]=1 => x8 symbols */

		if (boot_cpu_data.x86_model > 7 &&

		    value & BIT(25)) {

			err_sym = decode_syndrome(syndrome, x8_vectors,

						  ARRAY_SIZE(x8_vectors), 8);

			return map_err_sym_to_channel(err_sym, 8);

	} else {

		err_sym = decode_syndrome(syndrome, x4_vectors,

					  ARRAY_SIZE(x4_vectors), 4);

		return map_err_sym_to_channel(err_sym, 4);

		}

	}

	err_sym = decode_syndrome(syndrome, x4_vectors, ARRAY_SIZE(x4_vectors), 4);

	return map_err_sym_to_channel(err_sym, 4);

}



/*

 * Check for valid error in the NB Status High register. If so, proceed to read