Commit a884675b authored Sep 12, 2016 by Yazen Ghannam Committed by Thomas Gleixner Sep 13, 2016

x86/MCE/AMD, EDAC: Handle reserved bank 4 on Fam17h properly



Bank 4 is reserved on family 0x17 and shouldn't generate any MCE
records. However, broken hardware and software is not something unheard
of so warn about bank 4 errors. They shouldn't be coming from bank 4
naturally but users can still use mce_amd_inj to simulate errors from it
for testing purposed.

Also, avoid special handling in the injector mce_amd_inj like it is
being done on the older families.

[ bp: Rewrite commit message and merge into one patch. Use boot_cpu_data. ]

Signed-off-by: Yazen Ghannam <Yazen.Ghannam@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Aravind Gopalakrishnan <aravindksg.lkml@gmail.com>
Link: http://lkml.kernel.org/r/1473384591-5323-1-git-send-email-Yazen.Ghannam@amd.com
Link: http://lkml.kernel.org/r/1473384591-5323-2-git-send-email-Yazen.Ghannam@amd.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 4f29b73b

arch/x86/ras/mce_amd_inj.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,9 @@ static void do_inject(void)
		* only on the node base core. Refer to D18F3x44[NbMcaToMstCpuEn] for
		* Fam10h and later BKDGs.
		*/
		if (static_cpu_has(X86_FEATURE_AMD_DCM) && b == 4) {
		if (static_cpu_has(X86_FEATURE_AMD_DCM) &&
		b == 4 &&
		boot_cpu_data.x86 < 0x17) {
		toggle_nb_mca_mst_cpu(amd_get_nb_id(cpu));
		cpu = get_nbc_for_node(amd_get_nb_id(cpu));
		}

drivers/edac/mce_amd.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -859,6 +859,9 @@ static void decode_smca_errors(struct mce *m)
		if (m->bank >= ARRAY_SIZE(smca_banks))
		return;

		if (boot_cpu_data.x86 >= 0x17 && m->bank == 4)
		pr_emerg(HW_ERR "Bank 4 is reserved on Fam17h.\n");

		type = smca_banks[m->bank].type;
		if (!type)
		return;

Admin message