Commit 3131d970 authored by Linus Walleij's avatar Linus Walleij Committed by Arnd Bergmann
Browse files

ARM: ux500: resume the second core properly 



The pen hold/release scheme was copied over to Ux500 from the ARM
reference designs like most of these at the time. It is not needed
at all, and was mostly removed in commit c00def71
"ARM: ux500: simplify secondary CPU boot".

However on the suspend/resume path and hot plug/unplug of CPUs,
the .cpu_die() callback was still waiting for the pen to be
released which made it spin forever and the second core never come
back online after suspend/resume.

Fix this by simply replacing the strange custom .cpu_die() with
a oneline wfi() just like e.g. the qcom platform does. This fixes
the issue and makes the second core come up properly after
suspend/resume.

As a side effect, this rids us of the completely surplus local
setup.h and hotplug.c files, and we just compile this into platsmp.c
with everything else SMP.

Cc: stable@vger.kernel.org
Fixes: c00def71 ("ARM: ux500: simplify secondary CPU boot")
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent d4b80d9a

arch/arm/mach-ux500/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -5,7 +5,4 @@ 
obj-y				:= pm.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o

obj-$(CONFIG_SMP)		+= platsmp.o

obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
 


CFLAGS_hotplug.o		+= -march=armv7-a

arch/arm/mach-ux500/cpu-db8500.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#include <asm/mach/map.h>

#include <asm/mach/arch.h>



#include "setup.h"



#include "db8500-regs.h"



static int __init ux500_l2x0_unlock(void)

arch/arm/mach-ux500/hotplug.c

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Copyright (C) STMicroelectronics 2009

 * Copyright (C) ST-Ericsson SA 2010

 *

 * License Terms: GNU General Public License v2

 *	Based on ARM realview platform

 *

 * Author: Sundar Iyer <sundar.iyer@stericsson.com>

 *

 */

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/smp.h>



#include <asm/smp_plat.h>



#include "setup.h"



/*

 * platform-specific code to shutdown a CPU

 *

 * Called with IRQs disabled

 */

void ux500_cpu_die(unsigned int cpu)

{

	/* directly enter low power state, skipping secure registers */

	for (;;) {

		__asm__ __volatile__("dsb\n\t" "wfi\n\t"

				: : : "memory");

		if (pen_release == cpu_logical_map(cpu)) {

			/*

			 * OK, proper wakeup, we're done

			 */

			break;

		}

	}

}

arch/arm/mach-ux500/platsmp.c

+7 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include <asm/smp_plat.h>

#include <asm/smp_scu.h>



#include "setup.h"



#include "db8500-regs.h"



/* Magic triggers in backup RAM */
@@ -90,6 +88,13 @@ static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) 
	return 0;

}



#ifdef CONFIG_HOTPLUG_CPU

void ux500_cpu_die(unsigned int cpu)

{

	wfi();

}

#endif



static const struct smp_operations ux500_smp_ops __initconst = {

	.smp_prepare_cpus	= ux500_smp_prepare_cpus,

	.smp_boot_secondary	= ux500_boot_secondary,

arch/arm/mach-ux500/setup.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 ST-Ericsson.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * These symbols are needed for board-specific files to call their

 * own cpu-specific files

 */

#ifndef __ASM_ARCH_SETUP_H

#define __ASM_ARCH_SETUP_H



extern void ux500_cpu_die(unsigned int cpu);



#endif /*  __ASM_ARCH_SETUP_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE