Commit 6879ef13 authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

arm64: entry: Consistently prefix arm64-specific wrappers 



For historical reasons, arm64's entry code has arm64-specific functions
named enter_from_kernel_mode() and exit_to_kernel_mode(), which are
wrappers for similarly-named functions from the generic irqentry code.
Other arm64-specific wrappers have an 'arm64_' prefix to clearly
distinguish them from their generic counterparts, e.g.
arm64_enter_from_user_mode() and arm64_exit_to_user_mode().

For consistency and clarity, add an 'arm64_' prefix to these functions.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Jinjie Ruan <ruanjinjie@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Vladimir Murzin <vladimir.murzin@arm.com>
Cc: Will Deacon <will@kernel.org>
Reviewed-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 2371bd83

arch/arm64/kernel/entry-common.c

+19 −19
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
 * Before this function is called it is not safe to call regular kernel code,

 * instrumentable code, or any code which may trigger an exception.

 */

static noinstr irqentry_state_t enter_from_kernel_mode(struct pt_regs *regs)

static noinstr irqentry_state_t arm64_enter_from_kernel_mode(struct pt_regs *regs)

{

	irqentry_state_t state;
@@ -51,7 +51,7 @@ static noinstr irqentry_state_t enter_from_kernel_mode(struct pt_regs *regs) 
 * After this function returns it is not safe to call regular kernel code,

 * instrumentable code, or any code which may trigger an exception.

 */

static void noinstr exit_to_kernel_mode(struct pt_regs *regs,

static void noinstr arm64_exit_to_kernel_mode(struct pt_regs *regs,

					      irqentry_state_t state)

{

	mte_check_tfsr_exit();
@@ -298,11 +298,11 @@ static void noinstr el1_abort(struct pt_regs *regs, unsigned long esr) 
	unsigned long far = read_sysreg(far_el1);

	irqentry_state_t state;



	state = enter_from_kernel_mode(regs);

	state = arm64_enter_from_kernel_mode(regs);

	local_daif_inherit(regs);

	do_mem_abort(far, esr, regs);

	local_daif_mask();

	exit_to_kernel_mode(regs, state);

	arm64_exit_to_kernel_mode(regs, state);

}



static void noinstr el1_pc(struct pt_regs *regs, unsigned long esr)
@@ -310,55 +310,55 @@ static void noinstr el1_pc(struct pt_regs *regs, unsigned long esr) 
	unsigned long far = read_sysreg(far_el1);

	irqentry_state_t state;



	state = enter_from_kernel_mode(regs);

	state = arm64_enter_from_kernel_mode(regs);

	local_daif_inherit(regs);

	do_sp_pc_abort(far, esr, regs);

	local_daif_mask();

	exit_to_kernel_mode(regs, state);

	arm64_exit_to_kernel_mode(regs, state);

}



static void noinstr el1_undef(struct pt_regs *regs, unsigned long esr)

{

	irqentry_state_t state;



	state = enter_from_kernel_mode(regs);

	state = arm64_enter_from_kernel_mode(regs);

	local_daif_inherit(regs);

	do_el1_undef(regs, esr);

	local_daif_mask();

	exit_to_kernel_mode(regs, state);

	arm64_exit_to_kernel_mode(regs, state);

}



static void noinstr el1_bti(struct pt_regs *regs, unsigned long esr)

{

	irqentry_state_t state;



	state = enter_from_kernel_mode(regs);

	state = arm64_enter_from_kernel_mode(regs);

	local_daif_inherit(regs);

	do_el1_bti(regs, esr);

	local_daif_mask();

	exit_to_kernel_mode(regs, state);

	arm64_exit_to_kernel_mode(regs, state);

}



static void noinstr el1_gcs(struct pt_regs *regs, unsigned long esr)

{

	irqentry_state_t state;



	state = enter_from_kernel_mode(regs);

	state = arm64_enter_from_kernel_mode(regs);

	local_daif_inherit(regs);

	do_el1_gcs(regs, esr);

	local_daif_mask();

	exit_to_kernel_mode(regs, state);

	arm64_exit_to_kernel_mode(regs, state);

}



static void noinstr el1_mops(struct pt_regs *regs, unsigned long esr)

{

	irqentry_state_t state;



	state = enter_from_kernel_mode(regs);

	state = arm64_enter_from_kernel_mode(regs);

	local_daif_inherit(regs);

	do_el1_mops(regs, esr);

	local_daif_mask();

	exit_to_kernel_mode(regs, state);

	arm64_exit_to_kernel_mode(regs, state);

}



static void noinstr el1_breakpt(struct pt_regs *regs, unsigned long esr)
@@ -420,11 +420,11 @@ static void noinstr el1_fpac(struct pt_regs *regs, unsigned long esr) 
{

	irqentry_state_t state;



	state = enter_from_kernel_mode(regs);

	state = arm64_enter_from_kernel_mode(regs);

	local_daif_inherit(regs);

	do_el1_fpac(regs, esr);

	local_daif_mask();

	exit_to_kernel_mode(regs, state);

	arm64_exit_to_kernel_mode(regs, state);

}



asmlinkage void noinstr el1h_64_sync_handler(struct pt_regs *regs)
@@ -491,13 +491,13 @@ static __always_inline void __el1_irq(struct pt_regs *regs, 
{

	irqentry_state_t state;



	state = enter_from_kernel_mode(regs);

	state = arm64_enter_from_kernel_mode(regs);



	irq_enter_rcu();

	do_interrupt_handler(regs, handler);

	irq_exit_rcu();



	exit_to_kernel_mode(regs, state);

	arm64_exit_to_kernel_mode(regs, state);

}

static void noinstr el1_interrupt(struct pt_regs *regs,

				  void (*handler)(struct pt_regs *))