KVM: arm64: Rename KVM_PTE_LEAF_ATTR_S2_IGNORED

The ignored bits for both stage-1 and stage-2 page and block
descriptors are in [55:58], so rename KVM_PTE_LEAF_ATTR_S2_IGNORED to
make it applicable to both. And while at it, since these bits are more
commonly known as 'software' bits, rename accordingly.

Reviewed-by: Fuad Tabba <tabba@google.com>
Signed-off-by: Quentin Perret <qperret@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210809152448.1810400-8-qperret@google.com

diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c
index 4dff2ad39ee45f6a341d27ac7831b6b40f2bffb9..59a394d82de3b7323b6867ee919febb1b5ce37ac 100644 (file)
--- a/arch/arm64/kvm/hyp/pgtable.c
+++ b/arch/arm64/kvm/hyp/pgtable.c
@@ -36,6 +36,8 @@
 
 #define KVM_PTE_LEAF_ATTR_HI           GENMASK(63, 51)
 
+#define KVM_PTE_LEAF_ATTR_HI_SW                GENMASK(58, 55)
+
 #define KVM_PTE_LEAF_ATTR_HI_S1_XN     BIT(54)
 
 #define KVM_PTE_LEAF_ATTR_HI_S2_XN     BIT(54)
@@ -44,8 +46,6 @@
                                         KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \
                                         KVM_PTE_LEAF_ATTR_HI_S2_XN)
 
-#define KVM_PTE_LEAF_ATTR_S2_IGNORED   GENMASK(58, 55)
-
 #define KVM_INVALID_PTE_OWNER_MASK     GENMASK(63, 56)
 #define KVM_MAX_OWNER_ID               1