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

Commit cb4f9a29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Benjamin Herrenschmidt:
 "Here are a few fixes for 3.6 that were piling up while I was away or
  busy (I was mostly MIA a week or two before San Diego).

  Some fixes from Anton fixing up issues with our relatively new DSCR
  control feature, and a few other fixes that are either regressions or
  bugs nasty enough to warrant not waiting."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Don't use __put_user() in patch_instruction
  powerpc: Make sure IPI handlers see data written by IPI senders
  powerpc: Restore correct DSCR in context switch
  powerpc: Fix DSCR inheritance in copy_thread()
  powerpc: Keep thread.dscr and thread.dscr_inherit in sync
  powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
  powerpc/powernv: Always go into nap mode when CPU is offline
  powerpc: Give hypervisor decrementer interrupts their own handler
  powerpc/vphn: Fix arch_update_cpu_topology() return value
parents 813e6438 636802ef

arch/powerpc/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ extern unsigned long cpuidle_disable; 
enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF};



extern int powersave_nap;	/* set if nap mode can be used in idle loop */

extern void power7_nap(void);



#ifdef CONFIG_PSERIES_IDLE

extern void update_smt_snooze_delay(int snooze);

arch/powerpc/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ int main(void) 
	DEFINE(SIGSEGV, SIGSEGV);

	DEFINE(NMI_MASK, NMI_MASK);

	DEFINE(THREAD_DSCR, offsetof(struct thread_struct, dscr));

	DEFINE(THREAD_DSCR_INHERIT, offsetof(struct thread_struct, dscr_inherit));

#else

	DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));

#endif /* CONFIG_PPC64 */

arch/powerpc/kernel/dbell.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ void doorbell_setup_this_cpu(void) 


void doorbell_cause_ipi(int cpu, unsigned long data)

{

	/* Order previous accesses vs. msgsnd, which is treated as a store */

	mb();

	ppc_msgsnd(PPC_DBELL, 0, data);

}

arch/powerpc/kernel/entry_64.S

+17 −6
Original line number Diff line number Diff line
@@ -370,6 +370,12 @@ _GLOBAL(ret_from_fork) 
	li	r3,0

	b	syscall_exit



	.section	".toc","aw"

DSCR_DEFAULT:

	.tc dscr_default[TC],dscr_default



	.section	".text"



/*

 * This routine switches between two different tasks.  The process

 * state of one is saved on its kernel stack.  Then the state
@@ -509,9 +515,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT) 
	mr	r1,r8		/* start using new stack pointer */

	std	r7,PACAKSAVE(r13)



	ld	r6,_CCR(r1)

	mtcrf	0xFF,r6



#ifdef CONFIG_ALTIVEC

BEGIN_FTR_SECTION

	ld	r0,THREAD_VRSAVE(r4)
@@ -520,14 +523,22 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) 
#endif /* CONFIG_ALTIVEC */

#ifdef CONFIG_PPC64

BEGIN_FTR_SECTION

	lwz	r6,THREAD_DSCR_INHERIT(r4)

	ld	r7,DSCR_DEFAULT@toc(2)

	ld	r0,THREAD_DSCR(r4)

	cmpd	r0,r25

	beq	1f

	cmpwi	r6,0

	bne	1f

	ld	r0,0(r7)

1:	cmpd	r0,r25

	beq	2f

	mtspr	SPRN_DSCR,r0

1:	

2:

END_FTR_SECTION_IFSET(CPU_FTR_DSCR)

#endif



	ld	r6,_CCR(r1)

	mtcrf	0xFF,r6



	/* r3-r13 are destroyed -- Cort */

	REST_8GPRS(14, r1)

	REST_10GPRS(22, r1)

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

+2 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ hardware_interrupt_hv: 
	KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x800)



	MASKABLE_EXCEPTION_PSERIES(0x900, 0x900, decrementer)

	MASKABLE_EXCEPTION_HV(0x980, 0x982, decrementer)

	STD_EXCEPTION_HV(0x980, 0x982, hdecrementer)



	STD_EXCEPTION_PSERIES(0xa00, 0xa00, trap_0a)

	KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xa00)
@@ -486,6 +486,7 @@ machine_check_common: 


	STD_EXCEPTION_COMMON_ASYNC(0x500, hardware_interrupt, do_IRQ)

	STD_EXCEPTION_COMMON_ASYNC(0x900, decrementer, .timer_interrupt)

	STD_EXCEPTION_COMMON(0x980, hdecrementer, .hdec_interrupt)

	STD_EXCEPTION_COMMON(0xa00, trap_0a, .unknown_exception)

	STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception)

	STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception)