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

Commit 9778b696 authored by Stuart Yoder's avatar Stuart Yoder Committed by Benjamin Herrenschmidt
Browse files

powerpc: Use CURRENT_THREAD_INFO instead of open coded assembly 



Signed-off-by: default avatarStuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent db911217

arch/powerpc/include/asm/exception-64s.h

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ label##_hv: \ 


#define RUNLATCH_ON				\

BEGIN_FTR_SECTION				\

	clrrdi	r3,r1,THREAD_SHIFT;		\

	CURRENT_THREAD_INFO(r3, r1);		\

	ld	r4,TI_LOCAL_FLAGS(r3);		\

	andi.	r0,r4,_TLF_RUNLATCH;		\

	beql	ppc64_runlatch_on_trampoline;	\
@@ -332,7 +332,7 @@ label##_common: \ 
#ifdef CONFIG_PPC_970_NAP

#define FINISH_NAP				\

BEGIN_FTR_SECTION				\

	clrrdi	r11,r1,THREAD_SHIFT;		\

	CURRENT_THREAD_INFO(r11, r1);		\

	ld	r9,TI_LOCAL_FLAGS(r11);		\

	andi.	r10,r9,_TLF_NAPPING;		\

	bnel	power4_fixup_nap;		\

arch/powerpc/include/asm/thread_info.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ 


#define THREAD_SIZE		(1 << THREAD_SHIFT)



#ifdef CONFIG_PPC64

#define CURRENT_THREAD_INFO(dest, sp)	clrrdi dest, sp, THREAD_SHIFT

#else

#define CURRENT_THREAD_INFO(dest, sp)	rlwinm dest, sp, 0, 0, 31-THREAD_SHIFT

#endif



#ifndef __ASSEMBLY__

#include <linux/cache.h>

#include <asm/processor.h>

arch/powerpc/kernel/entry_32.S

+12 −12
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ crit_transfer_to_handler: 
	mfspr	r8,SPRN_SPRG_THREAD

	lwz	r0,KSP_LIMIT(r8)

	stw	r0,SAVED_KSP_LIMIT(r11)

	rlwimi	r0,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r0, r1)

	stw	r0,KSP_LIMIT(r8)

	/* fall through */

#endif
@@ -112,7 +112,7 @@ crit_transfer_to_handler: 
	mfspr	r8,SPRN_SPRG_THREAD

	lwz	r0,KSP_LIMIT(r8)

	stw	r0,saved_ksp_limit@l(0)

	rlwimi	r0,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r0, r1)

	stw	r0,KSP_LIMIT(r8)

	/* fall through */

#endif
@@ -158,7 +158,7 @@ transfer_to_handler: 
	tophys(r11,r11)

	addi	r11,r11,global_dbcr0@l

#ifdef CONFIG_SMP

	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r9, r1)

	lwz	r9,TI_CPU(r9)

	slwi	r9,r9,3

	add	r11,r11,r9
@@ -179,7 +179,7 @@ transfer_to_handler: 
	ble-	stack_ovf		/* then the kernel stack overflowed */

5:

#if defined(CONFIG_6xx) || defined(CONFIG_E500)

	rlwinm	r9,r1,0,0,31-THREAD_SHIFT

	CURRENT_THREAD_INFO(r9, r1)

	tophys(r9,r9)			/* check local flags */

	lwz	r12,TI_LOCAL_FLAGS(r9)

	mtcrf	0x01,r12
@@ -333,7 +333,7 @@ _GLOBAL(DoSyscall) 
	mtmsr	r11

1:

#endif /* CONFIG_TRACE_IRQFLAGS */

	rlwinm	r10,r1,0,0,(31-THREAD_SHIFT)	/* current_thread_info() */

	CURRENT_THREAD_INFO(r10, r1)

	lwz	r11,TI_FLAGS(r10)

	andi.	r11,r11,_TIF_SYSCALL_T_OR_A

	bne-	syscall_dotrace
@@ -354,7 +354,7 @@ ret_from_syscall: 
	bl	do_show_syscall_exit

#endif

	mr	r6,r3

	rlwinm	r12,r1,0,0,(31-THREAD_SHIFT)	/* current_thread_info() */

	CURRENT_THREAD_INFO(r12, r1)

	/* disable interrupts so current_thread_info()->flags can't change */

	LOAD_MSR_KERNEL(r10,MSR_KERNEL)	/* doesn't include MSR_EE */

	/* Note: We don't bother telling lockdep about it */
@@ -815,7 +815,7 @@ ret_from_except: 


user_exc_return:		/* r10 contains MSR_KERNEL here */

	/* Check current_thread_info()->flags */

	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r9, r1)

	lwz	r9,TI_FLAGS(r9)

	andi.	r0,r9,_TIF_USER_WORK_MASK

	bne	do_work
@@ -835,7 +835,7 @@ restore_user: 
/* N.B. the only way to get here is from the beq following ret_from_except. */

resume_kernel:

	/* check current_thread_info->preempt_count */

	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r9, r1)

	lwz	r0,TI_PREEMPT(r9)

	cmpwi	0,r0,0		/* if non-zero, just restore regs and return */

	bne	restore
@@ -852,7 +852,7 @@ resume_kernel: 
	bl	trace_hardirqs_off

#endif

1:	bl	preempt_schedule_irq

	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r9, r1)

	lwz	r3,TI_FLAGS(r9)

	andi.	r0,r3,_TIF_NEED_RESCHED

	bne-	1b
@@ -1122,7 +1122,7 @@ ret_from_debug_exc: 
	lwz	r10,SAVED_KSP_LIMIT(r1)

	stw	r10,KSP_LIMIT(r9)

	lwz	r9,THREAD_INFO-THREAD(r9)

	rlwinm	r10,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r10, r1)

	lwz	r10,TI_PREEMPT(r10)

	stw	r10,TI_PREEMPT(r9)

	RESTORE_xSRR(SRR0,SRR1);
@@ -1156,7 +1156,7 @@ load_dbcr0: 
	lis	r11,global_dbcr0@ha

	addi	r11,r11,global_dbcr0@l

#ifdef CONFIG_SMP

	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r9, r1)

	lwz	r9,TI_CPU(r9)

	slwi	r9,r9,3

	add	r11,r11,r9
@@ -1197,7 +1197,7 @@ recheck: 
	LOAD_MSR_KERNEL(r10,MSR_KERNEL)

	SYNC

	MTMSRD(r10)		/* disable interrupts */

	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)

	CURRENT_THREAD_INFO(r9, r1)

	lwz	r9,TI_FLAGS(r9)

	andi.	r0,r9,_TIF_NEED_RESCHED

	bne-	do_resched

arch/powerpc/kernel/entry_64.S

+6 −6
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR) 
	REST_2GPRS(7,r1)

	addi	r9,r1,STACK_FRAME_OVERHEAD

#endif

	clrrdi	r11,r1,THREAD_SHIFT

	CURRENT_THREAD_INFO(r11, r1)

	ld	r10,TI_FLAGS(r11)

	andi.	r11,r10,_TIF_SYSCALL_T_OR_A

	bne-	syscall_dotrace
@@ -181,7 +181,7 @@ syscall_exit: 
	bl	.do_show_syscall_exit

	ld	r3,RESULT(r1)

#endif

	clrrdi	r12,r1,THREAD_SHIFT

	CURRENT_THREAD_INFO(r12, r1)



	ld	r8,_MSR(r1)

#ifdef CONFIG_PPC_BOOK3S
@@ -260,7 +260,7 @@ syscall_dotrace: 
	ld	r7,GPR7(r1)

	ld	r8,GPR8(r1)

	addi	r9,r1,STACK_FRAME_OVERHEAD

	clrrdi	r10,r1,THREAD_SHIFT

	CURRENT_THREAD_INFO(r10, r1)

	ld	r10,TI_FLAGS(r10)

	b	.Lsyscall_dotrace_cont
@@ -500,7 +500,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT) 
2:

#endif /* !CONFIG_PPC_BOOK3S */



	clrrdi	r7,r8,THREAD_SHIFT	/* base of new stack */

	CURRENT_THREAD_INFO(r7, r8)  /* base of new stack */

	/* Note: this uses SWITCH_FRAME_SIZE rather than INT_FRAME_SIZE

	   because we don't need to leave the 288-byte ABI gap at the

	   top of the kernel stack. */
@@ -559,7 +559,7 @@ _GLOBAL(ret_from_except_lite) 
	mtmsrd	r10,1		  /* Update machine state */

#endif /* CONFIG_PPC_BOOK3E */



	clrrdi	r9,r1,THREAD_SHIFT	/* current_thread_info() */

	CURRENT_THREAD_INFO(r9, r1)

	ld	r3,_MSR(r1)

	ld	r4,TI_FLAGS(r9)

	andi.	r3,r3,MSR_PR
@@ -602,7 +602,7 @@ resume_kernel: 
1:	bl	.preempt_schedule_irq



	/* Re-test flags and eventually loop */

	clrrdi	r9,r1,THREAD_SHIFT

	CURRENT_THREAD_INFO(r9, r1)

	ld	r4,TI_FLAGS(r9)

	andi.	r0,r4,_TIF_NEED_RESCHED

	bne	1b

arch/powerpc/kernel/exceptions-64e.S

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ exc_##n##_bad_stack: \ 
 * interrupts happen before the wait instruction.

 */

#define CHECK_NAPPING()							\

	clrrdi	r11,r1,THREAD_SHIFT;					\

	CURRENT_THREAD_INFO(r11, r1);					\

	ld	r10,TI_LOCAL_FLAGS(r11);				\

	andi.	r9,r10,_TLF_NAPPING;					\

	beq+	1f;							\