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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 37883C433DB for ; Wed, 10 Mar 2021 16:17:10 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 CD8A364F47 for ; Wed, 10 Mar 2021 16:17:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD8A364F47 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc: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=G+IavmAAy7MSDOQusRzzeTAqAeItGxAyYsSOa1I198k=; b=lQL0rm04WcYIFk3UIuK3d3lzk ZcdaCSXjkG5frA03JdUGYx1jJAxjQiyLscL7EnpIXZDnQo0VNxMP4Ez1Q0XhNtAPc2BSfAHLrvmGh lnJuekwzz5kt/v5yIWRZVk4HBPdlkAyNsbqPhBNKT2oCfaszAo9RLdmCcJDpI9InVpky9iBjDJhPF KL8gT9spgSw6kRMPHFP1riH2NXjWGj41Uqon6TqQ4JCOzxZRmx91l3daS8epAlFE8127vWY+ELDdy 4LtGVnCJ6RuNPAQG0dUK5lk+y2vaqD8cQEUUzRey1H7oBs+10KAbpowsWQjh1j17pmce/8Dl69oOc Zthr2tBQg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lK1V8-007CvU-BB; Wed, 10 Mar 2021 16:15:58 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lK1V3-007CuG-51 for linux-arm-kernel@lists.infradead.org; Wed, 10 Mar 2021 16:15:55 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1AD9A64EB3; Wed, 10 Mar 2021 16:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615392951; bh=kNwFxeumYsGSpw2tZpd8uXZkDF3dxJ63TdxKFdGfJmI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EvfmFsnWYLYmym8hKP8K/jALy31EtSLFyMYHdv5FOUFseEB6grWYnIJAsgoEWf926 th+5IyPCQxysBE6egoC4iUwFRl6W+cie9Vr7CYE48t692crMhBDG4U+wTHWkTTzq3Q RMMTtvYfGw4BC9OWa7X9QWcGD1ws9hlpuWV6FsNu3NGfVOBqwa2vS0/Oj+4D5jAe96 kc9T/xrih93VKyp1NOMcrJj3jZhVI2bBcY7AYtaosEwnyI/2hSYiqFZHYbGpqBIUG3 yMdCXaUaWTL7jO6dtfI4jwlasM/MgXPEOxkX1p/P1HZrSreMWHiHRKNwsJ0cTR/lDm wmveAZ5pdj2dA== Date: Wed, 10 Mar 2021 16:15:47 +0000 From: Will Deacon To: Marc Zyngier Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, James Morse , Julien Thierry , Suzuki K Poulose , Mark Rutland , qperret@google.com, kernel-team@android.com Subject: Re: [PATCH 3/4] KVM: arm64: Rename SCTLR_ELx_FLAGS to SCTLR_EL2_FLAGS Message-ID: <20210310161546.GC29834@willie-the-truck> References: <20210310152656.3821253-1-maz@kernel.org> <20210310152656.3821253-4-maz@kernel.org> <20210310154625.GA29738@willie-the-truck> <874khjxade.wl-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <874khjxade.wl-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-20210310_161553_620711_8A76709E X-CRM114-Status: GOOD ( 21.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Wed, Mar 10, 2021 at 04:05:17PM +0000, Marc Zyngier wrote: > On Wed, 10 Mar 2021 15:46:26 +0000, > Will Deacon wrote: > > > > On Wed, Mar 10, 2021 at 03:26:55PM +0000, Marc Zyngier wrote: > > > Only the nVHE EL2 code is using this define, so let's make it > > > plain that it is EL2 only. > > > > > > Signed-off-by: Marc Zyngier > > > --- > > > arch/arm64/include/asm/sysreg.h | 2 +- > > > arch/arm64/kvm/hyp/nvhe/hyp-init.S | 2 +- > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > > > index dfd4edbfe360..9d1aef631646 100644 > > > --- a/arch/arm64/include/asm/sysreg.h > > > +++ b/arch/arm64/include/asm/sysreg.h > > > @@ -579,7 +579,7 @@ > > > #define SCTLR_ELx_A (BIT(1)) > > > #define SCTLR_ELx_M (BIT(0)) > > > > > > -#define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ > > > +#define SCTLR_EL2_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ > > > SCTLR_ELx_SA | SCTLR_ELx_I | SCTLR_ELx_IESB) > > > > > > /* SCTLR_EL2 specific flags. */ > > > diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/hyp-init.S > > > index 4eb584ae13d9..7423f4d961a4 100644 > > > --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S > > > +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S > > > @@ -122,7 +122,7 @@ alternative_else_nop_endif > > > * as well as the EE bit on BE. Drop the A flag since the compiler > > > * is allowed to generate unaligned accesses. > > > */ > > > - mov_q x0, (SCTLR_EL2_RES1 | (SCTLR_ELx_FLAGS & ~SCTLR_ELx_A)) > > > + mov_q x0, (SCTLR_EL2_RES1 | (SCTLR_EL2_FLAGS & ~SCTLR_ELx_A)) > > > > Can we just drop SCTLR_ELx_A from SCTLR_EL2_FLAGS instead of clearing it > > here? > > Absolutely. That'd actually be an improvement. In fact, maybe just define INIT_SCTLR_EL2_MMU_ON to mirror what we do for EL1 (i.e. including the RES1 bits) and then use that here? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel