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

Commit 5b8544c3 authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/ppc64e: Fix link problem when building ppc64e_defconfig 



arch/powerpc/platforms/built-in.o:(.toc1+0x18): undefined reference to `__early_start'

This is due to the 85xx/smp.c not handling the 64-bit side properly.  We
need to set the entry point for secondary cores on ppc64e to
generic_secondary_smp_init instead of __early_start that we due on ppc32.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 6b0cd00b

arch/powerpc/platforms/85xx/smp.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ smp_85xx_kick_cpu(int nr) 
	local_irq_save(flags);

	local_irq_save(flags);





	out_be32(bptr_vaddr + BOOT_ENTRY_PIR, nr);

	out_be32(bptr_vaddr + BOOT_ENTRY_PIR, nr);

#ifdef CONFIG_PPC32

	out_be32(bptr_vaddr + BOOT_ENTRY_ADDR_LOWER, __pa(__early_start));

	out_be32(bptr_vaddr + BOOT_ENTRY_ADDR_LOWER, __pa(__early_start));





	if (!ioremappable)

	if (!ioremappable)
@@ -88,6 +89,12 @@ smp_85xx_kick_cpu(int nr) 
	/* Wait a bit for the CPU to ack. */

	/* Wait a bit for the CPU to ack. */

	while ((__secondary_hold_acknowledge != nr) && (++n < 1000))

	while ((__secondary_hold_acknowledge != nr) && (++n < 1000))

		mdelay(1);

		mdelay(1);

#else

	out_be64((u64 *)(bptr_vaddr + BOOT_ENTRY_ADDR_UPPER),

		__pa((u64)*((unsigned long long *) generic_secondary_smp_init)));



	smp_generic_kick_cpu(nr);

#endif





	local_irq_restore(flags);

	local_irq_restore(flags);