Skip to content

Commit 0d5d3bb

Browse files
committed
tools headers: Sync arm64 headers with kernel sources
To pick up changes from: b0a3f0e ("arm64/sysreg: Replace TCR_EL1 field macros") 3bbf004 ("arm64: cputype: Add Neoverse-V3AE definitions") e185c8a ("arm64: cputype: Add NVIDIA Olympus definitions") 52b49bd ("arm64: cputype: Remove duplicate Cortex-X1C definitions") This should address these tools/perf build warnings: Warning: Kernel ABI header differences: diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h Please see tools/include/uapi/README. Note that this is still out of sync due to is_midr_in_range_list(). Reviewed-by: Leo Yan <leo.yan@arm.com> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 369e91b commit 0d5d3bb

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
#define ARM_CPU_PART_CORTEX_A78AE 0xD42
8282
#define ARM_CPU_PART_CORTEX_X1 0xD44
8383
#define ARM_CPU_PART_CORTEX_A510 0xD46
84-
#define ARM_CPU_PART_CORTEX_X1C 0xD4C
8584
#define ARM_CPU_PART_CORTEX_A520 0xD80
8685
#define ARM_CPU_PART_CORTEX_A710 0xD47
8786
#define ARM_CPU_PART_CORTEX_A715 0xD4D
@@ -93,6 +92,7 @@
9392
#define ARM_CPU_PART_NEOVERSE_V2 0xD4F
9493
#define ARM_CPU_PART_CORTEX_A720 0xD81
9594
#define ARM_CPU_PART_CORTEX_X4 0xD82
95+
#define ARM_CPU_PART_NEOVERSE_V3AE 0xD83
9696
#define ARM_CPU_PART_NEOVERSE_V3 0xD84
9797
#define ARM_CPU_PART_CORTEX_X925 0xD85
9898
#define ARM_CPU_PART_CORTEX_A725 0xD87
@@ -172,7 +172,6 @@
172172
#define MIDR_CORTEX_A78AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE)
173173
#define MIDR_CORTEX_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1)
174174
#define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510)
175-
#define MIDR_CORTEX_X1C MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1C)
176175
#define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520)
177176
#define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)
178177
#define MIDR_CORTEX_A715 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A715)
@@ -184,6 +183,7 @@
184183
#define MIDR_NEOVERSE_V2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V2)
185184
#define MIDR_CORTEX_A720 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A720)
186185
#define MIDR_CORTEX_X4 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X4)
186+
#define MIDR_NEOVERSE_V3AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V3AE)
187187
#define MIDR_NEOVERSE_V3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V3)
188188
#define MIDR_CORTEX_X925 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X925)
189189
#define MIDR_CORTEX_A725 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A725)
@@ -247,7 +247,7 @@
247247
/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */
248248
#define MIDR_FUJITSU_ERRATUM_010001 MIDR_FUJITSU_A64FX
249249
#define MIDR_FUJITSU_ERRATUM_010001_MASK (~MIDR_CPU_VAR_REV(1, 0))
250-
#define TCR_CLEAR_FUJITSU_ERRATUM_010001 (TCR_NFD1 | TCR_NFD0)
250+
#define TCR_CLEAR_FUJITSU_ERRATUM_010001 (TCR_EL1_NFD1 | TCR_EL1_NFD0)
251251

252252
#ifndef __ASSEMBLER__
253253

0 commit comments

Comments
 (0)