tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

KVM: arm64: Kill HCRX_HOST_FLAGS

HCRX_HOST_FLAGS, like most of these hardcoded setups, are not
a good match for options that can be selectively enabled or
disabled.

Nothing but the early setup is relying on it now, so kill the
macro and move the bag of bits where they belong.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20250430105916.3815157-3-maz@kernel.org
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

authored by Marc Zyngier and committed by Oliver Upton ef296ee9 ffea7c73

+1 -2
unified split
+1 -1
arch/arm64/include/asm/el2_setup.h
··· 52 mrs x0, id_aa64mmfr1_el1 53 ubfx x0, x0, #ID_AA64MMFR1_EL1_HCX_SHIFT, #4 54 cbz x0, .Lskip_hcrx_\@ 55 - mov_q x0, HCRX_HOST_FLAGS 56 57 /* Enable GCS if supported */ 58 mrs_s x1, SYS_ID_AA64PFR1_EL1
··· 52 mrs x0, id_aa64mmfr1_el1 53 ubfx x0, x0, #ID_AA64MMFR1_EL1_HCX_SHIFT, #4 54 cbz x0, .Lskip_hcrx_\@ 55 + mov_q x0, (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM) 56 57 /* Enable GCS if supported */ 58 mrs_s x1, SYS_ID_AA64PFR1_EL1
-1
arch/arm64/include/asm/kvm_arm.h
··· 102 #define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC) 103 #define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H | HCR_AMO | HCR_IMO | HCR_FMO) 104 105 - #define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM) 106 #define MPAMHCR_HOST_FLAGS 0 107 108 /* TCR_EL2 Registers bits */
··· 102 #define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC) 103 #define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H | HCR_AMO | HCR_IMO | HCR_FMO) 104 105 #define MPAMHCR_HOST_FLAGS 0 106 107 /* TCR_EL2 Registers bits */