Skip to content

Commit ea708a1

Browse files
committed
arm64: proton-pack: Add new CPUs 'k' values for branch mitigation
jira LE-4018 Rebuild_History Non-Buildable kernel-5.14.0-570.37.1.el9_6 commit-author James Morse <james.morse@arm.com> commit efe676a Update the list of 'k' values for the branch mitigation from arm's website. Add the values for Cortex-X1C. The MIDR_EL1 value can be found here: https://developer.arm.com/documentation/101968/0002/Register-descriptions/AArch> Link: https://developer.arm.com/documentation/110280/2-0/?lang=en Signed-off-by: James Morse <james.morse@arm.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> (cherry picked from commit efe676a) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent e8516ed commit ea708a1

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

arch/arm64/include/asm/cputype.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
#define ARM_CPU_PART_CORTEX_A78AE 0xD42
8181
#define ARM_CPU_PART_CORTEX_X1 0xD44
8282
#define ARM_CPU_PART_CORTEX_A510 0xD46
83+
#define ARM_CPU_PART_CORTEX_X1C 0xD4C
8384
#define ARM_CPU_PART_CORTEX_A520 0xD80
8485
#define ARM_CPU_PART_CORTEX_A710 0xD47
8586
#define ARM_CPU_PART_CORTEX_A715 0xD4D
@@ -159,6 +160,7 @@
159160
#define MIDR_CORTEX_A78AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE)
160161
#define MIDR_CORTEX_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1)
161162
#define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510)
163+
#define MIDR_CORTEX_X1C MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1C)
162164
#define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520)
163165
#define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)
164166
#define MIDR_CORTEX_A715 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A715)

arch/arm64/kernel/proton-pack.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,7 @@ static u8 spectre_bhb_loop_affected(void)
878878
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78AE),
879879
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78C),
880880
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1),
881+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1C),
881882
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
882883
MIDR_ALL_VERSIONS(MIDR_CORTEX_X2),
883884
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),

0 commit comments

Comments
 (0)