]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64/mm: Drop TCR_SMP_FLAGS
authorAnshuman Khandual <anshuman.khandual@arm.com>
Wed, 24 Jul 2024 04:14:28 +0000 (09:44 +0530)
committerWill Deacon <will@kernel.org>
Fri, 16 Aug 2024 10:24:55 +0000 (11:24 +0100)
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@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
Link: https://lore.kernel.org/r/20240724041428.573748-1-anshuman.khandual@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/mm/proc.S

index f4bc6c5bac0625386566763e1e5c485f311610f2..8abdc7fed3210d03c2d7fc99b7708d627e8228be 100644 (file)
@@ -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