arm64/sysreg: Rename TRBMAR_EL1 fields per auto-gen tools format

This renames TRBMAR_EL1 register fields per auto-gen tools format without
causing any functional change in the TRBE driver.

Cc: Will Deacon <will@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: kvmarm@lists.linux.dev
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20230614065949.146187-6-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 1df57d672a65e48a0e0f8f612b4fd1c45a5a3196..ef8c9d81b6ad5a665df89a4c417c7022b06c8965 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -263,12 +263,10 @@
 #define TRBSR_EL1_BSC_SHIFT            0
 #define TRBSR_EL1_FSC_MASK             GENMASK(5, 0)
 #define TRBSR_EL1_FSC_SHIFT            0
-#define TRBMAR_SHARE_MASK              GENMASK(1, 0)
-#define TRBMAR_SHARE_SHIFT             8
-#define TRBMAR_OUTER_MASK              GENMASK(3, 0)
-#define TRBMAR_OUTER_SHIFT             4
-#define TRBMAR_INNER_MASK              GENMASK(3, 0)
-#define TRBMAR_INNER_SHIFT             0
+#define TRBMAR_EL1_SH_MASK             GENMASK(9, 8)
+#define TRBMAR_EL1_SH_SHIFT            8
+#define TRBMAR_EL1_Attr_MASK           GENMASK(7, 0)
+#define TRBMAR_EL1_Attr_SHIFT          0
 #define TRBTRG_TRG_MASK                        GENMASK(31, 0)
 #define TRBTRG_TRG_SHIFT               0
 #define TRBIDR_FLAG                    BIT(5)