Skip to content

Commit 9fc1391

Browse files
James Morsegregkh
authored andcommitted
arm64: proton-pack: Add new CPUs 'k' values for branch mitigation
commit efe676a1a7554219eae0b0dcfe1e0cdcc9ef9aef upstream. 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 <[email protected]> Reviewed-by: Catalin Marinas <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 6e52d04 commit 9fc1391

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
@@ -81,6 +81,7 @@
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
8485
#define ARM_CPU_PART_CORTEX_A520 0xD80
8586
#define ARM_CPU_PART_CORTEX_A710 0xD47
8687
#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
@@ -903,6 +903,7 @@ static u8 spectre_bhb_loop_affected(void)
903903
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78AE),
904904
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78C),
905905
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1),
906+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1C),
906907
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
907908
MIDR_ALL_VERSIONS(MIDR_CORTEX_X2),
908909
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),

0 commit comments

Comments
 (0)