From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 EA158CA9EC5 for ; Tue, 29 Oct 2019 17:06:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C04FF20874 for ; Tue, 29 Oct 2019 17:06:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XVWRXF/o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390683AbfJ2RGi (ORCPT ); Tue, 29 Oct 2019 13:06:38 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40332 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727279AbfJ2RGi (ORCPT ); Tue, 29 Oct 2019 13:06:38 -0400 Received: by mail-pg1-f195.google.com with SMTP id 15so10007316pgt.7 for ; Tue, 29 Oct 2019 10:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=u4GnrTtOrQejEaELYRBPSBE1OQ/6WvsreGc0J38yGc4=; b=XVWRXF/oQeqO5hH9MARUaj/lEcqlZvJbHvV6EO4Kut1kVF5eW35IIzTOHx/WYTrR54 X3Ltd/8PkY9MLBzG7hJTP9eGaRITzL890W1dDPbxiDe1GZakMyCU0ElbfFOGkTdZ18uU YDBrfpUcUilQVaDw38ZYzkoCcHPJrglUtXc/+QL+kXavMHBjwJVJy3YHB4GJsliSzCrz FF05853tBjX97KOLJx1zMwKIrvNbNo8wMQ1Zuhi0/K7wDoBw35GUmfbeFrepewkFZhVa KDIby2o4jPPDg6NZNtMU/naIDRSlvVWPED0z6MorsCcmq7niig++8q81VSvN+ZbZFxHQ FpIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=u4GnrTtOrQejEaELYRBPSBE1OQ/6WvsreGc0J38yGc4=; b=fu3HayjiRdfjOCokWyEn4TYqIltLwZ+xbvwOydE0nF2wzO41UwC3JMC2KfrEQwR90o eN+dTitjGjMt0LlDTCuYouF8iQ9TWAXioqZ3pVDVQgZSirFeMdPs4gjkZ0M5dXeQPZzj M/n7nNMM/WZ8hw6BuRaqL2zRPpDumTnqFfsNUbn33eNcEBRRWavDkKfPbuw1uJeSfxf9 1AKEJMxh1/w3+VZmGzaGb+3ze51xw/LMCv3zWRqUVQtHaROzlUMA65hc65wfHkR03V4P AMr1TbmPAklNkr4xoCNwX4wMLtSf4eABFl2Gie2JxFQtSlPDIt0Rln87Tw1uxPVJz8TZ NI9w== X-Gm-Message-State: APjAAAVZ14UwA1oJyGpH3MhCbSmzDqNKrI3ceXxy/pM6Klp4Ze7Mykcg v4SSuvfSl4Jtifg1OdupacWJWg== X-Google-Smtp-Source: APXvYqxxmhkL7zLBgZCW8TKbKUkshYT4R+uLXT2RMbgocDu5SuK+1rnnfEXwzR+Htceb946hUMHc/A== X-Received: by 2002:a65:5541:: with SMTP id t1mr28199191pgr.39.1572368797042; Tue, 29 Oct 2019 10:06:37 -0700 (PDT) Received: from minitux (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id 37sm13127555pgv.32.2019.10.29.10.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2019 10:06:36 -0700 (PDT) Date: Tue, 29 Oct 2019 10:06:33 -0700 From: Bjorn Andersson To: Suzuki K Poulose Cc: will@kernel.org, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, stable@vger.kernel.org, broonie@kernel.org Subject: Re: [PATCH] arm64: cpufeature: Enable Qualcomm erratas Message-ID: <20191029170633.GX571@minitux> References: <20191029060432.1208859-1-bjorn.andersson@linaro.org> <20191029113956.GC12103@willie-the-truck> <1d1a3dca-16ce-f541-5d78-e61ad24227e0@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1d1a3dca-16ce-f541-5d78-e61ad24227e0@arm.com> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue 29 Oct 05:04 PDT 2019, Suzuki K Poulose wrote: > On 10/29/2019 11:39 AM, Will Deacon wrote: > > On Mon, Oct 28, 2019 at 11:04:32PM -0700, Bjorn Andersson wrote: > > > With the introduction of 'cce360b54ce6 ("arm64: capabilities: Filter the > > > entries based on a given mask")' the Qualcomm erratas are no long > > > applied. > > > > > > The result of not applying errata 1003 is that MSM8996 runs into various > > > RCU stalls and fails to boot most of the times. > > > > > > Give both 1003 and 1009 a "type" to ensure they are not filtered out in > > > update_cpu_capabilities(). > > > > Oh nasty. Thanks for debugging and fixing this. > > > > > Fixes: cce360b54ce6 ("arm64: capabilities: Filter the entries based on a given mask") > > > Cc: stable@vger.kernel.org > > > Reported-by: Mark Brown > > > Suggested-by: Will Deacon > > > Signed-off-by: Bjorn Andersson > > > --- > > > arch/arm64/kernel/cpu_errata.c | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c > > > index df9465120e2f..cdd8df033536 100644 > > > --- a/arch/arm64/kernel/cpu_errata.c > > > +++ b/arch/arm64/kernel/cpu_errata.c > > > @@ -780,6 +780,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { > > > { > > > .desc = "Qualcomm Technologies Falkor/Kryo erratum 1003", > > > .capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003, > > > + .type = ARM64_CPUCAP_SCOPE_LOCAL_CPU, > > > .matches = cpucap_multi_entry_cap_matches, > > > > This should probably be ARM64_CPUCAP_LOCAL_CPU_ERRATUM instead, but I'll > > want Suzuki's ack before I take the change. > > Yes, it must be ARM64_CPUCAP_LOCAL_CPU_ERRATUM. > Thanks, will fix. > It may be a good idea to stick in a check to make sure that the scope is > set for all the capabilities in a separate patch. e.g, > > diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c > index d260e3bdf07b..51a79b4a44eb 100644 > --- a/arch/arm64/kernel/cpufeature.c > +++ b/arch/arm64/kernel/cpufeature.c > @@ -546,6 +546,8 @@ static void __init > init_cpu_hwcaps_indirect_list_from_array(const struct > arm64_cpu_capabilities *caps) > { > for (; caps->matches; caps++) { > + WARN(!cpucap_default_scope(caps), > + "Invalid scope for capability %d\n", caps->capability); > if (WARN(caps->capability >= ARM64_NCAPS, > "Invalid capability %d\n", caps->capability)) > continue; In hindsight this would have saved me a considerable amount of time, so I like this proposal! Regards, Bjorn > > Otherwise looks good to me. > > > > .match_list = qcom_erratum_1003_list, > > > }, > > > @@ -788,6 +789,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { > > > { > > > .desc = "Qualcomm erratum 1009, ARM erratum 1286807", > > > .capability = ARM64_WORKAROUND_REPEAT_TLBI, > > > + .type = ARM64_CPUCAP_SCOPE_LOCAL_CPU, > > > ERRATA_MIDR_RANGE_LIST(arm64_repeat_tlbi_cpus), > > > > ERRATA_MIDR_RANGE_LIST sets the type already, so I think this is redundant. > > > > Will > > > > > > Cheers > Suzuki