From patchwork Thu Jun 6 13:36:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Fancellu X-Patchwork-Id: 13688515 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DE717C25B75 for ; Thu, 6 Jun 2024 13:36:57 +0000 (UTC) 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: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=t/w+uroKNev7wvCJh+l058pGAhW98Hu7LWc8jFm5xz4=; b=Zke2mSUD+VHeaz TM3HUWAhP8rvAmWXHm0EmoCPwQQewJyleux+5CrwBa/IXvlrhGKIuZONLjGSjkplY6of0t5B+AdJM 11OztbGqBZso/o40JEaqWWDxRqaybpTcAbYJ3h8EOIUueIX5/NN6KBndHgcP6fP5+HkBLQ9QCQFrr 1XaFCRN2UrO33/cF+IW691yFAXxQhUOvPlpuBOj3HBFw4mAyTPNDJrW+526aCNFTxDeQ4T3766GIH S2a+KD9AjL6TR3I/VRHV+dfEOA2ra2dfU01XkbCLSMyEwZSYP5s1wYlzhcP+ayF8EVBQk3v27kQFF jfOUE3s1Cmp3qrY3C3vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sFDIM-00000009vWV-0tCb; Thu, 06 Jun 2024 13:36:46 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sFDIJ-00000009vSv-25FR for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 13:36:44 +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 19CEBDA7; Thu, 6 Jun 2024 06:37:05 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.arm.com [10.1.199.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 49C173F792; Thu, 6 Jun 2024 06:36:40 -0700 (PDT) From: Luca Fancellu To: linux-arm-kernel@lists.infradead.org Cc: diego.sueiro@arm.com Subject: [boot-wrapper 2/7] aarch64: Prepare for lower EL booting Date: Thu, 6 Jun 2024 14:36:23 +0100 Message-Id: <20240606133628.3330423-3-luca.fancellu@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240606133628.3330423-1-luca.fancellu@arm.com> References: <20240606133628.3330423-1-luca.fancellu@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_063643_623158_3F6047BB X-CRM114-Status: UNSURE ( 9.98 ) 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 Store the value of the initial SPSR into a variable during EL3 initialization and load it from the variable before dropping EL, this is done as preparation work to be able to boot from a different exception level. Signed-off-by: Luca Fancellu Reviewed-by: Andre Przywara --- arch/aarch64/boot.S | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S index 7727475925c1..211077af17c8 100644 --- a/arch/aarch64/boot.S +++ b/arch/aarch64/boot.S @@ -51,6 +51,10 @@ reset_at_el3: b.eq err_invalid_id bl setup_stack + mov w0, #SPSR_KERNEL + ldr x1, =spsr_to_elx + str w0, [x1] + bl cpu_init_bootwrapper bl cpu_init_el3 @@ -135,7 +139,7 @@ ASM_FUNC(jump_kernel) b.eq 1f br x19 // Keep EL -1: mov x4, #SPSR_KERNEL +1: ldr w4, spsr_to_elx /* * If bit 0 of the kernel address is set, we're entering in AArch32 @@ -153,3 +157,5 @@ ASM_FUNC(jump_kernel) .align 3 flag_keep_el: .long 0 +spsr_to_elx: + .long 0