Commit 76222808 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Move C prototypes out of asm-prototypes.h 



We originally added asm-prototypes.h in commit 42f5b4ca ("powerpc:
Introduce asm-prototypes.h"). It's purpose was for prototypes of C
functions that are only called from asm, in order to fix sparse
warnings about missing prototypes.

A few months later Nick added a different use case in
commit 4efca4ed ("kbuild: modversions for EXPORT_SYMBOL() for asm")
for C prototypes for exported asm functions. This is basically the
inverse of our original usage.

Since then we've added various prototypes to asm-prototypes.h for both
reasons, meaning we now need to unstitch it all.

Dispatch prototypes of C functions into relevant headers and keep
only the prototypes for functions defined in assembly.

For the time being, leave prom_init() there because moving it
into asm/prom.h or asm/setup.h conflicts with
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowrom.o
This will be fixed later by untaggling asm/pci.h and asm/prom.h
or by renaming the function in shadowrom.c

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/62d46904eca74042097acf4cb12c175e3067f3d1.1646413435.git.christophe.leroy@csgroup.eu
parent a4abd55a

arch/powerpc/include/asm/asm-prototypes.h

+0 −49
Original line number Diff line number Diff line
@@ -19,19 +19,6 @@ 


#include <uapi/asm/ucontext.h>



/* SMP */

extern struct task_struct *secondary_current;

void start_secondary(void *unused);



/* kexec */

struct kimage;

void kexec_copy_flush(struct kimage *image);



/* pseries hcall tracing */

extern struct static_key hcall_tracepoint_key;

void __trace_hcall_entry(unsigned long opcode, unsigned long *args);

void __trace_hcall_exit(long opcode, long retval, unsigned long *retbuf);



/* Ultravisor */

#if defined(CONFIG_PPC_POWERNV) || defined(CONFIG_PPC_SVM)

long ucall_norets(unsigned long opcode, ...);
@@ -47,43 +34,12 @@ int64_t __opal_call(int64_t a0, int64_t a1, int64_t a2, int64_t a3, 
		    int64_t a4, int64_t a5, int64_t a6, int64_t a7,

		    int64_t opcode, uint64_t msr);



/* VMX copying */

int enter_vmx_usercopy(void);

int exit_vmx_usercopy(void);

int enter_vmx_ops(void);

void *exit_vmx_ops(void *dest);



/* signals, syscalls and interrupts */

#ifdef CONFIG_PPC32

int

ppc_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,

	   struct __kernel_old_timeval __user *tvp);

unsigned long __init early_init(unsigned long dt_ptr);

void __init machine_init(u64 dt_ptr);

#endif

long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8, unsigned long r0, struct pt_regs *regs);

notrace unsigned long syscall_exit_prepare(unsigned long r3, struct pt_regs *regs, long scv);

notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs);

notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs);

#ifdef CONFIG_PPC64

unsigned long syscall_exit_restart(unsigned long r3, struct pt_regs *regs);

unsigned long interrupt_exit_user_restart(struct pt_regs *regs);

unsigned long interrupt_exit_kernel_restart(struct pt_regs *regs);

#endif



long ppc_fadvise64_64(int fd, int advice, u32 offset_high, u32 offset_low,

		      u32 len_high, u32 len_low);



/* prom_init (OpenFirmware) */

unsigned long __init prom_init(unsigned long r3, unsigned long r4,

			       unsigned long pp,

			       unsigned long r6, unsigned long r7,

			       unsigned long kbase);



/* setup */

void __init early_setup(unsigned long dt_ptr);

void early_setup_secondary(void);



/* misc runtime */

extern u64 __bswapdi2(u64);

extern s64 __lshrdi3(s64, int);
@@ -94,11 +50,6 @@ extern int __ucmpdi2(u64, u64); 


/* tracing */

void _mcount(void);

unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip,

						unsigned long sp);



void pnv_power9_force_smt4_catch(void);

void pnv_power9_force_smt4_release(void);



/* Transaction memory related */

void tm_enable(void);

arch/powerpc/include/asm/ftrace.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) 
       return addr;

}



unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip,

				    unsigned long sp);



struct dyn_arch_ftrace {

	struct module *mod;

};

arch/powerpc/include/asm/hvcall.h

+5 −0
Original line number Diff line number Diff line
@@ -501,6 +501,11 @@ long plpar_hcall_raw(unsigned long opcode, unsigned long *retbuf, ...); 
long plpar_hcall9(unsigned long opcode, unsigned long *retbuf, ...);

long plpar_hcall9_raw(unsigned long opcode, unsigned long *retbuf, ...);



/* pseries hcall tracing */

extern struct static_key hcall_tracepoint_key;

void __trace_hcall_entry(unsigned long opcode, unsigned long *args);

void __trace_hcall_exit(long opcode, long retval, unsigned long *retbuf);



struct hvcall_mpp_data {

	unsigned long entitled_mem;

	unsigned long mapped_mem;

arch/powerpc/include/asm/interrupt.h

+11 −0
Original line number Diff line number Diff line
@@ -636,6 +636,17 @@ static inline void interrupt_cond_local_irq_enable(struct pt_regs *regs) 
		local_irq_enable();

}



long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8,

			   unsigned long r0, struct pt_regs *regs);

notrace unsigned long syscall_exit_prepare(unsigned long r3, struct pt_regs *regs, long scv);

notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs);

notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs);

#ifdef CONFIG_PPC64

unsigned long syscall_exit_restart(unsigned long r3, struct pt_regs *regs);

unsigned long interrupt_exit_user_restart(struct pt_regs *regs);

unsigned long interrupt_exit_kernel_restart(struct pt_regs *regs);

#endif



#endif /* __ASSEMBLY__ */



#endif /* _ASM_POWERPC_INTERRUPT_H */

arch/powerpc/include/asm/kexec.h

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ static inline bool kdump_in_progress(void) 
void relocate_new_kernel(unsigned long indirection_page, unsigned long reboot_code_buffer,

			 unsigned long start_address) __noreturn;



void kexec_copy_flush(struct kimage *image);



#ifdef CONFIG_KEXEC_FILE

extern const struct kexec_file_ops kexec_elf64_ops;