Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24bfa6a9 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: EX_TABLE macro for exception tables 



This macro is taken from s390, and allows more flexibility in
changing exception table format.

mpe: Put it in ppc_asm.h and only define one version using
stringinfy_in_c(). Add some empty definitions and headers to keep the
selftests happy.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 997e2001

arch/powerpc/include/asm/futex.h

+5 −9
Original line number Diff line number Diff line
@@ -23,10 +23,8 @@ 
"4:	li	%1,%3\n" \

	"b	3b\n" \

	".previous\n" \

	".section __ex_table,\"a\"\n" \

	".align 3\n" \

	PPC_LONG "1b,4b,2b,4b\n" \

	".previous" \

	EX_TABLE(1b, 4b) \

	EX_TABLE(2b, 4b) \

	: "=&r" (oldval), "=&r" (ret) \

	: "b" (uaddr), "i" (-EFAULT), "r" (oparg) \

	: "cr0", "memory")
@@ -104,11 +102,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
"3:	.section .fixup,\"ax\"\n\

4:	li	%0,%6\n\

	b	3b\n\

	.previous\n\

	.section __ex_table,\"a\"\n\

	.align 3\n\

	" PPC_LONG "1b,4b,2b,4b\n\

	.previous" \

	.previous\n"

	EX_TABLE(1b, 4b)

	EX_TABLE(2b, 4b)

        : "+r" (ret), "=&r" (prev), "+m" (*uaddr)

        : "r" (uaddr), "r" (oldval), "r" (newval), "i" (-EFAULT)

        : "cc", "memory");

arch/powerpc/include/asm/io.h

+7 −12
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ extern struct pci_dev *isa_bridge_pcidev; 
#include <asm/synch.h>

#include <asm/delay.h>

#include <asm/mmu.h>

#include <asm/ppc_asm.h>



#include <asm-generic/iomap.h>
@@ -458,13 +459,10 @@ static inline unsigned int name(unsigned int port) \ 
		"5:	li	%0,-1\n"		\

		"	b	4b\n"			\

		".previous\n"				\

		".section __ex_table,\"a\"\n"		\

		"	.align	2\n"			\

		"	.long	0b,5b\n"		\

		"	.long	1b,5b\n"		\

		"	.long	2b,5b\n"		\

		"	.long	3b,5b\n"		\

		".previous"				\

		EX_TABLE(0b, 5b)			\

		EX_TABLE(1b, 5b)			\

		EX_TABLE(2b, 5b)			\

		EX_TABLE(3b, 5b)			\

		: "=&r" (x)				\

		: "r" (port + _IO_BASE)			\

		: "memory");  				\
@@ -479,11 +477,8 @@ static inline void name(unsigned int val, unsigned int port) \ 
		"0:" op " %0,0,%1\n"			\

		"1:	sync\n"				\

		"2:\n"					\

		".section __ex_table,\"a\"\n"		\

		"	.align	2\n"			\

		"	.long	0b,2b\n"		\

		"	.long	1b,2b\n"		\

		".previous"				\

		EX_TABLE(0b, 2b)			\

		EX_TABLE(1b, 2b)			\

		: : "r" (val), "r" (port + _IO_BASE)	\

		: "memory");   	   	   		\

}

arch/powerpc/include/asm/ppc_asm.h

+10 −0
Original line number Diff line number Diff line
@@ -780,4 +780,14 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) 


#endif /*  __ASSEMBLY__ */



/*

 * Helper macro for exception table entries

 */

#define EX_TABLE(_fault, _target)		\

	stringify_in_c(.section __ex_table,"a";)\

	PPC_LONG_ALIGN stringify_in_c(;)	\

	PPC_LONG stringify_in_c(_fault;)	\

	PPC_LONG stringify_in_c(_target;)	\

	stringify_in_c(.previous)



#endif /* _ASM_POWERPC_PPC_ASM_H */

arch/powerpc/include/asm/uaccess.h

+7 −18
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/sched.h>

#include <linux/errno.h>

#include <asm/asm-compat.h>

#include <asm/ppc_asm.h>

#include <asm/processor.h>

#include <asm/page.h>
@@ -132,10 +133,7 @@ extern long __put_user_bad(void); 
		"3:	li %0,%3\n"				\

		"	b 2b\n"					\

		".previous\n"					\

		".section __ex_table,\"a\"\n"			\

			PPC_LONG_ALIGN "\n"			\

			PPC_LONG "1b,3b\n"			\

		".previous"					\

		EX_TABLE(1b, 3b)				\

		: "=r" (err)					\

		: "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
@@ -152,11 +150,8 @@ extern long __put_user_bad(void); 
		"4:	li %0,%3\n"				\

		"	b 3b\n"					\

		".previous\n"					\

		".section __ex_table,\"a\"\n"			\

			PPC_LONG_ALIGN "\n"			\

			PPC_LONG "1b,4b\n"			\

			PPC_LONG "2b,4b\n"			\

		".previous"					\

		EX_TABLE(1b, 4b)				\

		EX_TABLE(2b, 4b)				\

		: "=r" (err)					\

		: "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))

#endif /* __powerpc64__ */
@@ -215,10 +210,7 @@ extern long __get_user_bad(void); 
		"	li %1,0\n"			\

		"	b 2b\n"				\

		".previous\n"				\

		".section __ex_table,\"a\"\n"		\

			PPC_LONG_ALIGN "\n"		\

			PPC_LONG "1b,3b\n"		\

		".previous"				\

		EX_TABLE(1b, 3b)			\

		: "=r" (err), "=r" (x)			\

		: "b" (addr), "i" (-EFAULT), "0" (err))
@@ -237,11 +229,8 @@ extern long __get_user_bad(void); 
		"	li %1+1,0\n"			\

		"	b 3b\n"				\

		".previous\n"				\

		".section __ex_table,\"a\"\n"		\

			PPC_LONG_ALIGN "\n"		\

			PPC_LONG "1b,4b\n"		\

			PPC_LONG "2b,4b\n"		\

		".previous"				\

		EX_TABLE(1b, 4b)			\

		EX_TABLE(2b, 4b)			\

		: "=r" (err), "=&r" (x)			\

		: "b" (addr), "i" (-EFAULT), "0" (err))

#endif /* __powerpc64__ */

arch/powerpc/include/asm/word-at-a-time.h

+2 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/kernel.h>

#include <asm/asm-compat.h>

#include <asm/ppc_asm.h>



#ifdef __BIG_ENDIAN__
@@ -193,10 +194,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr) 
#endif

	"b	2b\n"

	".previous\n"

	".section __ex_table,\"a\"\n\t"

		PPC_LONG_ALIGN "\n\t"

		PPC_LONG "1b,3b\n"

	".previous"

	EX_TABLE(1b, 3b)

	: [tmp] "=&b" (tmp), [offset] "=&r" (offset), [ret] "=&r" (ret)

	: [addr] "b" (addr), "m" (*(unsigned long *)addr));