Skip to content

Commit 38f3e77

Browse files
babumogersuryasaimadhu
authored andcommitted
x86/Kconfig: Update config and kernel doc for MPK feature on AMD
AMD's next generation of EPYC processors support the MPK (Memory Protection Keys) feature. Update the dependency and documentation. Signed-off-by: Babu Moger <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Dave Hansen <[email protected]> Link: https://lkml.kernel.org/r/159068199556.26992.17733929401377275140.stgit@naples-babu.amd.com
1 parent d6ee652 commit 38f3e77

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Documentation/core-api/protection-keys.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Memory Protection Keys
55
======================
66

77
Memory Protection Keys for Userspace (PKU aka PKEYs) is a feature
8-
which is found on Intel's Skylake "Scalable Processor" Server CPUs.
9-
It will be avalable in future non-server parts.
8+
which is found on Intel's Skylake (and later) "Scalable Processor"
9+
Server CPUs. It will be available in future non-server Intel parts
10+
and future AMD processors.
1011

1112
For anyone wishing to test or use this feature, it is available in
1213
Amazon's EC2 C5 instances and is known to work there using an Ubuntu

arch/x86/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,10 +1887,10 @@ config X86_UMIP
18871887
results are dummy.
18881888

18891889
config X86_INTEL_MEMORY_PROTECTION_KEYS
1890-
prompt "Intel Memory Protection Keys"
1890+
prompt "Memory Protection Keys"
18911891
def_bool y
18921892
# Note: only available in 64-bit mode
1893-
depends on CPU_SUP_INTEL && X86_64
1893+
depends on X86_64 && (CPU_SUP_INTEL || CPU_SUP_AMD)
18941894
select ARCH_USES_HIGH_VMA_FLAGS
18951895
select ARCH_HAS_PKEYS
18961896
---help---

0 commit comments

Comments
 (0)