Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c51e97d8 authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas
Browse files

arm64: mm: remove unused cpu_set_idmap_tcr_t0sz function 



With commit b08d4640 ("arm64: remove dead code"),
cpu_set_idmap_tcr_t0sz is no longer called and can therefore be removed
from the kernel.

This patch removes the function and effectively inlines the helper
function __cpu_set_tcr_t0sz into cpu_set_default_tcr_t0sz.

Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 127db024

arch/arm64/include/asm/mmu_context.h

+12 −23
Original line number Diff line number Diff line
@@ -77,34 +77,23 @@ static inline bool __cpu_uses_extended_idmap(void) 
		unlikely(idmap_t0sz != TCR_T0SZ(VA_BITS)));

}



static inline void __cpu_set_tcr_t0sz(u64 t0sz)

/*

 * Set TCR.T0SZ to its default value (based on VA_BITS)

 */

static inline void cpu_set_default_tcr_t0sz(void)

{

	unsigned long tcr;



	if (__cpu_uses_extended_idmap())

	if (!__cpu_uses_extended_idmap())

		return;



	asm volatile (

	"	mrs	%0, tcr_el1	;"

	"	bfi	%0, %1, %2, %3	;"

	"	msr	tcr_el1, %0	;"

	"	isb"

	: "=&r" (tcr)

		: "r"(t0sz), "I"(TCR_T0SZ_OFFSET), "I"(TCR_TxSZ_WIDTH));

}



/*

 * Set TCR.T0SZ to the value appropriate for activating the identity map.

 */

static inline void cpu_set_idmap_tcr_t0sz(void)

{

	__cpu_set_tcr_t0sz(idmap_t0sz);

}



/*

 * Set TCR.T0SZ to its default value (based on VA_BITS)

 */

static inline void cpu_set_default_tcr_t0sz(void)

{

	__cpu_set_tcr_t0sz(TCR_T0SZ(VA_BITS));

	: "r"(TCR_T0SZ(VA_BITS)), "I"(TCR_T0SZ_OFFSET), "I"(TCR_TxSZ_WIDTH));

}



static inline void switch_new_context(struct mm_struct *mm)