evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: zynq: Remove hotplug.c

Browse source 
The hotplug code contains only a single function, which is an SMP
function. Move that to platsmp.c where all other SMP runctions reside.
That allows removing hotplug.c and declaring the cpu_die function
static.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Soren Brinkmann 2014-09-02 14:19:13 -07:00 • committed by Michal Simek
parent 50c7960a45
commit caf86a73ea
4 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-zynq/Makefile
View file

@ -6,5 +6,4 @@
obj-y := common.o slcr.o pm.o obj-y := common.o slcr.o pm.o
CFLAGS_REMOVE_hotplug.o =-march=armv6k CFLAGS_REMOVE_hotplug.o =-march=armv6k
CFLAGS_hotplug.o =-Wa,-march=armv7-a -mcpu=cortex-a9 CFLAGS_hotplug.o =-Wa,-march=armv7-a -mcpu=cortex-a9
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_SMP) += headsmp.o platsmp.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o

3
arch/arm/mach-zynq/common.h
View file

@ -39,9 +39,6 @@ extern struct smp_operations zynq_smp_ops __initdata;
extern void __iomem *zynq_scu_base; extern void __iomem *zynq_scu_base;
/* Hotplug */
extern void zynq_platform_cpu_die(unsigned int cpu);
void zynq_pm_late_init(void); void zynq_pm_late_init(void);
static inline void zynq_core_pm_init(void) static inline void zynq_core_pm_init(void)

17
arch/arm/mach-zynq/hotplug.c
View file

@ -12,20 +12,3 @@
*/ */
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
/*
* platform-specific code to shutdown a CPU
*
* Called with IRQs disabled
*/
void zynq_platform_cpu_die(unsigned int cpu)
{
zynq_slcr_cpu_state_write(cpu, true);
/*
* there is no power-control hardware on this platform, so all
* we can do is put the core into WFI; this is safe as the calling
* code will have already disabled interrupts
*/
for (;;)
cpu_do_idle();
}

18
arch/arm/mach-zynq/platsmp.c
View file

@ -136,6 +136,24 @@ static int zynq_cpu_kill(unsigned cpu)
zynq_slcr_cpu_stop(cpu); zynq_slcr_cpu_stop(cpu);
return 1; return 1;
} }
/*
* platform-specific code to shutdown a CPU
*
* Called with IRQs disabled
*/
static void zynq_platform_cpu_die(unsigned int cpu)
{
zynq_slcr_cpu_state_write(cpu, true);
/*
* there is no power-control hardware on this platform, so all
* we can do is put the core into WFI; this is safe as the calling
* code will have already disabled interrupts
*/
for (;;)
cpu_do_idle();
}
#endif #endif
struct smp_operations zynq_smp_ops __initdata = { struct smp_operations zynq_smp_ops __initdata = {