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 76370224AFA for ; Thu, 17 Apr 2025 10:02:01 +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=1744884121; cv=none; b=S46Gu8j6VBjmIUl9+NdwDyYmzZQH1t/SneipjmyFLIZ9nIpjYYm9/SYhsXVQyQVynJAOetdJsPOehpYjrTmwZhr0M3CzIcgpYmOvxGTBffsKfypS7eBN3N3oTIVDhzjbl00TWg85BFas0spuR8NaTKNztI//4liix5d/9hZHA3k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744884121; c=relaxed/simple; bh=gg1GSUe6h2Db+5DVlqXqs4iwOHuGjpH98IivaADsdus=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=sgErZWeCujDiCKkYJrP2/EOATo5N2EkQXhTYmfgCTgEywYs47HJGl6OTIy38CvNUgNcP3RGNntUdGKyxomsuiiJ8aWowmDs/ElqsxUSzkkA2Qyj2gwkokLStQvtezKJfBYwxCoeLmlMnMrMCGsYdrXmwh9j1Os7Tq2Y0vTxkCTs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GPtrMgpV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GPtrMgpV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81205C4CEE7; Thu, 17 Apr 2025 10:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744884120; bh=gg1GSUe6h2Db+5DVlqXqs4iwOHuGjpH98IivaADsdus=; h=Subject:To:Cc:From:Date:From; b=GPtrMgpVYa3SjB5zdU+dp+vu9wFBzhnp0uHQjOI32Sk2/efLPB/e5bXj1tXf8pxX+ TogXvWuSvOutPStBCpYbwfnzGhYtOOx0QG8hYEpZTHiskA3Qtzktl3wu2l6+M+APT4 sQe+4EzpfXaLrf+4pw/fcbrDJR6ws6EJIHTRx0vQ= Subject: FAILED: patch "[PATCH] arm64: errata: Add KRYO 2XX/3XX/4XX silver cores to Spectre" failed to apply to 6.12-stable tree To: dianders@chromium.org,catalin.marinas@arm.com,quic_tsoni@quicinc.com,sbauer@quicinc.com Cc: From: Date: Thu, 17 Apr 2025 12:01:52 +0200 Message-ID: <2025041752-quality-unhealthy-4f09@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.12-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y git checkout FETCH_HEAD git cherry-pick -x 0c9fc6e652cd5aed48c5f700c32b7642bea7f453 # git commit -s git send-email --to '' --in-reply-to '2025041752-quality-unhealthy-4f09@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 0c9fc6e652cd5aed48c5f700c32b7642bea7f453 Mon Sep 17 00:00:00 2001 From: Douglas Anderson Date: Tue, 7 Jan 2025 12:06:00 -0800 Subject: [PATCH] arm64: errata: Add KRYO 2XX/3XX/4XX silver cores to Spectre BHB safe list Qualcomm has confirmed that, much like Cortex A53 and A55, KRYO 2XX/3XX/4XX silver cores are unaffected by Spectre BHB. Add them to the safe list. Fixes: 558c303c9734 ("arm64: Mitigate spectre style branch history side channels") Cc: stable@vger.kernel.org Cc: Scott Bauer Signed-off-by: Douglas Anderson Acked-by: Trilok Soni Link: https://lore.kernel.org/r/20250107120555.v4.3.Iab8dbfb5c9b1e143e7a29f410bce5f9525a0ba32@changeid Signed-off-by: Catalin Marinas diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index 17aa836fe46d..89405be53d8f 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -854,6 +854,9 @@ static bool is_spectre_bhb_safe(int scope) MIDR_ALL_VERSIONS(MIDR_CORTEX_A510), MIDR_ALL_VERSIONS(MIDR_CORTEX_A520), MIDR_ALL_VERSIONS(MIDR_BRAHMA_B53), + MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_2XX_SILVER), + MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER), + MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER), {}, }; static bool all_safe = true;