Commit 77f85f69 authored by Nathan Lynch's avatar Nathan Lynch Committed by Michael Ellerman
Browse files

powerpc/rtas: strengthen do_enter_rtas() type safety, drop inline 



Make do_enter_rtas() take a pointer to struct rtas_args and do the
__pa() conversion in one place instead of leaving it to callers. This
also makes it possible to introduce enter/exit tracepoints that access
the rtas_args struct fields.

There's no apparent reason to force inlining of do_enter_rtas()
either, and it seems to bloat the code a bit. Let the compiler decide.

Signed-off-by: default avatarNathan Lynch <nathanl@linux.ibm.com>
Reviewed-by: default avatarAndrew Donnellan <ajd@linux.ibm.com>
Reviewed-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230125-b4-powerpc-rtas-queue-v3-9-26929c8cce78@linux.ibm.com
parent 8252b882

arch/powerpc/kernel/rtas.c

+5 −5
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static const struct rtas_function *rtas_token_to_function(s32 token) 
/* This is here deliberately so it's only used in this file */

void enter_rtas(unsigned long);



static inline void do_enter_rtas(unsigned long args)

static void do_enter_rtas(struct rtas_args *args)

{

	unsigned long msr;
@@ -538,7 +538,7 @@ static inline void do_enter_rtas(unsigned long args) 


	hard_irq_disable(); /* Ensure MSR[EE] is disabled on PPC64 */



	enter_rtas(args);

	enter_rtas(__pa(args));



	srr_regs_clobbered(); /* rtas uses SRRs, invalidate */

}
@@ -892,7 +892,7 @@ static char *__fetch_rtas_last_error(char *altbuf) 
	save_args = rtas_args;

	rtas_args = err_args;



	do_enter_rtas(__pa(&rtas_args));

	do_enter_rtas(&rtas_args);



	err_args = rtas_args;

	rtas_args = save_args;
@@ -939,7 +939,7 @@ va_rtas_call_unlocked(struct rtas_args *args, int token, int nargs, int nret, 
	for (i = 0; i < nret; ++i)

		args->rets[i] = 0;



	do_enter_rtas(__pa(args));

	do_enter_rtas(args);

}



void rtas_call_unlocked(struct rtas_args *args, int token, int nargs, int nret, ...)
@@ -1757,7 +1757,7 @@ SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs) 
	raw_spin_lock_irqsave(&rtas_lock, flags);



	rtas_args = args;

	do_enter_rtas(__pa(&rtas_args));

	do_enter_rtas(&rtas_args);

	args = rtas_args;



	/* A -1 return code indicates that the last command couldn't