From patchwork Fri May 21 10:48:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaxson Han X-Patchwork-Id: 12272907 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=-14.3 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, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT 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 59825C433ED for ; Fri, 21 May 2021 10:51:47 +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 EB8A26108D for ; Fri, 21 May 2021 10:51:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB8A26108D 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=desiato.20200630; 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:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4ClvL43WPiQrxPALxn2fEtWJPGFDN4lDEKReYJanEI4=; b=hZiOInQfzZ9Wk2Lo9ww69x24Py D51yogiOgQxKNUqxk+n8PshLSDE4GhM0VSSUmasqZWRej03uMWDPxGjlRyzuS9vFPhzRtf3D9o97W 9CvTUZtfc71EXogeSi2Qwq+K8b5Qlkv1gjCaTGSpiO+FcqbNGsvJODK8rAcn5rT8yMqDZe+npjxUP lsTFzNKCaB6hJwxqGWwa+Wo0Jioh9g3gTs75eF+gz4h3W4DAU0CvUkQjTbc+94E7y8hfrAJpufsPr cOwtNLydeosGKQ32HF27NSMaTVvfAnOvoa1Iq580ZskMIMOs14lfSUCgPqoB5SgxN+L6HUEbxo46a fm4eELcA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lk2iW-0050Mf-B7; Fri, 21 May 2021 10:49:20 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lk2hm-00506Z-Iw for linux-arm-kernel@desiato.infradead.org; Fri, 21 May 2021 10:48:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=hDyN3Cw2MSa5/z0aVgdtUvTNf8//dL1KLzn3s7gGhlg=; b=QBGZcIPRQU0OBtX9Pbny581jkP ZslsnpufVvV2ayQKalgwjJ0gLmknTZsjQ0F+PEktYOPWj+qQPbDaJI7EU09ZH7qRGPela/81ds+Ho r8X9FzS/Zu4PqLpMTFzSfmgdoANH1htUSZgzqKDFHPPmS5lEeTK4ilxMRfRHcCfuk5/59xqLEXP2P /qilGeDF1uPnIpcuNs/sAE8IAkQvDUzBJFI4ysEiVN2KZvNGcbkWFxnXr4OWVAmnKDNor4tGBYi2F A6ADUUahEyfGT26i6jCvgBArLb6bR9WcPrybElsh+5fmv9F2mlMtidyDEasGdFkd6bS7LGjePuO7p hjOqnjfQ==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lk2hj-00H38v-Si for linux-arm-kernel@lists.infradead.org; Fri, 21 May 2021 10:48:33 +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 8D2C91424; Fri, 21 May 2021 03:48:30 -0700 (PDT) Received: from optiplex-7070.shanghai.arm.com (optiplex-7070.shanghai.arm.com [10.169.188.115]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id ADC9E3F73D; Fri, 21 May 2021 03:48:28 -0700 (PDT) From: Jaxson Han To: mark.rutland@arm.com, andre.przywara@arm.com Cc: linux-arm-kernel@lists.infradead.org, wei.chen@arm.com, jaxson.han@arm.com Subject: [boot-wrapper PATCH v2 4/8] aarch64: Prepare for EL1 booting Date: Fri, 21 May 2021 18:48:03 +0800 Message-Id: <20210521104807.138269-5-jaxson.han@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210521104807.138269-1-jaxson.han@arm.com> References: <20210521104807.138269-1-jaxson.han@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210521_034831_988685_6BEF5BD1 X-CRM114-Status: UNSURE ( 7.43 ) X-CRM114-Notice: Please train this message. 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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