From patchwork Sun Oct 27 21:00:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 177874 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2551205ill; Sun, 27 Oct 2019 14:34:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxlKcpse3FSVbhY+ibtElP6GDD07ShxRhgYPIfbb21+duOFcWa3PwkQkIEJX38EQbiB8ZAB X-Received: by 2002:a05:6402:1ad0:: with SMTP id ba16mr7302896edb.107.1572212056172; Sun, 27 Oct 2019 14:34:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572212056; cv=none; d=google.com; s=arc-20160816; b=JNSZfVZU9d3Ali2F9WVVyYQbunlBH3qu4j40iM5hbU56Ykx4cuR9VSO9WdO1Dyv2fc Ki8cc5cV3+0uzhyfZEWLsq/4ijGegxB9lzNzPeI2mhIWjgUdsU8wSeoObeOk+IHUf2+U Fl5vWXy7nrSJMp0AZSGPns3CjDmnZwXVXUnR2Zp6Hkc2J0KKpMJv6R2SYeWFAL8O+Uru eV7RbUdyOk9VqedXbE7sN76rjZ0k50Cbb7DVvDScE7a0/+xvIWF+YdklbRWUN10/9IPt XbnP/vlcHvKIPeS7cARwUL7YBmW0nb7ZvEgXBL/wvQI28haIYxpp/PXzy7RQGiDJoWWe etEA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=58AdapK5KDOvmBBwJel4QvyHVucYoklgnVX8iqobUQ8=; b=zW2tCIwWfTiRoGjk1CzQgtIZPH4nBQTrH0cixBkriKl9k7NswQ0aO4kpqx/CuxNoux ZgG70G75qAgKl9B20LIzUbcHfgt5vbUFBG1gLTFZA/cTVCa816OHD5t/myBl+aFkhrDu JHg8qMuzx08kqAQOQjqPZo8UZ4crgCShSosQHXMtfheLd07Z+3VbkIBZCyItymcDWA96 Fsf9MfDJZzzIK3dGCn811KbxfNOJ62Rd5yT15Y3KPenWt3gmTHDrO/SZ3NcHB33rGAgR 6AdyP5Sa5Lhb/MKIbLxC2IRpQdBNvY1cnCJan/ttU/TIbrl9x+UTKtlhtMxBU785rS+4 onVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TLjiSV8Y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g17si6252896edh.379.2019.10.27.14.34.15; Sun, 27 Oct 2019 14:34:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=TLjiSV8Y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731977AbfJ0VeO (ORCPT + 26 others); Sun, 27 Oct 2019 17:34:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:57802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729866AbfJ0VLR (ORCPT ); Sun, 27 Oct 2019 17:11:17 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 2FDE120B7C; Sun, 27 Oct 2019 21:11:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210676; bh=Dtp35a4Nu/vEQ4v7SvCS3q/U0bReA8dUOwAIgbfA+Uc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TLjiSV8YH0xuHjbZFofkFVj/zu20iK9NQ5/gjSwTLDufHzlF3ChhRwZ+qmFhp7vv5 N0i4LAj+dVDj/vh8xXcUUAdex/IVeB4Hg/Jsq0kmmcWvkjSSwm+PvX7odyaU55/wlN cLJmSvbzIz8plpW2AHZBwKXPHeuhM06VvgS0Tgrw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Dave Martin , Suzuki K Poulose , Will Deacon , Ard Biesheuvel Subject: [PATCH 4.14 054/119] arm64: capabilities: Split the processing of errata work arounds Date: Sun, 27 Oct 2019 22:00:31 +0100 Message-Id: <20191027203323.540318577@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203259.948006506@linuxfoundation.org> References: <20191027203259.948006506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/cpufeature.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -529,7 +529,7 @@ void __init init_cpu_features(struct cpu * 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();