[PATCH] arm64/mm: Drop TCR_SMP_FLAGS

Ryan Roberts ryan.roberts at arm.com
Wed Jul 24 00:58:51 PDT 2024


On 24/07/2024 05:14, Anshuman Khandual wrote:
> Earlier TCR_SMP_FLAGS gets conditionally set as TCR_SHARED with CONFIG_SMP.
> Currently CONFIG_SMP is always enabled on arm64 platforms, hence drop this
> indirection via TCR_SMP_FLAGS and instead always directly use TCR_SHARED.
> 
> Cc: Catalin Marinas <catalin.marinas at arm.com>
> Cc: Will Deacon <will at kernel.org>
> Cc: Ryan Roberts <ryan.roberts at arm.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual at arm.com>

Reviewed-by: Ryan Roberts <ryan.roberts at arm.com>

> ---
>  arch/arm64/mm/proc.S | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
> index f4bc6c5bac06..8abdc7fed321 100644
> --- a/arch/arm64/mm/proc.S
> +++ b/arch/arm64/mm/proc.S
> @@ -36,8 +36,6 @@
>  #define TCR_KASLR_FLAGS	0
>  #endif
>  
> -#define TCR_SMP_FLAGS	TCR_SHARED
> -
>  /* PTWs cacheable, inner/outer WBWA */
>  #define TCR_CACHE_FLAGS	TCR_IRGN_WBWA | TCR_ORGN_WBWA
>  
> @@ -469,7 +467,7 @@ SYM_FUNC_START(__cpu_setup)
>  	tcr	.req	x16
>  	mov_q	mair, MAIR_EL1_SET
>  	mov_q	tcr, TCR_T0SZ(IDMAP_VA_BITS) | TCR_T1SZ(VA_BITS_MIN) | TCR_CACHE_FLAGS | \
> -		     TCR_SMP_FLAGS | TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \
> +		     TCR_SHARED | TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \
>  		     TCR_TBI0 | TCR_A1 | TCR_KASAN_SW_FLAGS | TCR_MTE_FLAGS
>  
>  	tcr_clear_errata_bits tcr, x9, x5




More information about the linux-arm-kernel mailing list