Skip to content

Commit 0e5d5ae

Browse files
D Scott Phillipsctmarinas
authored andcommitted
arm64: Add AMPERE1 to the Spectre-BHB affected list
Per AmpereOne erratum AC03_CPU_12, "Branch history may allow control of speculative execution across software contexts," the AMPERE1 core needs the bhb clearing loop to mitigate Spectre-BHB, with a loop iteration count of 11. Signed-off-by: D Scott Phillips <scott@os.amperecomputing.com> Link: https://lore.kernel.org/r/20221011022140.432370-1-scott@os.amperecomputing.com Reviewed-by: James Morse <james.morse@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent a8e5e51 commit 0e5d5ae

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

arch/arm64/include/asm/cputype.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
#define ARM_CPU_IMP_FUJITSU 0x46
6161
#define ARM_CPU_IMP_HISI 0x48
6262
#define ARM_CPU_IMP_APPLE 0x61
63+
#define ARM_CPU_IMP_AMPERE 0xC0
6364

6465
#define ARM_CPU_PART_AEM_V8 0xD0F
6566
#define ARM_CPU_PART_FOUNDATION 0xD00
@@ -123,6 +124,8 @@
123124
#define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028
124125
#define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029
125126

127+
#define AMPERE_CPU_PART_AMPERE1 0xAC3
128+
126129
#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)
127130
#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)
128131
#define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)
@@ -172,6 +175,7 @@
172175
#define MIDR_APPLE_M1_FIRESTORM_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO)
173176
#define MIDR_APPLE_M1_ICESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX)
174177
#define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX)
178+
#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1)
175179

176180
/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */
177181
#define MIDR_FUJITSU_ERRATUM_010001 MIDR_FUJITSU_A64FX

arch/arm64/kernel/proton-pack.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,10 @@ u8 spectre_bhb_loop_affected(int scope)
868868
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1),
869869
{},
870870
};
871+
static const struct midr_range spectre_bhb_k11_list[] = {
872+
MIDR_ALL_VERSIONS(MIDR_AMPERE1),
873+
{},
874+
};
871875
static const struct midr_range spectre_bhb_k8_list[] = {
872876
MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),
873877
MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),
@@ -878,6 +882,8 @@ u8 spectre_bhb_loop_affected(int scope)
878882
k = 32;
879883
else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k24_list))
880884
k = 24;
885+
else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k11_list))
886+
k = 11;
881887
else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k8_list))
882888
k = 8;
883889

0 commit comments

Comments
 (0)