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 A2862C433F5 for ; Wed, 12 Jan 2022 14:38:56 +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:In-Reply-To:MIME-Version:References: 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=lh0EzmGQIt+6uql5VSdGeK36Nwv5H22vu+OhWDakPTA=; b=yukiNDe7trm2YP uz3sCLjRMFMfZURVSI3GHKkuOHLXC+SxsIPWiHz+BL8nbjx0pdfEZhaA0xzyxik6q5rHW1kNDWJXa kQ9D3DoF9geZB23HyNjG65dfkdjcJzrJ20uydB6OBInabBz2j5ghope9QoI7+vCCdesIFhtxRIzT3 ClVCBcdMxO17FHUbvT07pnRAwp8WR+iWrAdf/Ljq/Xk7IVAdKo7k18SsY/HhX9h3KH0exH9na+TY3 S5cvoOqTEfdXBsQzyyRb8PMSXOjnh8geW20AxMZG991bK2mNyOwGJENeOIOILU1YJa8u1Xt4JgngA JD7/U1b5wlFJW5xViMsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7el3-002jCJ-8R; Wed, 12 Jan 2022 14:37:49 +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 1n7el0-002jBt-C4 for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 14:37:47 +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 2C9AFD6E; Wed, 12 Jan 2022 06:37:45 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.1.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2A3313F766; Wed, 12 Jan 2022 06:37:44 -0800 (PST) Date: Wed, 12 Jan 2022 14:37:41 +0000 From: Mark Rutland To: Robin Murphy Cc: linux-arm-kernel@lists.infradead.org, andre.przywara@arm.com, Jaxson.Han@arm.com, Wei.Chen@arm.com Subject: Re: [bootwrapper PATCH 13/13] Unify start_el3 & start_no_el3 Message-ID: References: <20220111130653.2331827-1-mark.rutland@arm.com> <20220111130653.2331827-14-mark.rutland@arm.com> <91231c75-3f47-1106-a740-1fee40d4b7b5@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <91231c75-3f47-1106-a740-1fee40d4b7b5@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_063746_482679_569A1C73 X-CRM114-Status: GOOD ( 16.58 ) 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 Tue, Jan 11, 2022 at 02:39:35PM +0000, Robin Murphy wrote: > On 2022-01-11 13:06, Mark Rutland wrote: > > 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 > > --- > > arch/aarch32/boot.S | 5 ++--- > > arch/aarch64/boot.S | 4 ++-- > > arch/aarch64/psci.S | 3 +-- > > 3 files changed, 5 insertions(+), 7 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/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) > > Should there be an equivalent of this hunk for arch/aarch32/psci.S? Yes, and likewise for arch/aarch64/spin.S. I'll go fix that an re-test. Mark. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel