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 X-Spam-Level: X-Spam-Status: No, score=-14.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 904DEC432BE for ; Tue, 24 Aug 2021 16:52:26 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6113461183 for ; Tue, 24 Aug 2021 16:52:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6113461183 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YVGeGKEzb8CWWzscgFfBBG4k+EyaoNMnAKuAoXdXn94=; b=geNI/kXQKwFDQ/RaUgzW67h6TH CLz8JCNSA8CSL6dxxFyQmEl6lBDMuZ2PCxSBj7KyqpOvzdLLRHCCLrS7mtwOuaE5lMPnrcDYENsXg KPKJtUnUnMy5RUYfl3V9r+eeiWFV511fiTzDOeJFp5UF5y8ltLPS52znOgeyf79u0A+0lhKgD5MVZ 1994cNttJKfqfhmmBpQQtrHjiXeFlFPWza+za/fiYFHOkVOh04Dr6j2iNDY6mbgwgGzpHVK2w0+XD 5NkwGaHUzgQSXfvB/xoTdQjws2AvkrVccAXujfxXW/Mtdw80eD6Mgru8AKtOpj+7aDvLk35WP9Dnl xXS1q9Lw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIZdh-0040LD-2X; Tue, 24 Aug 2021 16:51:05 +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 1mIZdd-0040Js-0E for linux-arm-kernel@lists.infradead.org; Tue, 24 Aug 2021 16:51:02 +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 8965431B; Tue, 24 Aug 2021 09:50:59 -0700 (PDT) Received: from [10.1.30.13] (e110479.cambridge.arm.com [10.1.30.13]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C7F913F766; Tue, 24 Aug 2021 09:50:57 -0700 (PDT) Subject: Re: [boot-wrapper PATCH 4/5] Rename kernel *_RESET values to *_KERNEL To: Mark Rutland , linux-arm-kernel@lists.infradead.org Cc: alexandru.elisei@arm.com, maz@kernel.org References: <20210824134900.34849-1-mark.rutland@arm.com> <20210824134900.34849-5-mark.rutland@arm.com> From: Andre Przywara Message-ID: <18228acf-b145-810c-93ea-20047915b462@arm.com> Date: Tue, 24 Aug 2021 17:50:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210824134900.34849-5-mark.rutland@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210824_095101_186628_A235DA4A X-CRM114-Status: GOOD ( 17.80 ) 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 8/24/21 2:48 PM, Mark Rutland wrote: > Our *_RESET constants are used to initalize state for the kernel rather > than the bootwrapper itself, so for clarity we should use a *_KERNEL > suffix rather than a _RESET suffix. > > Signed-off-by: Mark Rutland It's indeed only renaming: Reviewed-by: Andre Przywara Cheers, Andre > --- > arch/aarch32/boot.S | 4 ++-- > arch/aarch32/include/asm/cpu.h | 4 ++-- > arch/aarch64/boot.S | 4 ++-- > arch/aarch64/include/asm/cpu.h | 6 +++--- > 4 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/aarch32/boot.S b/arch/aarch32/boot.S > index e397cb0..08bf932 100644 > --- a/arch/aarch32/boot.S > +++ b/arch/aarch32/boot.S > @@ -76,10 +76,10 @@ ASM_FUNC(jump_kernel) > push {r0 - r3} > mov r5, sp > > - ldr r0, =HSCTLR_RESET > + ldr r0, =HSCTLR_KERNEL > mcr p15, 4, r0, c1, c0, 0 @ HSCTLR > > - ldr r0, =SCTLR_RESET > + ldr r0, =SCTLR_KERNEL > mcr p15, 0, r0, c1, c0, 0 @ SCTLR > > /* Reset our stack pointer */ > diff --git a/arch/aarch32/include/asm/cpu.h b/arch/aarch32/include/asm/cpu.h > index a7993f0..105cae5 100644 > --- a/arch/aarch32/include/asm/cpu.h > +++ b/arch/aarch32/include/asm/cpu.h > @@ -13,8 +13,8 @@ > #define MPIDR_INVALID (-1) > > /* Only RES1 bits and CP15 barriers for the kernel */ > -#define HSCTLR_RESET (3 << 28 | 3 << 22 | 1 << 18 | 1 << 16 | 1 << 11 | 3 << 4) > -#define SCTLR_RESET (3 << 22 | 1 << 11 | 1 << 5 | 3 << 4) > +#define HSCTLR_KERNEL (3 << 28 | 3 << 22 | 1 << 18 | 1 << 16 | 1 << 11 | 3 << 4) > +#define SCTLR_KERNEL (3 << 22 | 1 << 11 | 1 << 5 | 3 << 4) > > #define PSR_SVC 0x13 > #define PSR_HYP 0x1a > diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S > index d8d7ccd..587a25f 100644 > --- a/arch/aarch64/boot.S > +++ b/arch/aarch64/boot.S > @@ -140,10 +140,10 @@ ASM_FUNC(jump_kernel) > mov x22, x3 > mov x23, x4 > > - ldr x0, =SCTLR_EL1_RESET > + ldr x0, =SCTLR_EL1_KERNEL > msr sctlr_el1, x0 > > - ldr x0, =SCTLR_EL2_RESET > + ldr x0, =SCTLR_EL2_KERNEL > msr sctlr_el2, x0 > > cpuid x0, x1 > diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h > index 1cddbb8..63eb1c3 100644 > --- a/arch/aarch64/include/asm/cpu.h > +++ b/arch/aarch64/include/asm/cpu.h > @@ -17,7 +17,7 @@ > * RES1 bits, little-endian, caches and MMU off, no alignment checking, > * no WXN. > */ > -#define SCTLR_EL2_RESET (3 << 28 | 3 << 22 | 1 << 18 | 1 << 16 | 1 << 11 | 3 << 4) > +#define SCTLR_EL2_KERNEL (3 << 28 | 3 << 22 | 1 << 18 | 1 << 16 | 1 << 11 | 3 << 4) > > #define SPSR_A (1 << 8) /* System Error masked */ > #define SPSR_D (1 << 9) /* Debug masked */ > @@ -37,10 +37,10 @@ > > #ifdef KERNEL_32 > /* 32-bit kernel decompressor uses CP15 barriers */ > -#define SCTLR_EL1_RESET (SCTLR_EL1_RES1 | SCTLR_EL1_CP15BEN) > +#define SCTLR_EL1_KERNEL (SCTLR_EL1_RES1 | SCTLR_EL1_CP15BEN) > #define SPSR_KERNEL (SPSR_A | SPSR_I | SPSR_F | SPSR_HYP) > #else > -#define SCTLR_EL1_RESET SCTLR_EL1_RES1 > +#define SCTLR_EL1_KERNEL SCTLR_EL1_RES1 > #define SPSR_KERNEL (SPSR_A | SPSR_D | SPSR_I | SPSR_F | SPSR_EL2H) > #endif > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel