Skip to content

Commit 83b0c36

Browse files
Sai Prakash Ranjanwilldeacon
authored andcommitted
arm64: Add KRYO{3,4}XX CPU cores to spectre-v2 safe list
The "silver" KRYO3XX and KRYO4XX CPU cores are not affected by Spectre variant 2. Add them to spectre_v2 safe list to correct the spurious ARM_SMCCC_ARCH_WORKAROUND_1 warning and vulnerability status reported under sysfs. Reviewed-by: Stephen Boyd <[email protected]> Tested-by: Stephen Boyd <[email protected]> Signed-off-by: Sai Prakash Ranjan <[email protected]> [will: tweaked commit message to remove stale mention of "gold" cores] Signed-off-by: Will Deacon <[email protected]>
1 parent f88f42f commit 83b0c36

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

arch/arm64/include/asm/cputype.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
#define QCOM_CPU_PART_FALKOR_V1 0x800
8686
#define QCOM_CPU_PART_FALKOR 0xC00
8787
#define QCOM_CPU_PART_KRYO 0x200
88+
#define QCOM_CPU_PART_KRYO_3XX_SILVER 0x803
89+
#define QCOM_CPU_PART_KRYO_4XX_SILVER 0x805
8890

8991
#define NVIDIA_CPU_PART_DENVER 0x003
9092
#define NVIDIA_CPU_PART_CARMEL 0x004
@@ -111,6 +113,8 @@
111113
#define MIDR_QCOM_FALKOR_V1 MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR_V1)
112114
#define MIDR_QCOM_FALKOR MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR)
113115
#define MIDR_QCOM_KRYO MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO)
116+
#define MIDR_QCOM_KRYO_3XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_3XX_SILVER)
117+
#define MIDR_QCOM_KRYO_4XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_4XX_SILVER)
114118
#define MIDR_NVIDIA_DENVER MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_DENVER)
115119
#define MIDR_NVIDIA_CARMEL MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_CARMEL)
116120
#define MIDR_FUJITSU_A64FX MIDR_CPU_MODEL(ARM_CPU_IMP_FUJITSU, FUJITSU_CPU_PART_A64FX)

arch/arm64/kernel/cpu_errata.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,8 @@ static const struct midr_range spectre_v2_safe_list[] = {
548548
MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),
549549
MIDR_ALL_VERSIONS(MIDR_BRAHMA_B53),
550550
MIDR_ALL_VERSIONS(MIDR_HISI_TSV110),
551+
MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER),
552+
MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER),
551553
{ /* sentinel */ }
552554
};
553555

0 commit comments

Comments
 (0)