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

Commit ccd00d10 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 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  kdump: Allow shrinking of kdump region to be overridden
  powerpc/pmac/smp: Remove no-longer needed preempt workaround
  powerpc/smp: Increase vdso_data->processorCount, not just decrease it
  powerpc/smp: Create idle threads on demand and properly reset them
  powerpc/smp: Don't expose per-cpu "cpu_state" array
  powerpc/pmac/smp: Fix CPU hotplug crashes on some machines
  powerpc/smp: Add a smp_ops->bringup_up() done callback
  powerpc/pmac: Rename cpu_state in therm_pm72 to avoid collision
  powerpc/pmac/smp: Properly NAP offlined CPU on G5
  powerpc/pmac/smp: Remove HMT changes for PowerMac offline code
  powerpc/pmac/smp: Consolidate 32-bit and 64-bit PowerMac cpu_die in one file
  powerpc/pmac/smp: Fixup smp_core99_cpu_disable() and use it on 64-bit
  powerpc/pmac/smp: Rename fixup_irqs() to migrate_irqs() and use it on ppc32
  powerpc/pmac/smp: Fix 32-bit PowerMac cpu_die
  powerpc/smp: Remove unused smp_ops->cpu_enable()
  powerpc/smp: Remove unused generic_cpu_enable()
  powerpc/smp: Fix generic_mach_cpu_die()
  powerpc/smp: soft-replugged CPUs must go back to start_secondary
  powerpc: Make decrementer interrupt robust against offlined CPUs
parents afdef69c c0bb9e45

arch/powerpc/include/asm/machdep.h

+1 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ struct smp_ops_t { 
	int   (*probe)(void);

	void  (*kick_cpu)(int nr);

	void  (*setup_cpu)(int nr);

	void  (*bringup_done)(void);

	void  (*take_timebase)(void);

	void  (*give_timebase)(void);

	int   (*cpu_enable)(unsigned int nr);

	int   (*cpu_disable)(void);

	void  (*cpu_die)(unsigned int nr);

	int   (*cpu_bootable)(unsigned int nr);
@@ -267,7 +267,6 @@ struct machdep_calls { 


extern void e500_idle(void);

extern void power4_idle(void);

extern void power4_cpu_offline_powersave(void);

extern void ppc6xx_idle(void);

extern void book3e_idle(void);

arch/powerpc/include/asm/smp.h

+3 −2
Original line number Diff line number Diff line
@@ -36,15 +36,16 @@ extern void cpu_die(void); 


extern void smp_send_debugger_break(int cpu);

extern void smp_message_recv(int);

extern void start_secondary_resume(void);



DECLARE_PER_CPU(unsigned int, cpu_pvr);



#ifdef CONFIG_HOTPLUG_CPU

extern void fixup_irqs(const struct cpumask *map);

extern void migrate_irqs(void);

int generic_cpu_disable(void);

int generic_cpu_enable(unsigned int cpu);

void generic_cpu_die(unsigned int cpu);

void generic_mach_cpu_die(void);

void generic_set_cpu_dead(unsigned int cpu);

#endif



#ifdef CONFIG_PPC64

arch/powerpc/kernel/head_32.S

+9 −0
Original line number Diff line number Diff line
@@ -890,6 +890,15 @@ __secondary_start: 
	mtspr	SPRN_SRR1,r4

	SYNC

	RFI



_GLOBAL(start_secondary_resume)

	/* Reset stack */

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

	addi	r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD

	li	r3,0

	std	r3,0(r1)		/* Zero the stack frame pointer	*/

	bl	start_secondary

	b	.

#endif /* CONFIG_SMP */



#ifdef CONFIG_KVM_BOOK3S_HANDLER

arch/powerpc/kernel/head_64.S

+7 −0
Original line number Diff line number Diff line
@@ -536,6 +536,13 @@ _GLOBAL(pmac_secondary_start) 
	add	r13,r13,r4		/* for this processor.		*/

	mtspr	SPRN_SPRG_PACA,r13	/* Save vaddr of paca in an SPRG*/



	/* Mark interrupts soft and hard disabled (they might be enabled

	 * in the PACA when doing hotplug)

	 */

	li	r0,0

	stb	r0,PACASOFTIRQEN(r13)

	stb	r0,PACAHARDIRQEN(r13)



	/* Create a temp kernel stack for use before relocation is on.	*/

	ld	r1,PACAEMERGSP(r13)

	subi	r1,r1,STACK_FRAME_OVERHEAD

arch/powerpc/kernel/idle_power4.S

+0 −21
Original line number Diff line number Diff line
@@ -53,24 +53,3 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) 
	isync

	b	1b

_GLOBAL(power4_cpu_offline_powersave)

	/* Go to NAP now */

	mfmsr	r7

	rldicl	r0,r7,48,1

	rotldi	r0,r0,16

	mtmsrd	r0,1			/* hard-disable interrupts */

	li	r0,1

	li	r6,0

	stb	r0,PACAHARDIRQEN(r13)	/* we'll hard-enable shortly */

	stb	r6,PACASOFTIRQEN(r13)	/* soft-disable irqs */

BEGIN_FTR_SECTION

	DSSALL

	sync

END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)

	ori	r7,r7,MSR_EE

	oris	r7,r7,MSR_POW@h

	sync

	isync

	mtmsrd	r7

	isync

	blr