Commit f55d9665 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Define and use PPC64_ELF_ABI_v2/v1 



We're approaching 20 locations where we need to check for ELF ABI v2.
That's fine, except the logic is a bit awkward, because we have to check
that _CALL_ELF is defined and then what its value is.

So check it once in asm/types.h and define PPC64_ELF_ABI_v2 when ELF ABI
v2 is detected.

We also have a few places where what we're really trying to check is
that we are using the 64-bit v1 ABI, ie. function descriptors. So also
add a #define for that, which simplifies several checks.

Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ac9cd170

arch/powerpc/include/asm/code-patching.h

+4 −6
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ void __patch_exception(int exc, unsigned long addr); 


static inline unsigned long ppc_function_entry(void *func)

{

#if defined(CONFIG_PPC64)

#if defined(_CALL_ELF) && _CALL_ELF == 2

#ifdef PPC64_ELF_ABI_v2

	u32 *insn = func;



	/*
@@ -75,14 +74,13 @@ static inline unsigned long ppc_function_entry(void *func) 
		return (unsigned long)(insn + 2);

	else

		return (unsigned long)func;

#else

#elif defined(PPC64_ELF_ABI_v1)

	/*

	 * On PPC64 ABIv1 the function pointer actually points to the

	 * function's descriptor. The first entry in the descriptor is the

	 * address of the function text.

	 */

	return ((func_descr_t *)func)->entry;

#endif

#else

	return (unsigned long)func;

#endif
@@ -90,7 +88,7 @@ static inline unsigned long ppc_function_entry(void *func) 


static inline unsigned long ppc_global_function_entry(void *func)

{

#if defined(CONFIG_PPC64) && defined(_CALL_ELF) && _CALL_ELF == 2

#ifdef PPC64_ELF_ABI_v2

	/* PPC64 ABIv2 the global entry point is at the address */

	return (unsigned long)func;

#else
@@ -106,7 +104,7 @@ static inline unsigned long ppc_global_function_entry(void *func) 
 */



/* This must match the definition of STK_GOT in <asm/ppc_asm.h> */

#if defined(_CALL_ELF) && _CALL_ELF == 2

#ifdef PPC64_ELF_ABI_v2

#define R2_STACK_OFFSET         24

#else

#define R2_STACK_OFFSET         40

arch/powerpc/include/asm/ftrace.h

+5 −3
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_FTRACE

#define _ASM_POWERPC_FTRACE



#include <asm/types.h>



#ifdef CONFIG_FUNCTION_TRACER

#define MCOUNT_ADDR		((unsigned long)(_mcount))

#define MCOUNT_INSN_SIZE	4 /* sizeof mcount call */
@@ -65,8 +67,8 @@ struct dyn_arch_ftrace { 
#endif

#endif



#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64) && !defined(__ASSEMBLY__)

#if !defined(_CALL_ELF) || _CALL_ELF != 2

#if defined(CONFIG_FTRACE_SYSCALLS) && !defined(__ASSEMBLY__)

#ifdef PPC64_ELF_ABI_v1

#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME

static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)

{
@@ -79,6 +81,6 @@ static inline bool arch_syscall_match_sym_name(const char *sym, const char *name 
	return !strcmp(sym + 4, name + 3);

}

#endif

#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 && !__ASSEMBLY__ */

#endif /* CONFIG_FTRACE_SYSCALLS && !__ASSEMBLY__ */



#endif /* _ASM_POWERPC_FTRACE */

arch/powerpc/include/asm/kprobes.h

+3 −5
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ struct kprobe; 
typedef ppc_opcode_t kprobe_opcode_t;

#define MAX_INSN_SIZE 1



#ifdef CONFIG_PPC64

#if defined(_CALL_ELF) && _CALL_ELF == 2

#ifdef PPC64_ELF_ABI_v2

/* PPC64 ABIv2 needs local entry point */

#define kprobe_lookup_name(name, addr)					\

{									\
@@ -49,7 +48,7 @@ typedef ppc_opcode_t kprobe_opcode_t; 
	if (addr)							\

		addr = (kprobe_opcode_t *)ppc_function_entry(addr);	\

}

#else

#elif defined(PPC64_ELF_ABI_v1)

/*

 * 64bit powerpc ABIv1 uses function descriptors:

 * - Check for the dot variant of the symbol first.
@@ -92,8 +91,7 @@ typedef ppc_opcode_t kprobe_opcode_t; 
		addr = (kprobe_opcode_t *)kallsyms_lookup_name(name);	\

	}								\

}

#endif /* defined(_CALL_ELF) && _CALL_ELF == 2 */

#endif /* CONFIG_PPC64 */

#endif



#define flush_insn_slot(p)	do { } while (0)

#define kretprobe_blacklist_size 0

arch/powerpc/include/asm/linkage.h

+3 −3
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_LINKAGE_H

#define _ASM_POWERPC_LINKAGE_H



#ifdef CONFIG_PPC64

#if !defined(_CALL_ELF) || _CALL_ELF != 2

#include <asm/types.h>



#ifdef PPC64_ELF_ABI_v1

#define cond_syscall(x) \

	asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n"		\

	     "\t.weak ." #x "\n\t.set ." #x ", .sys_ni_syscall\n")
@@ -10,6 +11,5 @@ 
	asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n"	\

	     "\t.globl ." #alias "\n\t.set ." #alias ", ." #name)

#endif

#endif



#endif	/* _ASM_POWERPC_LINKAGE_H */

arch/powerpc/include/asm/ppc_asm.h

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR) 
#define __STK_REG(i)   (112 + ((i)-14)*8)

#define STK_REG(i)     __STK_REG(__REG_##i)



#if defined(_CALL_ELF) && _CALL_ELF == 2

#ifdef PPC64_ELF_ABI_v2

#define STK_GOT		24

#define __STK_PARAM(i)	(32 + ((i)-3)*8)

#else
@@ -198,7 +198,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR) 
#endif

#define STK_PARAM(i)	__STK_PARAM(__REG_##i)



#if defined(_CALL_ELF) && _CALL_ELF == 2

#ifdef PPC64_ELF_ABI_v2



#define _GLOBAL(name) \

	.section ".text"; \

CRA Git | Maintained and supported by SUSTech CRA and CCSE