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.6 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,USER_AGENT_SANE_2 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 A8739C04FF3 for ; Mon, 24 May 2021 19:29:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 68C3C61402 for ; Mon, 24 May 2021 19:29:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68C3C61402 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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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=EB5D/NF+vBl69p2B59B1fkX3bSnzDtt6QsBOWD0DGb4=; b=ZKZD7VDeaPvIm/ pjugNKJI/6srj0RfWSy3P0Gc6a1pKD/4GEdu3g5+8yiQkFV4cf1M6OOQr86N328kJTk8btKg7nGR+ 6ndsCrGh1LrTkupy9T/q0wVlosfnAPm8A8R2HopszXKthn9P0qLz0qRnle0BCTrNvRn0y0OXWbzzB kGazgR1T/pqYojgQ5Oidx4k4mCF1yQB6TAun5zk2Yqzy+hD5IEvfsijOp5MGb8EJzwJxxUjQccGK1 X+1XQmFylHJzkGTRbZvlZX0JOEnMz6frZqMGWvrog5bcJl+0JeE58iRFFd0QT1/dkGREDzewtf1v6 rFBbpM0hyIRgQA7Z1EJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llGEw-001fUt-MM; Mon, 24 May 2021 19:27:52 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ll6xx-000o17-RJ for linux-arm-kernel@lists.infradead.org; Mon, 24 May 2021 09:33:43 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 928A431B; Mon, 24 May 2021 02:33:38 -0700 (PDT) Received: from slackpad.fritz.box (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CEBBB3F73B; Mon, 24 May 2021 02:33:37 -0700 (PDT) Date: Mon, 24 May 2021 10:33:24 +0100 From: Andre Przywara To: Jaxson Han Cc: mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, wei.chen@arm.com Subject: Re: [boot-wrapper PATCH v2 7/8] aarch64: Prepare for booting with EL2 Message-ID: <20210524103324.452a2095@slackpad.fritz.box> In-Reply-To: <20210521104807.138269-8-jaxson.han@arm.com> References: <20210521104807.138269-1-jaxson.han@arm.com> <20210521104807.138269-8-jaxson.han@arm.com> Organization: Arm Ltd. X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.31; x86_64-slackware-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_023341_959810_C44106B9 X-CRM114-Status: GOOD ( 14.18 ) 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 Fri, 21 May 2021 18:48:06 +0800 Jaxson Han wrote: > Prepare for allowing boot-wrapper to be entered in EL2. > Detect current EL and set the corresponding EL registers. > > Signed-off-by: Jaxson Han Reviewed-by: Andre Przywara Cheers, Andre > --- > arch/aarch64/boot.S | 8 ++++++++ > arch/aarch64/utils.S | 10 +++++++++- > 2 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S > index 5600859..14fd9cf 100644 > --- a/arch/aarch64/boot.S > +++ b/arch/aarch64/boot.S > @@ -183,10 +183,18 @@ jump_kernel: > */ > bfi x4, x19, #5, #1 > > + mrs x5, CurrentEL > + cmp x5, #CURRENTEL_EL2 > + b.eq 1f > + > msr elr_el3, x19 > msr spsr_el3, x4 > eret > > +1: msr elr_el2, x19 > + msr spsr_el2, x4 > + eret > + > .ltorg > > .data > diff --git a/arch/aarch64/utils.S b/arch/aarch64/utils.S > index ae22ea7..94e9931 100644 > --- a/arch/aarch64/utils.S > +++ b/arch/aarch64/utils.S > @@ -37,10 +37,18 @@ find_logical_id: > ret > > /* > - * Setup EL3 vectors > + * Setup EL3/EL2 vectors > * x0: vector address > */ > setup_vector: > + mrs x1, CurrentEL > + cmp x1, #CURRENTEL_EL2 > + b.eq 1f > + > msr VBAR_EL3, x0 > isb > ret > + > +1: msr VBAR_EL2, x0 > + isb > + ret _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel