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

Commit 8001a975 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.13-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "All fixes for code that went in this cycle.

   - a revert of an optimisation to the syscall exit path, which could
     lead to an oops on either older machines or machines with > 1TB of
     memory

   - disable some deep idle states if the firmware configuration for
     them fails

   - re-enable HARD/SOFT lockup detectors in defconfigs after a Kconfig
     change

   - six fairly small patches fixing bugs in our new watchdog code

  Thanks to: Gautham R Shenoy, Nicholas Piggin"

* tag 'powerpc-4.13-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/watchdog: add locking around init/exit functions
  powerpc/watchdog: Fix marking of stuck CPUs
  powerpc/watchdog: Fix final-check recovered case
  powerpc/watchdog: Moderate touch_nmi_watchdog overhead
  powerpc/watchdog: Improve watchdog lock primitive
  powerpc: NMI IPI improve lock primitive
  powerpc/configs: Re-enable HARD/SOFT lockup detectors
  powerpc/powernv/idle: Disable LOSE_FULL_CONTEXT states when stop-api fails
  Revert "powerpc/64: Avoid restore_math call if possible in syscall exit"
parents b2dbdf2c 96ea91e7

arch/powerpc/configs/powernv_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_HARDLOCKUP_DETECTOR=y

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

arch/powerpc/configs/ppc64_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -324,7 +324,8 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_HARDLOCKUP_DETECTOR=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

arch/powerpc/configs/pseries_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_HARDLOCKUP_DETECTOR=y

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

arch/powerpc/kernel/entry_64.S

+18 −42
Original line number Diff line number Diff line
@@ -223,17 +223,27 @@ system_call_exit: 
	andi.	r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)

	bne-	.Lsyscall_exit_work



	/* If MSR_FP and MSR_VEC are set in user msr, then no need to restore */

	li	r7,MSR_FP

	andi.	r0,r8,MSR_FP

	beq 2f

#ifdef CONFIG_ALTIVEC

	oris	r7,r7,MSR_VEC@h

	andis.	r0,r8,MSR_VEC@h

	bne	3f

#endif

2:	addi    r3,r1,STACK_FRAME_OVERHEAD

#ifdef CONFIG_PPC_BOOK3S

	li	r10,MSR_RI

	mtmsrd	r10,1		/* Restore RI */

#endif

	and	r0,r8,r7

	cmpd	r0,r7

	bne	.Lsyscall_restore_math

.Lsyscall_restore_math_cont:

	bl	restore_math

#ifdef CONFIG_PPC_BOOK3S

	li	r11,0

	mtmsrd	r11,1

#endif

	ld	r8,_MSR(r1)

	ld	r3,RESULT(r1)

	li	r11,-MAX_ERRNO



	cmpld	r3,r11

3:	cmpld	r3,r11

	ld	r5,_CCR(r1)

	bge-	.Lsyscall_error

.Lsyscall_error_cont:
@@ -267,40 +277,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) 
	std	r5,_CCR(r1)

	b	.Lsyscall_error_cont



.Lsyscall_restore_math:

	/*

	 * Some initial tests from restore_math to avoid the heavyweight

	 * C code entry and MSR manipulations.

	 */

	LOAD_REG_IMMEDIATE(r0, MSR_TS_MASK)

	and.	r0,r0,r8

	bne	1f



	ld	r7,PACACURRENT(r13)

	lbz	r0,THREAD+THREAD_LOAD_FP(r7)

#ifdef CONFIG_ALTIVEC

	lbz	r6,THREAD+THREAD_LOAD_VEC(r7)

	add	r0,r0,r6

#endif

	cmpdi	r0,0

	beq	.Lsyscall_restore_math_cont



1:	addi    r3,r1,STACK_FRAME_OVERHEAD

#ifdef CONFIG_PPC_BOOK3S

	li	r10,MSR_RI

	mtmsrd	r10,1		/* Restore RI */

#endif

	bl	restore_math

#ifdef CONFIG_PPC_BOOK3S

	li	r11,0

	mtmsrd	r11,1

#endif

	/* Restore volatiles, reload MSR from updated one */

	ld	r8,_MSR(r1)

	ld	r3,RESULT(r1)

	li	r11,-MAX_ERRNO

	b	.Lsyscall_restore_math_cont



/* Traced system call support */

.Lsyscall_dotrace:

	bl	save_nvgprs

arch/powerpc/kernel/process.c

+0 −4
Original line number Diff line number Diff line
@@ -511,10 +511,6 @@ void restore_math(struct pt_regs *regs) 
{

	unsigned long msr;



	/*

	 * Syscall exit makes a similar initial check before branching

	 * to restore_math. Keep them in synch.

	 */

	if (!msr_tm_active(regs->msr) &&

		!current->thread.load_fp && !loadvec(current->thread))

		return;