From patchwork Fri Sep 11 18:16:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11771355 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD7D113B1 for ; Fri, 11 Sep 2020 18:16:34 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 305EE208E4 for ; Fri, 11 Sep 2020 18:16:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3e9gCKq7"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="eiTybIAl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 305EE208E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=crAFRmpnndugwguKNNxk8pYXyXNPg8Aec/HKvW/8KXI=; b=3e9gCKq7Op+P4CS5wYlf1NQacc pY5PW4iKRTjP5FH1nTcFtP2EYBvkldqAaavu5kONADtPLhrtaFxPTDjaYgJbFCpb19L/XXiYCjrtJ T5EUCNmVYhyQxyRJV3AVHVqojvhGY9uip9nFhQV6Jk6Ykbv6diqI7SGDfk+EPKIr0aBS7zxOSasgt +dH+msorJn2hZGqXc4ZfPyMAaYvlpx7u9z8lA7cp4lEvqmHTj9kQYkk04Ktn9kEl/PG2SwgFocy1Y TjCGAwWv+8NGbGGLH7PzWfrWpZ6IYhMQivQZUUMRkvJhYKm3MkP7xy0qAi8vovPOu4I+lG1LLJR33 kRg1xaeA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGnax-0002Zd-O1; Fri, 11 Sep 2020 18:16:23 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGnav-0002ZD-ID for linux-arm-kernel@lists.infradead.org; Fri, 11 Sep 2020 18:16:22 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 96F23208E4; Fri, 11 Sep 2020 18:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599848180; bh=T32Q8nI9EQZeRHzOoU030ut30uSORZzpric6mZ/q9JQ=; h=From:To:Cc:Subject:Date:From; b=eiTybIAlvbwYpM3R1bt7o+KjfJQF8th5FWAdN4USD8ACcy3XeiHWLihLLBas71AS6 G99ERR2VvnmC8NQm9LGwAcn/MoPWOoklQwyGJ1PVz0Y+6RmoTFV+tJNA2S4trwtLYR 1Lz16hlkVe31/dVeYby5SI1yr1VCFe5WSh8B0f0A= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=hot-poop.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kGnas-00B4mo-JZ; Fri, 11 Sep 2020 19:16:18 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: Allow CPUs unffected by ARM erratum 1418040 to come in late Date: Fri, 11 Sep 2020 19:16:11 +0100 Message-Id: <20200911181611.2073183-1-maz@kernel.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, will@kernel.org, catalin.marinas@arm.com, kernel-team@android.com, dianders@google.com, saiprakash.ranjan@codeaurora.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200911_141621_671077_62DE22DD X-CRM114-Status: GOOD ( 15.17 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , Sai Prakash Ranjan , kernel-team@android.com, Will Deacon , Doug Anderson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Now that we allow CPUs affected by erratum 1418040 to come in late, this prevents their unaffected sibblings from coming in late (or coming back after a suspend or hotplug-off, which amounts to the same thing). To allow this, we need to add ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU, which amounts to set .type to ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE. Reported-by: Doug Anderson Tested-by: Sai Prakash Ranjan Fixes: bf87bb0881d0 ("arm64: Allow booting of late CPUs affected by erratum 1418040") Signed-off-by: Marc Zyngier Acked-by: Will Deacon Tested-by: Matthias Kaehlcke Reported-by: Matthias Kaehlcke --- arch/arm64/kernel/cpu_errata.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index c332d49780dc..560ba69e13c1 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -910,8 +910,12 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .desc = "ARM erratum 1418040", .capability = ARM64_WORKAROUND_1418040, ERRATA_MIDR_RANGE_LIST(erratum_1418040_list), - .type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | - ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU), + /* + * We need to allow affected CPUs to come in late, but + * also need the non-affected CPUs to be able to come + * in at any point in time. Wonderful. + */ + .type = ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE, }, #endif #ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT