Messages in this thread Patch in this message | | | From | "Chang S. Bae" <> | Subject | [PATCH v11 22/29] x86/fpu/amx: Enable the AMX feature in 64-bit mode | Date | Fri, 1 Oct 2021 15:37:21 -0700 |
| |
In 64-bit mode, include the AMX state components in XFEATURE_MASK_USER_SUPPORTED.
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com> Reviewed-by: Len Brown <len.brown@intel.com> Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org --- Changes from v5: * Adjusted macro changes and moved the disabling code for non-64-bit mode for the new base changes.
Changes from v4: * Removed the irrelevant line from the changelog. (Thomas Gleixner) --- arch/x86/include/asm/fpu/xstate.h | 3 ++- arch/x86/kernel/fpu/xstate.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/fpu/xstate.h b/arch/x86/include/asm/fpu/xstate.h index 0e355dfe711b..0b337e913423 100644 --- a/arch/x86/include/asm/fpu/xstate.h +++ b/arch/x86/include/asm/fpu/xstate.h @@ -37,7 +37,8 @@ XFEATURE_MASK_Hi16_ZMM | \ XFEATURE_MASK_PKRU | \ XFEATURE_MASK_BNDREGS | \ - XFEATURE_MASK_BNDCSR) + XFEATURE_MASK_BNDCSR | \ + XFEATURE_MASK_XTILE) /* Require ARCH_SET_STATE_ENABLE from XTILE_CFG and later states */ #define XFEATURE_MASK_PERMISSION_REQUIRED GENMASK_ULL(63, XFEATURE_XTILE_CFG) diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 2ebc98c4b496..43539893dd82 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -492,7 +492,8 @@ static void __init print_xstate_offset_size(void) XFEATURE_MASK_PKRU | \ XFEATURE_MASK_BNDREGS | \ XFEATURE_MASK_BNDCSR | \ - XFEATURE_MASK_PASID) + XFEATURE_MASK_PASID | \ + XFEATURE_MASK_XTILE) /* * setup the xstate image representing the init state @@ -1008,6 +1009,9 @@ void __init fpu__init_system_xstate(void) xfeatures_mask_all &= XFEATURE_MASK_USER_SUPPORTED | XFEATURE_MASK_SUPERVISOR_SUPPORTED; + if (!IS_ENABLED(CONFIG_X86_64)) + xfeatures_mask_all &= ~XFEATURE_MASK_XTILE; + /* Store it for paranoia check at the end */ xfeatures = xfeatures_mask_all; -- 2.17.1
| |