From 9a287c833f8030cedbbd5836a6b21c1b2798c092 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:50 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: s2mpu: Extract L1ENTRY_* consts" This reverts commit 28632d7a235c58eddac87a3e6c5f166331176cef. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ibdea76beec5f84e49c2485e9758ca3988b35964d --- arch/arm64/include/asm/kvm_s2mpu.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/kvm_s2mpu.h b/arch/arm64/include/asm/kvm_s2mpu.h index d60790029e1f..0804ece03cfd 100644 --- a/arch/arm64/include/asm/kvm_s2mpu.h +++ b/arch/arm64/include/asm/kvm_s2mpu.h @@ -94,17 +94,14 @@ #define FAULT_INFO_LEN_MASK GENMASK(19, 16) #define FAULT_INFO_ID_MASK GENMASK(15, 0) -#define L1ENTRY_L2TABLE_ADDR_SHIFT 4 -#define L1ENTRY_L2TABLE_ADDR(pa) ((pa) >> L1ENTRY_L2TABLE_ADDR_SHIFT) +#define L1ENTRY_L2TABLE_ADDR(pa) ((pa) >> 4) #define L1ENTRY_ATTR_L2TABLE_EN BIT(0) #define L1ENTRY_ATTR_GRAN_4K 0x0 #define L1ENTRY_ATTR_GRAN_64K 0x1 #define L1ENTRY_ATTR_GRAN_2M 0x2 -#define L1ENTRY_ATTR_PROT_MASK GENMASK(2, 1) -#define L1ENTRY_ATTR_GRAN_MASK GENMASK(5, 4) -#define L1ENTRY_ATTR_PROT(prot) FIELD_PREP(L1ENTRY_ATTR_PROT_MASK, prot) -#define L1ENTRY_ATTR_GRAN(gran) FIELD_PREP(L1ENTRY_ATTR_GRAN_MASK, gran) +#define L1ENTRY_ATTR_PROT(prot) FIELD_PREP(GENMASK(2, 1), prot) +#define L1ENTRY_ATTR_GRAN(gran) FIELD_PREP(GENMASK(5, 4), gran) #define L1ENTRY_ATTR_1G(prot) L1ENTRY_ATTR_PROT(prot) #define L1ENTRY_ATTR_L2(gran) (L1ENTRY_ATTR_GRAN(gran) | \ L1ENTRY_ATTR_L2TABLE_EN)