Skip to content

Commit 8c51e8f

Browse files
committed
tools headers arm64: Sync arm64's cputype.h with the kernel sources
To get the changes in: decb17a ("KVM: arm64: vgic: Add Apple M2 cpus to the list of broken SEIS implementations") 07e39e6 ("arm64: Add Cortex-715 CPU part definition") 8ec8490 ("arm64: Fix bit-shifting UB in the MIDR_CPU_MODEL() macro") That addresses this perf build warning: Warning: Kernel ABI header at 'tools/arch/arm64/include/asm/cputype.h' differs from latest version at 'arch/arm64/include/asm/cputype.h' diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h Cc: Ali Saidi <[email protected]> Cc: Anshuman Khandual <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: D Scott Phillips <[email protected]> Cc: German Gomez <[email protected]> Cc: Leo Yan <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Will Deacon <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 7f2d4cd commit 8c51e8f

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

tools/arch/arm64/include/asm/cputype.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
(((midr) & MIDR_IMPLEMENTOR_MASK) >> MIDR_IMPLEMENTOR_SHIFT)
4242

4343
#define MIDR_CPU_MODEL(imp, partnum) \
44-
(((imp) << MIDR_IMPLEMENTOR_SHIFT) | \
44+
((_AT(u32, imp) << MIDR_IMPLEMENTOR_SHIFT) | \
4545
(0xf << MIDR_ARCHITECTURE_SHIFT) | \
4646
((partnum) << MIDR_PARTNUM_SHIFT))
4747

@@ -80,6 +80,7 @@
8080
#define ARM_CPU_PART_CORTEX_X1 0xD44
8181
#define ARM_CPU_PART_CORTEX_A510 0xD46
8282
#define ARM_CPU_PART_CORTEX_A710 0xD47
83+
#define ARM_CPU_PART_CORTEX_A715 0xD4D
8384
#define ARM_CPU_PART_CORTEX_X2 0xD48
8485
#define ARM_CPU_PART_NEOVERSE_N2 0xD49
8586
#define ARM_CPU_PART_CORTEX_A78C 0xD4B
@@ -123,6 +124,8 @@
123124
#define APPLE_CPU_PART_M1_FIRESTORM_PRO 0x025
124125
#define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028
125126
#define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029
127+
#define APPLE_CPU_PART_M2_BLIZZARD 0x032
128+
#define APPLE_CPU_PART_M2_AVALANCHE 0x033
126129

127130
#define AMPERE_CPU_PART_AMPERE1 0xAC3
128131

@@ -142,6 +145,7 @@
142145
#define MIDR_CORTEX_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1)
143146
#define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510)
144147
#define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)
148+
#define MIDR_CORTEX_A715 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A715)
145149
#define MIDR_CORTEX_X2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X2)
146150
#define MIDR_NEOVERSE_N2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N2)
147151
#define MIDR_CORTEX_A78C MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78C)
@@ -175,6 +179,8 @@
175179
#define MIDR_APPLE_M1_FIRESTORM_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO)
176180
#define MIDR_APPLE_M1_ICESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX)
177181
#define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX)
182+
#define MIDR_APPLE_M2_BLIZZARD MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD)
183+
#define MIDR_APPLE_M2_AVALANCHE MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE)
178184
#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1)
179185

180186
/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */

0 commit comments

Comments
 (0)