Commit 7a2c0944 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: entry: cleanup el0 svc handler naming 



For most of the exception entry code, <foo>_handler() is the first C
function called from the entry assembly in entry-common.c, and external
functions handling the bulk of the logic are called do_<foo>().

For consistency, apply this scheme to el0_svc_handler and
el0_svc_compat_handler, renaming them to do_el0_svc and
do_el0_svc_compat respectively.

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

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 2d226c1e

arch/arm64/include/asm/exception.h

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ void do_sysinstr(unsigned int esr, struct pt_regs *regs); 
void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);

void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr);

void do_cp15instr(unsigned int esr, struct pt_regs *regs);

void el0_svc_handler(struct pt_regs *regs);

void el0_svc_compat_handler(struct pt_regs *regs);

void do_el0_svc(struct pt_regs *regs);

void do_el0_svc_compat(struct pt_regs *regs);

void do_el0_ia_bp_hardening(unsigned long addr,  unsigned int esr,

			    struct pt_regs *regs);

arch/arm64/kernel/entry-common.c

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void notrace el0_svc(struct pt_regs *regs) 
	if (system_uses_irq_prio_masking())

		gic_write_pmr(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET);



	el0_svc_handler(regs);

	do_el0_svc(regs);

}

NOKPROBE_SYMBOL(el0_svc);
@@ -281,7 +281,7 @@ static void notrace el0_svc_compat(struct pt_regs *regs) 
	if (system_uses_irq_prio_masking())

		gic_write_pmr(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET);



	el0_svc_compat_handler(regs);

	do_el0_svc_compat(regs);

}

NOKPROBE_SYMBOL(el0_svc_compat);

arch/arm64/kernel/syscall.c

+2 −2
Original line number Diff line number Diff line
@@ -154,14 +154,14 @@ static inline void sve_user_discard(void) 
	sve_user_disable();

}



void el0_svc_handler(struct pt_regs *regs)

void do_el0_svc(struct pt_regs *regs)

{

	sve_user_discard();

	el0_svc_common(regs, regs->regs[8], __NR_syscalls, sys_call_table);

}



#ifdef CONFIG_COMPAT

void el0_svc_compat_handler(struct pt_regs *regs)

void do_el0_svc_compat(struct pt_regs *regs)

{

	el0_svc_common(regs, regs->regs[7], __NR_compat_syscalls,

		       compat_sys_call_table);

CRA Git | Maintained and supported by SUSTech CRA and CCSE