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.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 04DC6C433DB for ; Sat, 23 Jan 2021 14:07:01 +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 A982222B51 for ; Sat, 23 Jan 2021 14:07:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A982222B51 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=mAFHMonfd2cEH34O6/p81a4oTCC3rWJaT77+0vEYk/Q=; b=IxKMFTKI8cX/m3daAQvQ3bDE1 wdFDSXMUkm9OWYnYRFc45fMo0KzL79VaOpqhLn+gTj+Xz4TC+71MCt7lIlDfo/Heo3qc6Ms6OMJ7F HcnYi3qtup7WckIsnwDOkxYFHH1VNR4LA/FKJqmXO9x8P5m8bon86DS67foHj44YZRWt//2d+hEjd PSh5z8L9aZhKcfv7SzgcBoNVfgKG0klxEjIhxTT/jUIVgA3k9Jv334dkEq4CHFH0OykxphOfga0Nf yclPSXvmrEUpiXCJ6quPel1p9aHy4FryBq3ls1zoXxY9o0Sg/q2vRII0skD97PRE7SyDHCSAaKC8d cQkH1p+AA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3JWp-0005ZG-7v; Sat, 23 Jan 2021 14:04:39 +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 1l3JWn-0005Yr-5v for linux-arm-kernel@lists.infradead.org; Sat, 23 Jan 2021 14:04:38 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D92B222B51; Sat, 23 Jan 2021 14:04:33 +0000 (UTC) Date: Sat, 23 Jan 2021 14:04:31 +0000 From: Catalin Marinas To: Marc Zyngier Subject: Re: [PATCH v4 13/21] arm64: Allow ID_AA64MMFR1_EL1.VH to be overridden from the command line Message-ID: References: <20210118094533.2874082-1-maz@kernel.org> <20210118094533.2874082-14-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210118094533.2874082-14-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210123_090437_296941_13EEAF14 X-CRM114-Status: GOOD ( 16.37 ) 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:25AM +0000, Marc Zyngier wrote: > diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h > index fe0130d6c0ff..80a5f423444e 100644 > --- a/arch/arm64/include/asm/cpufeature.h > +++ b/arch/arm64/include/asm/cpufeature.h > @@ -814,6 +814,9 @@ static inline unsigned int get_vmid_bits(u64 mmfr1) > return 8; > } > > +extern u64 id_aa64mmfr1_val; > +extern u64 id_aa64mmfr1_mask; > + > u32 get_kvm_ipa_limit(void); > void dump_cpu_features(void); > > diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c > index 48a011935d8c..5b9343d2e9f0 100644 > --- a/arch/arm64/kernel/cpufeature.c > +++ b/arch/arm64/kernel/cpufeature.c > @@ -555,6 +555,9 @@ static const struct arm64_ftr_bits ftr_raz[] = { > > #define ARM64_FTR_REG(id, table) ARM64_FTR_REG_OVERRIDE(id, table, NULL, NULL) > > +u64 id_aa64mmfr1_val; > +u64 id_aa64mmfr1_mask; > + > static const struct __ftr_reg_entry { > u32 sys_id; > struct arm64_ftr_reg *reg; > @@ -602,7 +605,8 @@ static const struct __ftr_reg_entry { > > /* Op1 = 0, CRn = 0, CRm = 7 */ > ARM64_FTR_REG(SYS_ID_AA64MMFR0_EL1, ftr_id_aa64mmfr0), > - ARM64_FTR_REG(SYS_ID_AA64MMFR1_EL1, ftr_id_aa64mmfr1), > + ARM64_FTR_REG_OVERRIDE(SYS_ID_AA64MMFR1_EL1, ftr_id_aa64mmfr1, > + &id_aa64mmfr1_val, &id_aa64mmfr1_mask), > ARM64_FTR_REG(SYS_ID_AA64MMFR2_EL1, ftr_id_aa64mmfr2), > > /* Op1 = 0, CRn = 1, CRm = 2 */ > diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c > index 392f93b67103..75d9845f489b 100644 > --- a/arch/arm64/kernel/idreg-override.c > +++ b/arch/arm64/kernel/idreg-override.c > @@ -10,6 +10,7 @@ > #include > > #include > +#include > #include > > struct reg_desc { > @@ -22,7 +23,18 @@ struct reg_desc { > } fields[]; > }; > > +static const struct reg_desc mmfr1 __initdata = { > + .name = "id_aa64mmfr1", > + .val = &id_aa64mmfr1_val, > + .mask = &id_aa64mmfr1_mask, > + .fields = { > + { "vh", ID_AA64MMFR1_VHE_SHIFT }, > + {} > + }, > +}; > + > static const struct reg_desc * const regs[] __initdata = { > + &mmfr1, > }; I'm ok in principle with how all these link together. I wonder however if we could skip the separate u64 variables and just have a struct reg_override with val and mask u64 rather than pointers. The ARM64_FTR_REG_OVERRIDE macro takes a pointer to this new struct reg_override and can access val/mask directly. Some 'const' may need to be dropped. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel