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 D30C9C433F5 for ; Tue, 25 Jan 2022 15:15:00 +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=g5h+2me8MUqDv9EHPCV3/knn/Ank1QH4ZQaVDQ1utDE=; b=YPIPIsfuW68/QB qlTGAuNpQFLgHjVzsoLFHouHk41FuXx31VPpyelcdxxnNeUyD3zF08nDj8WNZcJFd2futKa/YLhEW MW+G99u74iPpAKt035sZtpWy1EMZiq8fqzC1Ae5Ont3kCKc+L5p17/Is3+06QZEYIhoLsbz/AHt1V 79u7fcH/teDg+kKjYQ/LsRq+Kw/zHzSwCd4K4BFhmB+XUhVGLK6NxXC2CNXhydBcTiygMSn0raBQV XqAYh4PBc62dSQIFNDlGvHSMO7D72sjs2Mdppg3xFeAvjaeeTW4tCV7ziLSUnEk7rGizw0QLxuM65 atl5o11+bNSbEMZyVqMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCNVi-008JRJ-QC; Tue, 25 Jan 2022 15:13:31 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCNK7-008EvX-CA for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 15:01:32 +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 C35F0101E; Tue, 25 Jan 2022 07:01:30 -0800 (PST) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A84B23F793; Tue, 25 Jan 2022 07:01:29 -0800 (PST) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: andre.przywara@arm.com, broonie@kernel.org, jaxson.han@arm.com, mark.rutland@arm.com, robin.murphy@arm.com, vladimir.murzin@arm.com, wei.chen@arm.com Subject: [bootwrapper PATCH v3 15/15] Unify start_el3 & start_no_el3 Date: Tue, 25 Jan 2022 15:00:57 +0000 Message-Id: <20220125150057.3936090-16-mark.rutland@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220125150057.3936090-1-mark.rutland@arm.com> References: <20220125150057.3936090-1-mark.rutland@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220125_070131_488683_B2D608C3 X-CRM114-Status: UNSURE ( 8.84 ) 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: , 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 Now that the start_el3 and start_no_el3 labels point at the same place, unify them into a start_bootmethod label and update callers. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland Reviewed-by: Andre Przywara --- arch/aarch32/boot.S | 5 ++--- arch/aarch32/psci.S | 3 +-- arch/aarch64/boot.S | 4 ++-- arch/aarch64/psci.S | 3 +-- arch/aarch64/spin.S | 3 +-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/aarch32/boot.S b/arch/aarch32/boot.S index 820957b..4d16c9c 100644 --- a/arch/aarch32/boot.S +++ b/arch/aarch32/boot.S @@ -51,7 +51,7 @@ ASM_FUNC(_start) bl cpu_init_bootwrapper - b start_no_el3 + b start_bootmethod _switch_monitor: adr lr, _monitor @@ -69,8 +69,7 @@ _monitor: bl gic_secure_init - /* Initialise boot method */ - b start_el3 + b start_bootmethod err_invalid_id: b . diff --git a/arch/aarch32/psci.S b/arch/aarch32/psci.S index cdc36b0..6613b6f 100644 --- a/arch/aarch32/psci.S +++ b/arch/aarch32/psci.S @@ -38,6 +38,5 @@ handle_smc: pop {r4 - r12, lr} movs pc, lr -ASM_FUNC(start_el3) -ASM_FUNC(start_no_el3) +ASM_FUNC(start_bootmethod) b psci_first_spin diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S index c0ec518..da5fa65 100644 --- a/arch/aarch64/boot.S +++ b/arch/aarch64/boot.S @@ -57,7 +57,7 @@ reset_at_el3: bl gic_secure_init - b start_el3 + b start_bootmethod /* * EL2 initialization @@ -97,7 +97,7 @@ reset_no_el3: bl cpu_init_bootwrapper - b start_no_el3 + b start_bootmethod err_invalid_id: b . diff --git a/arch/aarch64/psci.S b/arch/aarch64/psci.S index d6ca2eb..9709dbb 100644 --- a/arch/aarch64/psci.S +++ b/arch/aarch64/psci.S @@ -79,6 +79,5 @@ smc_exit: ldp x18, x19, [sp], #16 eret -ASM_FUNC(start_el3) -ASM_FUNC(start_no_el3) +ASM_FUNC(start_bootmethod) b psci_first_spin diff --git a/arch/aarch64/spin.S b/arch/aarch64/spin.S index 764c532..375f732 100644 --- a/arch/aarch64/spin.S +++ b/arch/aarch64/spin.S @@ -15,8 +15,7 @@ ASM_FUNC(cpu_init_bootmethod) ret -ASM_FUNC(start_el3) -ASM_FUNC(start_no_el3) +ASM_FUNC(start_bootmethod) cpuid x0, x1 bl find_logical_id -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel