arm64/sme: Drop SYS_ from SMIDR_EL1 defines

mainline inclusion
from mainline-v5.19-rc1
commit a6dab6cc
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ITJT
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a6dab6cc0f4cd0b341f002ce7d0683701612f527

-------------------------------------------------

We currently have a non-standard SYS_ prefix in the constants generated
for SMIDR_EL1 bitfields. Drop this in preparation for automatic register
definition generation, no functional change.
Signed-off-by: NMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220510161208.631259-4-broonie@kernel.orgSigned-off-by: NCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: NWang ShaoBo <bobo.shaobowang@huawei.com>

arch/arm64/include/asm/sysreg.h

@@ -400,9 +400,9 @@
 #define SYS_SMIDR_EL1			sys_reg(3, 1, 0, 0, 6)
 #define SYS_AIDR_EL1			sys_reg(3, 1, 0, 0, 7)
 
-#define SYS_SMIDR_EL1_IMPLEMENTER_SHIFT	24
-#define SYS_SMIDR_EL1_SMPS_SHIFT	15
-#define SYS_SMIDR_EL1_AFFINITY_SHIFT	0
+#define SMIDR_EL1_IMPLEMENTER_SHIFT	24
+#define SMIDR_EL1_SMPS_SHIFT	15
+#define SMIDR_EL1_AFFINITY_SHIFT	0
 
 #define SYS_CSSELR_EL1			sys_reg(3, 2, 0, 0, 0)
 

arch/arm64/kernel/head.S

@@ -681,7 +681,7 @@ set_hcr:
        msr_s   SYS_SMCR_EL2, x1                // length for EL1.
 
        mrs_s   x1, SYS_SMIDR_EL1               // Priority mapping supported?
-       ubfx    x1, x1, #SYS_SMIDR_EL1_SMPS_SHIFT, #1
+       ubfx    x1, x1, #SMIDR_EL1_SMPS_SHIFT, #1
        cbz     x1, .Lskip_sme_\@
 
        msr_s   SYS_SMPRIMAP_EL2, xzr           // Make all priorities equal