From: Joey Gouly <joey.gouly@arm.com>
Date: Thu, 22 Aug 2024 15:11:05 +0000 (+0100)
Subject: arm64: enable PKEY support for CPUs with S1POE
X-Git-Tag: v6.12-rc1~221^2~2^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4afd00641b220170143f2f7f4b42b26a0abe49b2;p=thirdparty%2Fkernel%2Flinux.git

arm64: enable PKEY support for CPUs with S1POE

Now that PKEYs support has been implemented, enable it for CPUs that
support S1POE.

Signed-off-by: Joey Gouly <joey.gouly@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20240822151113.1479789-23-joey.gouly@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
---

diff --git a/arch/arm64/include/asm/pkeys.h b/arch/arm64/include/asm/pkeys.h
index 32c352bb36b92..19eb1b12b7fc0 100644
--- a/arch/arm64/include/asm/pkeys.h
+++ b/arch/arm64/include/asm/pkeys.h
@@ -17,7 +17,7 @@ int arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
 
 static inline bool arch_pkeys_enabled(void)
 {
-	return false;
+	return system_supports_poe();
 }
 
 static inline int vma_pkey(struct vm_area_struct *vma)