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 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 CAF11C3DA59 for ; Tue, 16 Jul 2024 14:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uQ1b5ZNVV7dyvfB5jDf3fxY+RP+yC49dWe1D0LXWhDY=; b=zl3PCDE/A+V+7UpCzmNPXX/pdk tzHCR/32fyA1ZQ8x7dm7OB5HwX6ZTVizRKzALddBsr4qCuF4YKt9eQ2hdblhgdSlWdXhNKM72cuPp /uvaUgCFem96GtA3/s7KQt5a39TmgpRWr6AJS9+xWWEzdfVXEehGL22+7M1+roFnPExsnwfUxjSAc /mu2dFJnhGO3FVuwinuwC7R1Sn6PO+dD7MmGu5ezosq+4wDHmWMvdD0euPb75IynZ5CI6zECzChsG 8Zee0P5WBUrfK10lQXprLrFv4YZaPPxjNXghQgRub/AVNHN/GhXz7X8mfP2Vt48c5jw/7CGm9HrIc g/ZdRZRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTjBi-0000000Aid4-2wAB; Tue, 16 Jul 2024 14:29:54 +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 1sTjBF-0000000AiGK-2uO4 for linux-arm-kernel@lists.infradead.org; Tue, 16 Jul 2024 14:29:27 +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 AACE1106F; Tue, 16 Jul 2024 07:29:48 -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 B5D2D3F762; Tue, 16 Jul 2024 07:29:22 -0700 (PDT) From: Luca Fancellu To: andre.przywara@arm.com, mark.rutland@arm.com Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/6] aarch64: Rename labels and prepare for lower EL booting Date: Tue, 16 Jul 2024 15:29:01 +0100 Message-Id: <20240716142906.1502802-2-luca.fancellu@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240716142906.1502802-1-luca.fancellu@arm.com> References: <20240716142906.1502802-1-luca.fancellu@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240716_072925_804872_EA4A8536 X-CRM114-Status: UNSURE ( 9.01 ) 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 The current code can boot from a lower EL than EL3, but the flag 'flag_no_el3' have the meaning of "Don't drop to a lower EL", so rename the flag to flag_keep_el. This is a preparation work to boot on Armv8-R AArch64 which has no EL3. Signed-off-by: Luca Fancellu Reviewed-by: Andre Przywara --- v2 changes: - Add Andre R-by --- arch/aarch64/boot.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S index da5fa6548b65..7727475925c1 100644 --- a/arch/aarch64/boot.S +++ b/arch/aarch64/boot.S @@ -92,7 +92,7 @@ reset_no_el3: bl setup_stack mov w0, #1 - ldr x1, =flag_no_el3 + ldr x1, =flag_keep_el str w0, [x1] bl cpu_init_bootwrapper @@ -124,7 +124,7 @@ ASM_FUNC(jump_kernel) bl find_logical_id bl setup_stack // Reset stack pointer - ldr w0, flag_no_el3 + ldr w0, flag_keep_el cmp w0, #0 // Prepare Z flag mov x0, x20 @@ -133,7 +133,7 @@ ASM_FUNC(jump_kernel) mov x3, x23 b.eq 1f - br x19 // No EL3 + br x19 // Keep EL 1: mov x4, #SPSR_KERNEL @@ -151,5 +151,5 @@ ASM_FUNC(jump_kernel) .data .align 3 -flag_no_el3: +flag_keep_el: .long 0 -- 2.34.1