Merge tag 'char-misc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[platform/kernel/linux-starfive.git] / arch / arm64 / include / asm / sysreg.h

diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 4acff97..dfd4edb 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -292,7 +292,11 @@
 #define SYS_PMSFCR_EL1_ST_SHIFT                18
 
 #define SYS_PMSEVFR_EL1                        sys_reg(3, 0, 9, 9, 5)
-#define SYS_PMSEVFR_EL1_RES0           0x0000ffff00ff0f55UL
+#define SYS_PMSEVFR_EL1_RES0_8_2       \
+       (GENMASK_ULL(47, 32) | GENMASK_ULL(23, 16) | GENMASK_ULL(11, 8) |\
+        BIT_ULL(6) | BIT_ULL(4) | BIT_ULL(2) | BIT_ULL(0))
+#define SYS_PMSEVFR_EL1_RES0_8_3       \
+       (SYS_PMSEVFR_EL1_RES0_8_2 & ~(BIT_ULL(18) | BIT_ULL(17) | BIT_ULL(11)))
 
 #define SYS_PMSLATFR_EL1               sys_reg(3, 0, 9, 9, 6)
 #define SYS_PMSLATFR_EL1_MINLAT_SHIFT  0
@@ -847,9 +851,15 @@
 #define ID_AA64DFR0_PMUVER_8_5         0x6
 #define ID_AA64DFR0_PMUVER_IMP_DEF     0xf
 
+#define ID_AA64DFR0_PMSVER_8_2         0x1
+#define ID_AA64DFR0_PMSVER_8_3         0x2
+
 #define ID_DFR0_PERFMON_SHIFT          24
 
+#define ID_DFR0_PERFMON_8_0            0x3
 #define ID_DFR0_PERFMON_8_1            0x4
+#define ID_DFR0_PERFMON_8_4            0x5
+#define ID_DFR0_PERFMON_8_5            0x6
 
 #define ID_ISAR4_SWP_FRAC_SHIFT                28
 #define ID_ISAR4_PSR_M_SHIFT           24