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

Commit ee813d53 authored by Robert Richter's avatar Robert Richter Committed by H. Peter Anvin
Browse files

x86, xsave: Check cpuid level for XSTATE_CPUID (0x0d) 



The patch introduces the XSTATE_CPUID macro and adds a check that
tests if XSTATE_CPUID exists.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
LKML-Reference: <1279731838-1522-4-git-send-email-robert.richter@amd.com>
Acked-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 97e80a70

arch/x86/include/asm/xsave.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#include <linux/types.h>

#include <asm/processor.h>



#define XSTATE_CPUID		0x0000000d



#define XSTATE_FP	0x1

#define XSTATE_SSE	0x2

#define XSTATE_YMM	0x4

arch/x86/kernel/xsave.c

+8 −3
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static void setup_xstate_features(void) 
	xstate_sizes = alloc_bootmem(xstate_features * sizeof(int));



	do {

		cpuid_count(0xd, leaf, &eax, &ebx, &ecx, &edx);

		cpuid_count(XSTATE_CPUID, leaf, &eax, &ebx, &ecx, &edx);



		if (eax == 0)

			break;
@@ -425,7 +425,12 @@ static void __cpuinit xstate_enable_boot_cpu(void) 
{

	unsigned int eax, ebx, ecx, edx;



	cpuid_count(0xd, 0, &eax, &ebx, &ecx, &edx);

	if (boot_cpu_data.cpuid_level < XSTATE_CPUID) {

		WARN(1, KERN_ERR "XSTATE_CPUID missing\n");

		return;

	}



	cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx);

	pcntxt_mask = eax + ((u64)edx << 32);



	if ((pcntxt_mask & XSTATE_FPSSE) != XSTATE_FPSSE) {
@@ -444,7 +449,7 @@ static void __cpuinit xstate_enable_boot_cpu(void) 
	/*

	 * Recompute the context size for enabled features

	 */

	cpuid_count(0xd, 0, &eax, &ebx, &ecx, &edx);

	cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx);

	xstate_size = ebx;



	update_regset_xstate_info(xstate_size, pcntxt_mask);