Skip to content

Commit ef296ee

Browse files
Marc Zyngieroupton
authored andcommitted
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>
1 parent ffea7c7 commit ef296ee

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

arch/arm64/include/asm/el2_setup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
mrs x0, id_aa64mmfr1_el1
5353
ubfx x0, x0, #ID_AA64MMFR1_EL1_HCX_SHIFT, #4
5454
cbz x0, .Lskip_hcrx_\@
55-
mov_q x0, HCRX_HOST_FLAGS
55+
mov_q x0, (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM)
5656

5757
/* Enable GCS if supported */
5858
mrs_s x1, SYS_ID_AA64PFR1_EL1

arch/arm64/include/asm/kvm_arm.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)
103103
#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H | HCR_AMO | HCR_IMO | HCR_FMO)
104104

105-
#define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM)
106105
#define MPAMHCR_HOST_FLAGS 0
107106

108107
/* TCR_EL2 Registers bits */

0 commit comments

Comments
 (0)