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 CE43FC433F5 for ; Tue, 11 Jan 2022 14:40:48 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7Pk87sEkSrPNtSxILcXJIxN14LzVBHM3DBBXvuOa2yM=; b=SYmd0HZGh2IBJm gfNzpJn/Osf0u6I0C6bRa4Bjt3NPYjdnxGPSsv+DT2rW3GKZToV8ZNrQ0njSdNj0h7HJ9GCBriAsV GKMsUfEClNF/0eAmSviVwvcD3psTY87lg09+4R4pDjC3GHEn6si80Od0bxpJlS2k1C118C89y1OFI 20mSb3c+UWgfyS50Vqhz4dXMMYLVOACszYI7YXks5uOg6hx5W+UuWgGyKC/52Zus8WZ3A+RTVEwJ6 Ln3Z97kCunqIts8up8anlgtdzfTtMms7KmYCtgbqJrNIyNxJuO7otmqnu16KuKUH3dVDmDjgA1C7i 5gbZz1otkrQskiRyyucw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7IJJ-00Ga71-WE; Tue, 11 Jan 2022 14:39:42 +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 1n7IJG-00Ga6B-Lh for linux-arm-kernel@lists.infradead.org; Tue, 11 Jan 2022 14:39:40 +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 A1F5B1FB; Tue, 11 Jan 2022 06:39:37 -0800 (PST) Received: from [10.57.68.71] (unknown [10.57.68.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CADD13F774; Tue, 11 Jan 2022 06:39:36 -0800 (PST) Message-ID: <91231c75-3f47-1106-a740-1fee40d4b7b5@arm.com> Date: Tue, 11 Jan 2022 14:39:35 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: [bootwrapper PATCH 13/13] Unify start_el3 & start_no_el3 Content-Language: en-GB To: Mark Rutland , linux-arm-kernel@lists.infradead.org Cc: andre.przywara@arm.com, Jaxson.Han@arm.com, Wei.Chen@arm.com References: <20220111130653.2331827-1-mark.rutland@arm.com> <20220111130653.2331827-14-mark.rutland@arm.com> From: Robin Murphy In-Reply-To: <20220111130653.2331827-14-mark.rutland@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220111_063938_791198_ACD5CF88 X-CRM114-Status: GOOD ( 13.06 ) 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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? Robin. > b psci_first_spin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel