From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1755098AbdCTN5J (ORCPT <rfc822;w@1wt.eu>);
        Mon, 20 Mar 2017 09:57:09 -0400
Received: from foss.arm.com ([217.140.101.70]:39138 "EHLO foss.arm.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1753188AbdCTN5E (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 20 Mar 2017 09:57:04 -0400
Date: Mon, 20 Mar 2017 13:56:42 +0000
From: Mark Rutland <mark.rutland@arm.com>
To: Marc Zyngier <marc.zyngier@arm.com>, suzuki.poulose@arm.com
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Scott Wood <oss@buserror.net>, Will Deacon <will.deacon@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Hanjun Guo <hanjun.guo@linaro.org>,
        Ding Tianhong <dingtianhong@huawei.com>
Subject: Re: [PATCH 03/17] arm64: Allow checking of a CPU-local erratum
Message-ID: <20170320135641.GD31213@leverpostej>
References: <20170306112622.13853-1-marc.zyngier@arm.com>
 <20170306112622.13853-4-marc.zyngier@arm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170306112622.13853-4-marc.zyngier@arm.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Mar 06, 2017 at 11:26:08AM +0000, Marc Zyngier wrote:
> this_cpu_has_cap() only checks the feature array, and not the errata
> one. In order to be able to check for a CPU-local erratum, allow it
> to inspect the latter as well.
> 
> This is consistent with cpus_have_cap()'s behaviour, which includes
> errata already.
> 
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

This sounds sensible to me.

Suzuki, any comments?

Thanks,
Mark.

> ---
>  arch/arm64/kernel/cpufeature.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
> index abda8e861865..6eb77ae99b79 100644
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@ -1090,20 +1090,29 @@ static void __init setup_feature_capabilities(void)
>   * Check if the current CPU has a given feature capability.
>   * Should be called from non-preemptible context.
>   */
> -bool this_cpu_has_cap(unsigned int cap)
> +static bool __this_cpu_has_cap(const struct arm64_cpu_capabilities *cap_array,
> +			       unsigned int cap)
>  {
>  	const struct arm64_cpu_capabilities *caps;
>  
>  	if (WARN_ON(preemptible()))
>  		return false;
>  
> -	for (caps = arm64_features; caps->desc; caps++)
> +	for (caps = cap_array; caps->desc; caps++)
>  		if (caps->capability == cap && caps->matches)
>  			return caps->matches(caps, SCOPE_LOCAL_CPU);
>  
>  	return false;
>  }
>  
> +extern const struct arm64_cpu_capabilities arm64_errata[];
> +
> +bool this_cpu_has_cap(unsigned int cap)
> +{
> +	return (__this_cpu_has_cap(arm64_features, cap) ||
> +		__this_cpu_has_cap(arm64_errata, cap));
> +}
> +
>  void __init setup_cpu_features(void)
>  {
>  	u32 cwg;
> -- 
> 2.11.0
>