[PATCH v6 01/19] xen/riscv: avoid redundant HGATP*_MODE_SHIFT and HGATP*_VMID_SHIFT

[Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>]

It is sufficient to use HGATP*_MODE_MASK and HGATP*_VMID_MASK without
the corresponding *_SHIFT definitions.

Rename HGATP{32,64}_PPN to HGATP{32,64}_PPN_MASK to more accurately
describe their purpose. The top-level HGATP_PPN and related aliases are
updated accordingly.

Signed-off-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
Changes in v6:
 - New patch.
---

 xen/arch/riscv/include/asm/riscv_encoding.h | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/xen/arch/riscv/include/asm/riscv_encoding.h 
b/xen/arch/riscv/include/asm/riscv_encoding.h
index 6cc8f4eb45..fd27f74cb7 100644
--- a/xen/arch/riscv/include/asm/riscv_encoding.h
+++ b/xen/arch/riscv/include/asm/riscv_encoding.h
@@ -132,15 +132,11 @@
 #define HGATP_MODE_SV39X4              _UL(8)
 #define HGATP_MODE_SV48X4              _UL(9)
 
-#define HGATP32_MODE_SHIFT             31
-#define HGATP32_VMID_SHIFT             22
 #define HGATP32_VMID_MASK              _UL(0x1FC00000)
-#define HGATP32_PPN                    _UL(0x003FFFFF)
+#define HGATP32_PPN_MASK               _UL(0x003FFFFF)
 
-#define HGATP64_MODE_SHIFT             60
-#define HGATP64_VMID_SHIFT             44
 #define HGATP64_VMID_MASK              _ULL(0x03FFF00000000000)
-#define HGATP64_PPN                    _ULL(0x00000FFFFFFFFFFF)
+#define HGATP64_PPN_MASK               _ULL(0x00000FFFFFFFFFFF)
 
 #define PMP_R                          _UL(0x01)
 #define PMP_W                          _UL(0x02)
@@ -166,10 +162,8 @@
 #define SATP_MODE_SHIFT                        SATP64_MODE_SHIFT
 #define SATP_PPN_MASK                  SATP64_PPN
 
-#define HGATP_PPN                      HGATP64_PPN
-#define HGATP_VMID_SHIFT               HGATP64_VMID_SHIFT
+#define HGATP_PPN_MASK                 HGATP64_PPN_MASK
 #define HGATP_VMID_MASK                        HGATP64_VMID_MASK
-#define HGATP_MODE_SHIFT               HGATP64_MODE_SHIFT
 #else
 #define MSTATUS_SD                     MSTATUS32_SD
 #define SSTATUS_SD                     SSTATUS32_SD
@@ -177,10 +171,8 @@
 #define SATP_MODE_SHIFT                        SATP32_MODE_SHIFT
 #define SATP_PPN_MASK                  SATP32_PPN
 
-#define HGATP_PPN                      HGATP32_PPN
-#define HGATP_VMID_SHIFT               HGATP32_VMID_SHIFT
+#define HGATP_PPN_MASK                 HGATP32_PPN_MASK
 #define HGATP_VMID_MASK                        HGATP32_VMID_MASK
-#define HGATP_MODE_SHIFT               HGATP32_MODE_SHIFT
 #endif
 
 #define TOPI_IID_SHIFT                 16
-- 
2.51.1