From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D8A4288C02; Mon, 5 May 2025 23:06:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486404; cv=none; b=EsxrLITetrjGxcgbxNFuIegv4Hc7irpZTLkyZm4O9NDSzU85/Hal5gnjytf62SAsT0Eawij+UJmo044Kbbuk8loB3glmsvWMkKugaH2tVtFZrghmhlgJ6mnRoDMrX+DjEbcP4ZoA8pWdCxNvu13b8JQkiGO9Pkkjm48FaSAAlSg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486404; c=relaxed/simple; bh=ZkZQ/9nwclQTR3scMqCLO0o62FBh8uAOVK6Lf/oEBc4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dYJKQVdgppwJJZVBhnR5yNzHnItfHCRLwRuvgilu0GfmQeRQrEGkGFwcYSyQa/C8kwCul9ICsFOIukhQtHDEAGNUFHkrNMRKarND5+rjY4lJ52n0jpjtjr9OGvh9Mo9HK85fa7aK0V6D2LA62mQ1sJLH4FVnsf35WwdG1u4jU5w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H+oMuNKH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H+oMuNKH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9D19C4CEEE; Mon, 5 May 2025 23:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486403; bh=ZkZQ/9nwclQTR3scMqCLO0o62FBh8uAOVK6Lf/oEBc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H+oMuNKH5nvY958d2IAIfjHseQ+GuPYXsez0Rcaa/Gnxmgs8vS3bVKuvegmTAcOWu bQ0faIG1gpyn1BjI24p00/Q+iAdzt17PTj77wAU0/2ldbpKLGEWWxWXpaU4KHdiBVQ VwVicKIs4uQs5nkmyGoW0KMbHp042zhVUUUebBnbPpiiusqKrv+VD1c3N9bWEIm/yW E25n2ltmzIng21OYVmR2S59bMHFTdvzr62ymQ7SwR9y4j+vJDjxo+QQMtjGLJ18h0U /UES939eAsUPqFe4+LQUZNeIlRpeLb0pzPLpl8p2hnrU6eCB6ZpH3fe7YGEuv3bjo+ /WBKEwBIzCCgA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jinqian Yang , Catalin Marinas , Sasha Levin , will@kernel.org, mark.rutland@arm.com, oliver.upton@linux.dev, shameerali.kolothum.thodi@huawei.com, dianders@chromium.org, maz@kernel.org, scott@os.amperecomputing.com, quic_tsoni@quicinc.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 010/212] arm64: Add support for HIP09 Spectre-BHB mitigation Date: Mon, 5 May 2025 19:03:02 -0400 Message-Id: <20250505230624.2692522-10-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.136 Content-Transfer-Encoding: 8bit From: Jinqian Yang [ Upstream commit e18c09b204e81702ea63b9f1a81ab003b72e3174 ] The HIP09 processor is vulnerable to the Spectre-BHB (Branch History Buffer) attack, which can be exploited to leak information through branch prediction side channels. This commit adds the MIDR of HIP09 to the list for software mitigation. Signed-off-by: Jinqian Yang Link: https://lore.kernel.org/r/20250325141900.2057314-1-yangjinqian1@huawei.com Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/include/asm/cputype.h | 2 ++ arch/arm64/kernel/proton-pack.c | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index cdb024dd33f5c..99c73f835731c 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -131,6 +131,7 @@ #define FUJITSU_CPU_PART_A64FX 0x001 #define HISI_CPU_PART_TSV110 0xD01 +#define HISI_CPU_PART_HIP09 0xD02 #define APPLE_CPU_PART_M1_ICESTORM 0x022 #define APPLE_CPU_PART_M1_FIRESTORM 0x023 @@ -199,6 +200,7 @@ #define MIDR_NVIDIA_CARMEL MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_CARMEL) #define MIDR_FUJITSU_A64FX MIDR_CPU_MODEL(ARM_CPU_IMP_FUJITSU, FUJITSU_CPU_PART_A64FX) #define MIDR_HISI_TSV110 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_TSV110) +#define MIDR_HISI_HIP09 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_HIP09) #define MIDR_APPLE_M1_ICESTORM MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM) #define MIDR_APPLE_M1_FIRESTORM MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM) #define MIDR_APPLE_M1_ICESTORM_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_PRO) diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index 93a00cd42eddb..54b0364a4e2b0 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -913,6 +913,7 @@ static u8 spectre_bhb_loop_affected(void) MIDR_ALL_VERSIONS(MIDR_CORTEX_A77), MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1), MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_GOLD), + MIDR_ALL_VERSIONS(MIDR_HISI_HIP09), {}, }; static const struct midr_range spectre_bhb_k11_list[] = { -- 2.39.5