Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0B66C00454 for ; Wed, 11 Dec 2019 15:27:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADA902173E for ; Wed, 11 Dec 2019 15:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576078059; bh=lQByssjgqWaVZWGX1nyIVM5aR1JZ2it8lsG75l/CR1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oMRyOKpS1rdHvxWok4msq2iRtuHQJEPPZgzj5M+pkaONb05j/LCyARdpMHt364bRX uTxBP28KtdlB8Ne4JJjHqlb0u0+niDJZ3BDDyICtlPccbhbbtirwJE/p94NSO92wwm oMg5uJBaaFc6t0dTIh0bGSvL5E8PW5OHL7CC9gEQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387443AbfLKP1i (ORCPT ); Wed, 11 Dec 2019 10:27:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:33288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733108AbfLKP1i (ORCPT ); Wed, 11 Dec 2019 10:27:38 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F1C06222C4; Wed, 11 Dec 2019 15:27:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576078057; bh=lQByssjgqWaVZWGX1nyIVM5aR1JZ2it8lsG75l/CR1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fyEz/ekuPm0VAL/5WLsJHwdJ6Til5jgeiDkmw63ddywzu5+GERJaLs7SR2ksf0ltW YJUCtDlAX/L9KNlX69HULSdg4z0ovU9Kc1Xnps+tXzOeRFmnRTNj3T34ZzIV6rK2OO vx6vviJSjsh+A19WIYWC0zbcF9HCw7Mwz1mfLb9U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Doug Berger , Florian Fainelli , Russell King , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 50/79] ARM: 8937/1: spectre-v2: remove Brahma-B53 from hardening Date: Wed, 11 Dec 2019 10:26:14 -0500 Message-Id: <20191211152643.23056-50-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211152643.23056-1-sashal@kernel.org> References: <20191211152643.23056-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Doug Berger [ Upstream commit 4ae5061a19b550dfe25397843427ed2ebab16b16 ] When the default processor handling was added to the function cpu_v7_spectre_init() it only excluded other ARM implemented processor cores. The Broadcom Brahma B53 core is not implemented by ARM so it ended up falling through into the set of processors that attempt to use the ARM_SMCCC_ARCH_WORKAROUND_1 service to harden the branch predictor. Since this workaround is not necessary for the Brahma-B53 this commit explicitly checks for it and prevents it from applying a branch predictor hardening workaround. Fixes: 10115105cb3a ("ARM: spectre-v2: add firmware based hardening") Signed-off-by: Doug Berger Signed-off-by: Florian Fainelli Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/mm/proc-v7-bugs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mm/proc-v7-bugs.c b/arch/arm/mm/proc-v7-bugs.c index 9a07916af8dd2..a6554fdb56c54 100644 --- a/arch/arm/mm/proc-v7-bugs.c +++ b/arch/arm/mm/proc-v7-bugs.c @@ -65,6 +65,9 @@ static void cpu_v7_spectre_init(void) break; #ifdef CONFIG_ARM_PSCI + case ARM_CPU_PART_BRAHMA_B53: + /* Requires no workaround */ + break; default: /* Other ARM CPUs require no workaround */ if (read_cpuid_implementor() == ARM_CPU_IMP_ARM) -- 2.20.1