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 C44B8C433EF for ; Mon, 17 Jan 2022 17:44:26 +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: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=jWn9JulGNdbHTK9Ub42g5KQ95MxIJiqL+RluzoUjUDQ=; b=BM6fRfnnxCKjsg 1g6SeHU3XAxr6L9NAYDW02GTp97rT8sbeSqVCSbY1rF9ZSv8xr1D2N+H2MYo6atz9f3TJBo11qZzD WznKjkLVZDcFcyQJAib4GZ3cFdL6nfaG+mydwr06rFZStPXXTRp/2yH7BMdI2R8TNQ0tHsbDdilJK Wx/qA4PYm2rT5tHLNxPyHceRCK5VE/rBuTKiEIDqK5XqShyu3FTtez4g0s5CqsMaZrGl0Tj4e37eM COvPZ9Qx79I/aBhcaUdaksLuZCzreorTsXJS6Y9wnIu4+mTXZMmQQMRowyORI4MW+fFbl67804EsX cug7qp+D0cKJnFHw3MVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9W2K-00FykU-O3; Mon, 17 Jan 2022 17:43:20 +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 1n9W2H-00Fyjq-Mb for linux-arm-kernel@lists.infradead.org; Mon, 17 Jan 2022 17:43:19 +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 C89B66D; Mon, 17 Jan 2022 09:43:16 -0800 (PST) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D6CB83F766; Mon, 17 Jan 2022 09:43:15 -0800 (PST) Date: Mon, 17 Jan 2022 17:43:13 +0000 From: Andre Przywara To: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org, Jaxson.Han@arm.com, robin.murphy@arm.com, vladimir.murzin@arm.com, Wei.Chen@arm.com Subject: Re: [bootwrapper PATCH v2 13/13] Unify start_el3 & start_no_el3 Message-ID: <20220117174313.34e87664@donnerap.cambridge.arm.com> In-Reply-To: <20220114105653.3003399-14-mark.rutland@arm.com> References: <20220114105653.3003399-1-mark.rutland@arm.com> <20220114105653.3003399-14-mark.rutland@arm.com> Organization: ARM X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220117_094317_833946_0409533A X-CRM114-Status: GOOD ( 13.71 ) 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 Fri, 14 Jan 2022 10:56:53 +0000 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. Nice one. > There should be no functional change as a result of this patch. > > Signed-off-by: Mark Rutland Reviewed-by: Andre Przywara Cheers, Andre > --- > 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel