From b918f051e3f70cae5a7dcbc6a8ba088e4aee1801 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 Apr 2025 16:37:52 +0000 Subject: [PATCH] Revert "arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists" This reverts commit a53b3599d9bf9375f9033f2aa1fa92714fb1d0f0 which is commit a5951389e58d2e816eed3dbec5877de9327fd881 upstream. It breaks the Pixel 9 boot tests, so it needs to be reverted. It can come back later if someone figures out what's going wrong here... Bug: 414805007 Change-Id: I7a7dad01bc9ec0eb5a5eb29912226e0c1ef84985 Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/proton-pack.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index 93a00cd42edd..ced9ae413e8f 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -888,14 +888,6 @@ static u8 spectre_bhb_loop_affected(void) { u8 k = 0; - static const struct midr_range spectre_bhb_k132_list[] = { - MIDR_ALL_VERSIONS(MIDR_CORTEX_X3), - MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2), - }; - static const struct midr_range spectre_bhb_k38_list[] = { - MIDR_ALL_VERSIONS(MIDR_CORTEX_A715), - MIDR_ALL_VERSIONS(MIDR_CORTEX_A720), - }; static const struct midr_range spectre_bhb_k32_list[] = { MIDR_ALL_VERSIONS(MIDR_CORTEX_A78), MIDR_ALL_VERSIONS(MIDR_CORTEX_A78AE), @@ -909,7 +901,6 @@ static u8 spectre_bhb_loop_affected(void) }; static const struct midr_range spectre_bhb_k24_list[] = { MIDR_ALL_VERSIONS(MIDR_CORTEX_A76), - MIDR_ALL_VERSIONS(MIDR_CORTEX_A76AE), MIDR_ALL_VERSIONS(MIDR_CORTEX_A77), MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1), MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_GOLD), @@ -925,11 +916,7 @@ static u8 spectre_bhb_loop_affected(void) {}, }; - if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k132_list)) - k = 132; - else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k38_list)) - k = 38; - else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k32_list)) + if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k32_list)) k = 32; else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k24_list)) k = 24;