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 444CBC2B9F7 for ; Mon, 24 May 2021 22:43:23 +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 0613D61378 for ; Mon, 24 May 2021 22:43:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0613D61378 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=0vQNc4vmVMxY24OPY+fsi2s5yTdcyzoqUdGTnE1anNE=; b=gEMMDRM0Ayi3R6 N6JU/iBvR55BMb+3J8AV9ULbC477rXTR9ajmC2E71MJNMqt+UqDCeflQOazeNX9cZdraYqLQBAvLA miixIJfxFqmSUKw0zJsTfK0GinwdO0SSWqw7NNtZlgLxxvkbmB8YEPyMjjk2o93EdFlqIqSYyUPX9 r0JrFN6goUtMKiWTmJiXy9xLfqUvQElbvD6Df4k6ZypUj8KI8DEnkZpucKfnhWa7tZeJVaYsmnaJE uGc5ITZLgDgGf36JT8oaTgUukDbUU3u7VUV47ahZ7hCAxgKGh5Zbqwpt81/X8VzK0ohB/bicDGsyh +50+u3t7iSM54qMoPykA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llJFL-002AfV-Ge; Mon, 24 May 2021 22:40:28 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ll6xP-000nzH-OE for linux-arm-kernel@lists.infradead.org; Mon, 24 May 2021 09:33:09 +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 3EE0F31B; Mon, 24 May 2021 02:33:04 -0700 (PDT) Received: from slackpad.fritz.box (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7A8633F73B; Mon, 24 May 2021 02:33:03 -0700 (PDT) Date: Mon, 24 May 2021 10:32:50 +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 4/8] aarch64: Prepare for EL1 booting Message-ID: <20210524103250.493e9848@slackpad.fritz.box> In-Reply-To: <20210521104807.138269-5-jaxson.han@arm.com> References: <20210521104807.138269-1-jaxson.han@arm.com> <20210521104807.138269-5-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_023307_867246_8DD5419F X-CRM114-Status: GOOD ( 12.35 ) 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:03 +0800 Jaxson Han wrote: > When booting from EL1, add a check and skip the init of > sctlr_el2 in jump_kernel > > Signed-off-by: Jaxson Han Reviewed-by: Andre Przywara Cheers, Andre > --- > arch/aarch64/boot.S | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S > index ee9886b..b8f9e4e 100644 > --- a/arch/aarch64/boot.S > +++ b/arch/aarch64/boot.S > @@ -144,10 +144,14 @@ jump_kernel: > ldr x0, =SCTLR_EL1_RESET > msr sctlr_el1, x0 > > + mrs x0, CurrentEL > + cmp x0, #CURRENTEL_EL2 > + b.lt 1f > + > ldr x0, =SCTLR_EL2_RESET > msr sctlr_el2, x0 > > - cpuid x0, x1 > +1: cpuid x0, x1 > bl find_logical_id > bl setup_stack // Reset stack pointer > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel