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=-15.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 794F9C433DB for ; Fri, 22 Jan 2021 18:55:24 +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 3352A23AC8 for ; Fri, 22 Jan 2021 18:55:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3352A23AC8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2Zk1qPak5FlsolEl6E3FtxF5cmNK/k4o6sb/M9dFxz8=; b=XPPYJuUYdqLhu4okq8KhzigVj UNG6rvEG3MBmcs7hcO5zq2IY6DIzQw6wgDu2T/9233pONzmLgZcBylcxKtmiUfQgoQg5OxIdZe4Wg xQFcxfoDoDEPP0/rCJMEx3BVBQxX9u+ROCntaYqZS42mTXsN+IrnPiW6ZhYq426XtE1yJWiOJSs/E 8dtKi7iWJeyBMpRhObRqicljvz9546Ir3NBdZqyCFDAATTM0D9HhCcPo+AdYqLFD49pa4FI8Nc+ck I5X08YxELe0MVdPEXx7rz+zK8qZiAVkAxGXwsfzmIrFC2KwSOBqttiN/VwsYmh0uLFKkLKoEmn5H3 4GdSP4AEg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l31ZD-0004ji-7N; Fri, 22 Jan 2021 18:53:55 +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 1l31ZA-0004it-96 for linux-arm-kernel@lists.infradead.org; Fri, 22 Jan 2021 18:53:53 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0B8F623AC1; Fri, 22 Jan 2021 18:53:47 +0000 (UTC) Date: Fri, 22 Jan 2021 18:53:45 +0000 From: Catalin Marinas To: Marc Zyngier Subject: Re: [PATCH v4 10/21] arm64: cpufeature: Use IDreg override in __read_sysreg_by_encoding() Message-ID: <20210122185344.GH8567@gaia> References: <20210118094533.2874082-1-maz@kernel.org> <20210118094533.2874082-11-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210118094533.2874082-11-maz@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210122_135352_491053_45072BD9 X-CRM114-Status: GOOD ( 23.47 ) 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: Mark Rutland , Jing Zhang , Prasad Sodagudi , Srinivas Ramana , Suzuki K Poulose , Alexandru Elisei , linux-kernel@vger.kernel.org, Ard Biesheuvel , James Morse , Julien Thierry , Ajay Patil , kernel-team@android.com, David Brazdil , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jan 18, 2021 at 09:45:22AM +0000, Marc Zyngier wrote: > __read_sysreg_by_encoding() is used by a bunch of cpufeature helpers, > which should take the feature override into account. Let's do that. > > For a good measure (and because we are likely to need to further > down the line), make this helper available to the rest of the > non-modular kernel. > > Code that needs to know the *real* features of a CPU can still > use read_sysreg_s(), and find the bare, ugly truth. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/include/asm/cpufeature.h | 1 + > arch/arm64/kernel/cpufeature.c | 15 +++++++++++++-- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h > index 465d2cb63bfc..fe0130d6c0ff 100644 > --- a/arch/arm64/include/asm/cpufeature.h > +++ b/arch/arm64/include/asm/cpufeature.h > @@ -602,6 +602,7 @@ void __init setup_cpu_features(void); > void check_local_cpu_capabilities(void); > > u64 read_sanitised_ftr_reg(u32 id); > +u64 __read_sysreg_by_encoding(u32 sys_id); > > static inline bool cpu_supports_mixed_endian_el0(void) > { > diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c > index aaa075c6f029..48a011935d8c 100644 > --- a/arch/arm64/kernel/cpufeature.c > +++ b/arch/arm64/kernel/cpufeature.c > @@ -1149,14 +1149,17 @@ u64 read_sanitised_ftr_reg(u32 id) > EXPORT_SYMBOL_GPL(read_sanitised_ftr_reg); > > #define read_sysreg_case(r) \ > - case r: return read_sysreg_s(r) > + case r: val = read_sysreg_s(r); break; > > /* > * __read_sysreg_by_encoding() - Used by a STARTING cpu before cpuinfo is populated. > * Read the system register on the current CPU > */ > -static u64 __read_sysreg_by_encoding(u32 sys_id) > +u64 __read_sysreg_by_encoding(u32 sys_id) > { > + struct arm64_ftr_reg *regp; > + u64 val; > + > switch (sys_id) { > read_sysreg_case(SYS_ID_PFR0_EL1); > read_sysreg_case(SYS_ID_PFR1_EL1); > @@ -1199,6 +1202,14 @@ static u64 __read_sysreg_by_encoding(u32 sys_id) > BUG(); > return 0; > } > + > + regp = get_arm64_ftr_reg(sys_id); > + if (regp && regp->override_mask && regp->override_val) { > + val &= ~*regp->override_mask; > + val |= (*regp->override_val & *regp->override_mask); > + } > + > + return val; Ah, now the previous patch makes more sense. I don't particularly like this but I can't tell how to work around it. I was hoping that the overriding feature behaves more like a secondary CPU that limits all the overridden features. However, this approach would fail for FTR_EXACT cases (like PAC, though I wonder whether it fails already with your previous patch since the boot CPU value won't match the override, hence dropping to the safe one). -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel