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=ham 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 D27D8C433E0 for ; Wed, 10 Mar 2021 15:48:09 +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 7918C64FBB for ; Wed, 10 Mar 2021 15:48:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7918C64FBB 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=HUKAv99ZRgnwuJ0UUHkbJ2t50t5MGx+fFT1zTCaoNoQ=; b=WAS9xmq3ON6twXTbrjBFeqYmZ 8pYiTNBKnhxw7Kntl2Czm40vE4WNf9JHjfs9ZiLzbE9QfY7J5TUVzpS+SLXIEtyRxt1rAVEzxsovK Ct2g3wHwCXryStZJpWbS11Y45DkyA+Qn3L4RbnJG4vQ7MI6q14ZSuf1MRXmUtvZEFd6p5/OGMvLCk QK6KCypO4UIvA1UBLAHUBgqaXCirMI1/jo3Ne8ZNzRNtH2tmnZKQdrbyPQsDuRft9oIcb/W9jsK54 jwBGx6b0LwFpciMoo9yNLh/dcwc0UXVtzJ3m/o8MatlTSqyBLF6ZSmvYi62VUC5o4T0bOfirdeVOA Ck8829Rmg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lK12l-00790h-Au; Wed, 10 Mar 2021 15:46:39 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lK12g-00790I-14 for linux-arm-kernel@lists.infradead.org; Wed, 10 Mar 2021 15:46:37 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6A17C64F9B; Wed, 10 Mar 2021 15:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615391191; bh=8vc+t9597Gj+0rwLWp8DvyB0wv6J+I8bsOUKobbB8m0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Fe7vgIGRTKIo0wCFNOTGlUdE0URCo/cefTHyf+UByBTUerKvcPL66vWDOFqSrEBFs B6rF6h+yif7c1epUqr0ASg2bn8rlwiRkG4EK1xJ1DGKzlrAGH1U16ALssFLf0AZF+U HL0QqepNP9ivPjAG7kqjL0lZTR72cybWEgO7yhfM6MdcK04TfXbNULOdPEaib5Suk/ 3XqUx4WNeIEjW9PDo4prB7PyUVK2W7xJ5OXhNKbI0ZBbIxbFo7rbmhp0lKmOni/xMY Ml7gmR6FD/wWK6B1tNXN1mWT08GE97Udmf1HM6H4srA/r1U3K5Fd7QHLSawQodst4p Q9TGH5JjnCotQ== Date: Wed, 10 Mar 2021 15:46:26 +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: <20210310154625.GA29738@willie-the-truck> References: <20210310152656.3821253-1-maz@kernel.org> <20210310152656.3821253-4-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210310152656.3821253-4-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_154634_303248_886BF9B8 X-CRM114-Status: GOOD ( 17.20 ) 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 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? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel