From: Will Deacon <will@kernel.org>
Date: Thu, 12 Sep 2024 12:43:41 +0000 (+0100)
Subject: Merge branch 'for-next/poe' into for-next/core
X-Git-Tag: v6.12-rc1~221^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=982a847c71d43eefd530e865314cbf31309619e2;p=thirdparty%2Flinux.git

Merge branch 'for-next/poe' into for-next/core

* for-next/poe: (31 commits)
  arm64: pkeys: remove redundant WARN
  kselftest/arm64: Add test case for POR_EL0 signal frame records
  kselftest/arm64: parse POE_MAGIC in a signal frame
  kselftest/arm64: add HWCAP test for FEAT_S1POE
  selftests: mm: make protection_keys test work on arm64
  selftests: mm: move fpregs printing
  kselftest/arm64: move get_header()
  arm64: add Permission Overlay Extension Kconfig
  arm64: enable PKEY support for CPUs with S1POE
  arm64: enable POE and PIE to coexist
  arm64/ptrace: add support for FEAT_POE
  arm64: add POE signal support
  arm64: implement PKEYS support
  arm64: add pte_access_permitted_no_overlay()
  arm64: handle PKEY/POE faults
  arm64: mask out POIndex when modifying a PTE
  arm64: convert protection key into vm_flags and pgprot values
  arm64: add POIndex defines
  arm64: re-order MTE VM_ flags
  arm64: enable the Permission Overlay Extension for EL0
  ...
---

982a847c71d43eefd530e865314cbf31309619e2
diff --cc arch/arm64/include/asm/el2_setup.h
index 8eb113a6b4521,1173aba9c6a83..e0ffdf13a18b3
--- a/arch/arm64/include/asm/el2_setup.h
+++ b/arch/arm64/include/asm/el2_setup.h
@@@ -192,6 -192,14 +192,14 @@@
  	orr	x0, x0, #HFGxTR_EL2_nPIRE0_EL1
  
  .Lskip_pie_fgt_\@:
+ 	mrs_s	x1, SYS_ID_AA64MMFR3_EL1
+ 	ubfx	x1, x1, #ID_AA64MMFR3_EL1_S1POE_SHIFT, #4
 -	cbz	x1, .Lset_fgt_\@
++	cbz	x1, .Lskip_poe_fgt_\@
+ 
+ 	/* Disable trapping of POR_EL0 */
+ 	orr	x0, x0, #HFGxTR_EL2_nPOR_EL0
+ 
 -.Lset_fgt_\@:
++.Lskip_poe_fgt_\@:
  	msr_s	SYS_HFGRTR_EL2, x0
  	msr_s	SYS_HFGWTR_EL2, x0
  	msr_s	SYS_HFGITR_EL2, xzr