[PATCH] KVM: arm64: Use symbolic name for ID_AA64PFR0_EL1.RME in NV filtering

From: Mark Brown
Date: Tue Feb 11 2025 - 19:36:00 EST


We generally use symbolic field names generated via NV_FTR() when we filter
the feature registers for nested virtualisation but when the current format
was adopted there was no symbolic definition for ID_AA64PFR0_EL1.RME so it
was instead specified using a raw GENMASK_ULL(). Since the field has now
been specified in sysreg we can replace this with the symbolic name in
order to make things marginally more legible.

Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
---
arch/arm64/kvm/nested.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index 0c9387d2f50708565b5aac1fc0f86fefffd94ea1..bf6ec0f499ae207a5c056a0ec157368527a71fde 100644
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -824,7 +824,7 @@ static void limit_nv_id_regs(struct kvm *kvm)

/* No AMU, MPAM, S-EL2, or RAS */
val = kvm_read_vm_id_reg(kvm, SYS_ID_AA64PFR0_EL1);
- val &= ~(GENMASK_ULL(55, 52) |
+ val &= ~(NV_FTR(PFR0, RME) |
NV_FTR(PFR0, AMU) |
NV_FTR(PFR0, MPAM) |
NV_FTR(PFR0, SEL2) |

---
base-commit: a64dcfb451e254085a7daee5fe51bf22959d52d3
change-id: 20250211-kvm-arm64-rme-symbol-28b15975c4c0

Best regards,
--
Mark Brown <broonie@xxxxxxxxxx>