forked from Minki/linux
6ae42bb22b
Build failed, when SMP is enabled and EMEV2 is not enabled. arch/arm/mach-shmobile/built-in.o: In function `shmobile_platform_cpu_kill': /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:62: undefined reference to `emev2_platform_cpu_kill' arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_get_core_count': /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:39: undefined reference to `emev2_get_core_count' arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_prepare_cpus': /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:53: undefined reference to `emev2_smp_prepare_cpus' arch/arm/mach-shmobile/built-in.o: In function `platform_secondary_init': /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:78: undefined reference to `emev2_secondary_init' arch/arm/mach-shmobile/built-in.o: In function `boot_secondary': /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:90: undefined reference to `emev2_boot_secondary This is the cause by when EMEV2 is disabled, that the check by OF of EMEV2 is performed in platsmp.c. This patch revise what the function about EMEV2 may not be used in this file, when EMEV2 is not enabled. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Acked-by: Simon Horman <horms@verge.net.au> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
121 lines
2.4 KiB
C
121 lines
2.4 KiB
C
/*
|
|
* SMP support for R-Mobile / SH-Mobile
|
|
*
|
|
* Copyright (C) 2010 Magnus Damm
|
|
* Copyright (C) 2011 Paul Mundt
|
|
*
|
|
* Based on vexpress, Copyright (C) 2002 ARM Ltd, All Rights Reserved
|
|
*
|
|
* 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.
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/device.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of.h>
|
|
#include <asm/hardware/gic.h>
|
|
#include <asm/mach-types.h>
|
|
#include <mach/common.h>
|
|
#include <mach/emev2.h>
|
|
|
|
#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \
|
|
of_machine_is_compatible("renesas,sh73a0"))
|
|
#define is_r8a7779() machine_is_marzen()
|
|
|
|
#ifdef CONFIG_ARCH_EMEV2
|
|
#define is_emev2() of_machine_is_compatible("renesas,emev2")
|
|
#else
|
|
#define is_emev2() (0)
|
|
#endif
|
|
|
|
static unsigned int __init shmobile_smp_get_core_count(void)
|
|
{
|
|
if (is_sh73a0())
|
|
return sh73a0_get_core_count();
|
|
|
|
if (is_r8a7779())
|
|
return r8a7779_get_core_count();
|
|
|
|
if (is_emev2())
|
|
return emev2_get_core_count();
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void __init shmobile_smp_prepare_cpus(void)
|
|
{
|
|
if (is_sh73a0())
|
|
sh73a0_smp_prepare_cpus();
|
|
|
|
if (is_r8a7779())
|
|
r8a7779_smp_prepare_cpus();
|
|
|
|
if (is_emev2())
|
|
emev2_smp_prepare_cpus();
|
|
}
|
|
|
|
int shmobile_platform_cpu_kill(unsigned int cpu)
|
|
{
|
|
if (is_r8a7779())
|
|
return r8a7779_platform_cpu_kill(cpu);
|
|
|
|
if (is_emev2())
|
|
return emev2_platform_cpu_kill(cpu);
|
|
|
|
return 1;
|
|
}
|
|
|
|
void __cpuinit platform_secondary_init(unsigned int cpu)
|
|
{
|
|
trace_hardirqs_off();
|
|
|
|
if (is_sh73a0())
|
|
sh73a0_secondary_init(cpu);
|
|
|
|
if (is_r8a7779())
|
|
r8a7779_secondary_init(cpu);
|
|
|
|
if (is_emev2())
|
|
emev2_secondary_init(cpu);
|
|
}
|
|
|
|
int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
if (is_sh73a0())
|
|
return sh73a0_boot_secondary(cpu);
|
|
|
|
if (is_r8a7779())
|
|
return r8a7779_boot_secondary(cpu);
|
|
|
|
if (is_emev2())
|
|
return emev2_boot_secondary(cpu);
|
|
|
|
return -ENOSYS;
|
|
}
|
|
|
|
void __init smp_init_cpus(void)
|
|
{
|
|
unsigned int ncores = shmobile_smp_get_core_count();
|
|
unsigned int i;
|
|
|
|
if (ncores > nr_cpu_ids) {
|
|
pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",
|
|
ncores, nr_cpu_ids);
|
|
ncores = nr_cpu_ids;
|
|
}
|
|
|
|
for (i = 0; i < ncores; i++)
|
|
set_cpu_possible(i, true);
|
|
|
|
set_smp_cross_call(gic_raise_softirq);
|
|
}
|
|
|
|
void __init platform_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
shmobile_smp_prepare_cpus();
|
|
}
|