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

Commit 71faad43 authored by Yazen Ghannam's avatar Yazen Ghannam Committed by Ingo Molnar
Browse files

x86/cpu: Add detection of AMD RAS Capabilities 



Add a new CPUID leaf to hold the contents of CPUID 0x80000007_EBX (RasCap).

Define bits that are currently in use:

 Bit 0: McaOverflowRecov
 Bit 1: SUCCOR
 Bit 3: ScalableMca

Signed-off-by: default avatarYazen Ghannam <Yazen.Ghannam@amd.com>
[ Shorten comment. ]
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1462971509-3856-5-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e128b4f4

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ enum cpuid_leafs 
	CPUID_6_EAX,

	CPUID_8000_000A_EDX,

	CPUID_7_ECX,

	CPUID_8000_0007_EBX,

};



#ifdef CONFIG_X86_FEATURE_NAMES

arch/x86/include/asm/cpufeatures.h

+6 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
/*

 * Defines x86 CPU feature bits

 */

#define NCAPINTS	17	/* N 32-bit words worth of info */

#define NCAPINTS	18	/* N 32-bit words worth of info */

#define NBUGINTS	1	/* N 32-bit bug flags */



/*
@@ -280,6 +280,11 @@ 
#define X86_FEATURE_PKU		(16*32+ 3) /* Protection Keys for Userspace */

#define X86_FEATURE_OSPKE	(16*32+ 4) /* OS Protection Keys Enable */



/* AMD-defined CPU features, CPUID level 0x80000007 (ebx), word 17 */

#define X86_FEATURE_OVERFLOW_RECOV (17*32+0) /* MCA overflow recovery support */

#define X86_FEATURE_SUCCOR	(17*32+1) /* Uncorrectable error containment and recovery */

#define X86_FEATURE_SMCA	(17*32+3) /* Scalable MCA */



/*

 * BUG word(s)

 */

arch/x86/kernel/cpu/common.c

+7 −3
Original line number Diff line number Diff line
@@ -717,6 +717,13 @@ void get_cpu_cap(struct cpuinfo_x86 *c) 
		}

	}



	if (c->extended_cpuid_level >= 0x80000007) {

		cpuid(0x80000007, &eax, &ebx, &ecx, &edx);



		c->x86_capability[CPUID_8000_0007_EBX] = ebx;

		c->x86_power = edx;

	}



	if (c->extended_cpuid_level >= 0x80000008) {

		cpuid(0x80000008, &eax, &ebx, &ecx, &edx);
@@ -729,9 +736,6 @@ void get_cpu_cap(struct cpuinfo_x86 *c) 
		c->x86_phys_bits = 36;

#endif



	if (c->extended_cpuid_level >= 0x80000007)

		c->x86_power = cpuid_edx(0x80000007);



	if (c->extended_cpuid_level >= 0x8000000a)

		c->x86_capability[CPUID_8000_000A_EDX] = cpuid_edx(0x8000000a);