[PATCH v4 3/8] arm64/sysreg: Rename SCTLR_EL1_NTWE/TWI to SCTLR_EL1_nTWE/TWI

Mark Rutland mark.rutland at arm.com
Thu Apr 21 02:36:07 PDT 2022


On Tue, Apr 19, 2022 at 11:43:24AM +0100, Mark Brown wrote:
> We already use lower case in some defines in sysreg.h, for consistency with
> the architecture definition do so for SCTLR_EL1.nTWE and SCTLR_EL1.nTWI.
> 
> Signed-off-by: Mark Brown <broonie at kernel.org>

I have no strong feelings either way as to whether we should keep this all caps
or match the architectural CamelCase, so:

Acked-by: Mark Rutland <mark.rutland at arm.com>

Mark.

> ---
>  arch/arm64/include/asm/sysreg.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
> index 1911f36773e5..f300c49d6281 100644
> --- a/arch/arm64/include/asm/sysreg.h
> +++ b/arch/arm64/include/asm/sysreg.h
> @@ -689,8 +689,8 @@
>  #define SCTLR_EL1_UCI		(BIT(26))
>  #define SCTLR_EL1_E0E		(BIT(24))
>  #define SCTLR_EL1_SPAN		(BIT(23))
> -#define SCTLR_EL1_NTWE		(BIT(18))
> -#define SCTLR_EL1_NTWI		(BIT(16))
> +#define SCTLR_EL1_nTWE		(BIT(18))
> +#define SCTLR_EL1_nTWI		(BIT(16))
>  #define SCTLR_EL1_UCT		(BIT(15))
>  #define SCTLR_EL1_DZE		(BIT(14))
>  #define SCTLR_EL1_UMA		(BIT(9))
> @@ -714,7 +714,7 @@
>  #define INIT_SCTLR_EL1_MMU_ON \
>  	(SCTLR_ELx_M    | SCTLR_ELx_C    | SCTLR_ELx_SA   | SCTLR_EL1_SA0   | \
>  	 SCTLR_EL1_SED  | SCTLR_ELx_I    | SCTLR_EL1_DZE  | SCTLR_EL1_UCT   | \
> -	 SCTLR_EL1_NTWE | SCTLR_ELx_IESB | SCTLR_EL1_SPAN | SCTLR_ELx_ITFSB | \
> +	 SCTLR_EL1_nTWE | SCTLR_ELx_IESB | SCTLR_EL1_SPAN | SCTLR_ELx_ITFSB | \
>  	 ENDIAN_SET_EL1 | SCTLR_EL1_UCI  | SCTLR_EL1_EPAN | SCTLR_EL1_RES1)
>  
>  /* MAIR_ELx memory attributes (used by Linux) */
> -- 
> 2.30.2
> 



More information about the linux-arm-kernel mailing list