Skip to content

Commit

Permalink
x86, xsave: Check cpuid level for XSTATE_CPUID (0x0d)
Browse files Browse the repository at this point in the history
The patch introduces the XSTATE_CPUID macro and adds a check that
tests if XSTATE_CPUID exists.

Signed-off-by: Robert Richter <robert.richter@amd.com>
LKML-Reference: <1279731838-1522-4-git-send-email-robert.richter@amd.com>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Robert Richter authored and H. Peter Anvin committed Jul 21, 2010
1 parent 97e80a7 commit ee813d5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions arch/x86/include/asm/xsave.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions arch/x86/kernel/xsave.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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);
Expand Down

0 comments on commit ee813d5

Please sign in to comment.