From patchwork Thu Oct 24 12:48:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 177440 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2142265ill; Thu, 24 Oct 2019 05:49:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqwTGnJTtbjyBpDa7bvkVp2OpBOcuBN4qzOr2+QcS0i3ATG10kUS7NXqTLd9QAJSDNJpW6O7 X-Received: by 2002:a17:906:1651:: with SMTP id n17mr37094704ejd.220.1571921358495; Thu, 24 Oct 2019 05:49:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571921358; cv=none; d=google.com; s=arc-20160816; b=cRuzMK4Zu6I/dkytt49mxDk50hp/dpYJs5b/QK7R6Qtgloumb5UtZ3ue6Y6OgEP6sA Cuhih+BznadLgeDPZghrJDk4/H2+nNNK3oYFCLTwmhhismNYfEi0yHwqsdkZJ/okIFmG Giq2ducbBhayeFPSFT2Inccg5phNrI4BGABGHm+KcZ5lfO5DYsXQpDFCHKHaKqbzsWSc s1ekoYeZ7gEfzVlMBGTXdsD8zAWnJya75JGmI5nPjJ1iCbZYtSwsqiuSisZNCUOCkFn2 +ouzz/FKaV9vIiMfTFYu9sTRKWy50H6NWGmrwaZBCazGs+MJK9GwZAfSg+g7dktgkLZp knHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uZJuGMTWF5qRFyb7iiSg0MWxdZKBAoQdF2RYT4fwFtE=; b=MNdHoAYlulJHLvFZrprNN0//ChKh0qfN9l1jw5A5nohmUN0XTm9cUOit2apJxDp+uG uhtlcGDoX4gqnOb/htPjbsP/OMz0iPrBxTAmUWcuzRzKQ6upARaiLG+uqpUA1bKqLolC n0xco5E9Vlthlk6BtKHR7NxLfmI9KSmgtUbr5Amv9FVk+yMA095obqaFD7ISz3vu6kmY mpCwBLm4GgBTOLOZu0zinM0QbZXnonVg6Z1dbpY/8MKBzOARurVEoDKzrg97S+hy+2ZG UFm1liLxnZD8/vd/u5SYX5Ohsb8kkS5BMfH5ETboT0j9VeWzR4pByhbn1uBT1w3bkpW6 KKSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=auHjKwFC; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f3si12973378eda.251.2019.10.24.05.49.18; Thu, 24 Oct 2019 05:49:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=auHjKwFC; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729502AbfJXMtR (ORCPT + 14 others); Thu, 24 Oct 2019 08:49:17 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53189 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729266AbfJXMtR (ORCPT ); Thu, 24 Oct 2019 08:49:17 -0400 Received: by mail-wm1-f65.google.com with SMTP id p21so1253093wmg.2 for ; Thu, 24 Oct 2019 05:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uZJuGMTWF5qRFyb7iiSg0MWxdZKBAoQdF2RYT4fwFtE=; b=auHjKwFCEj/n1R/QBrTzou0FU9vjtK4tyWmgpX2FaNpWZ1ZDdTcVNr9iJbWaXhVIWL oeXaPXEcPDDMcNf9/q9qvrEp6rtaXHQtBoegb2BNLxlanldAaEABH0dMQUpv0nFeaPn6 TLnhDCFDkzz5ihoWw8ClaiqKawsheCWEZ/pSJikJmnxuVO+Fm7UhBLfsJv4h++QKGebs HFkKpHKPFIGsEIN/N+/ZzOm6bDMZoo9ayNmfgKIiUcZhJP8sPa1SHSYJvMHL7eHNr7XB qMctOgaW1OZ8hXFxArRPYawJ+S/LXKt0fsH1MFkpumUxaimk4n/Slw/xhNhRd0yUs9WX RQpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uZJuGMTWF5qRFyb7iiSg0MWxdZKBAoQdF2RYT4fwFtE=; b=hSfgF/pRrkl0S4x61OM1KNYlSvVlJhnYH4+Jm12wN9DaIk7muS41WAcS6FTCR7Ryxb U/iaqyqLHB7wHBpKp/f+UqEbAvAzLDR2yWQcycEyemaN+GUnFn2WIKCPqwoqoHP1NN2a pnClvytx5gh3iBAhuqiyJP6EPM0jReO24o/pwiBOWvU1wisaGQOnvdoseR5+1PbVobyH +0g7jzgEhxg8KxFd/xaCeYtx8IWETGpRc6hbQRfiA1ijapAV0Wox+uc2tRUv1jF3dyU/ gucufXhhsVsp7vas4H1UPr4VDN3dDr9Bs5wMcd+mOj3nMNpoexakMHmBCPaf11DOzXDD B4Hg== X-Gm-Message-State: APjAAAV0CeqiFjHxLoHBL9FOE14eYj6fiVhYfe8DUmZ9N1/waIjGsWT7 tDZWQkWrltPfcDl4+3LyK6N1jUu2fn8TMFBf X-Received: by 2002:a1c:a6c8:: with SMTP id p191mr4474907wme.99.1571921355681; Thu, 24 Oct 2019 05:49:15 -0700 (PDT) Received: from localhost.localdomain (aaubervilliers-681-1-126-126.w90-88.abo.wanadoo.fr. [90.88.7.126]) by smtp.gmail.com with ESMTPSA id j22sm29111038wrd.41.2019.10.24.05.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 05:49:14 -0700 (PDT) From: Ard Biesheuvel To: stable@vger.kernel.org Cc: Ard Biesheuvel , Will Deacon , Catalin Marinas , Marc Zyngier , Mark Rutland , Suzuki K Poulose , Jeremy Linton , Andre Przywara , Alexandru Elisei , Dave Martin , Will Deacon Subject: [PATCH for-stable-4.14 18/48] arm64: capabilities: Split the processing of errata work arounds Date: Thu, 24 Oct 2019 14:48:03 +0200 Message-Id: <20191024124833.4158-19-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191024124833.4158-1-ard.biesheuvel@linaro.org> References: <20191024124833.4158-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suzuki K Poulose [ Upstream commit d69fe9a7e7214d49fe157ec20889892388d0fe23 ] Right now we run through the errata workarounds check on all boot active CPUs, with SCOPE_ALL. This wouldn't help for detecting erratum workarounds with a SYSTEM_SCOPE. There are none yet, but we plan to introduce some: let us clean this up so that such workarounds can be detected and enabled correctly. So, we run the checks with SCOPE_LOCAL_CPU on all CPUs and SCOPE_SYSTEM checks are run only once after all the boot time CPUs are active. Reviewed-by: Dave Martin Signed-off-by: Suzuki K Poulose Signed-off-by: Will Deacon Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/cpufeature.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index bc76597abe7b..291f8899b37f 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -529,7 +529,7 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info) * Run the errata work around checks on the boot CPU, once we have * initialised the cpu feature infrastructure. */ - update_cpu_capabilities(arm64_errata, SCOPE_ALL, + update_cpu_capabilities(arm64_errata, SCOPE_LOCAL_CPU, "enabling workaround for"); } @@ -1354,7 +1354,7 @@ void check_local_cpu_capabilities(void) * advertised capabilities. */ if (!sys_caps_initialised) - update_cpu_capabilities(arm64_errata, SCOPE_ALL, + update_cpu_capabilities(arm64_errata, SCOPE_LOCAL_CPU, "enabling workaround for"); else verify_local_cpu_capabilities(); @@ -1383,6 +1383,8 @@ void __init setup_cpu_features(void) /* Set the CPU feature capabilies */ update_cpu_capabilities(arm64_features, SCOPE_ALL, "detected:"); + update_cpu_capabilities(arm64_errata, SCOPE_SYSTEM, + "enabling workaround for"); enable_cpu_capabilities(arm64_features, SCOPE_ALL); enable_cpu_capabilities(arm64_errata, SCOPE_ALL); mark_const_caps_ready();