powerpc: Remove stubbed beat smp support
I have no idea if the beat hypervisor supports multiple cpus in a partition, but the code has not been touched since these stubs were added in February of 2007 except to move them in April of 2008. These are stubs: start_cpu always returns fail (which is dropped), the message passing and reciving are empty functions, and the top of file comment says "Incomplete". Signed-off-by: Milton Miller <miltonm@bga.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Родитель
a56555e573
Коммит
d4fc8fe1f6
|
@ -43,7 +43,6 @@ obj-y += celleb_setup.o \
|
||||||
beat_hvCall.o beat_interrupt.o \
|
beat_hvCall.o beat_interrupt.o \
|
||||||
beat_iommu.o
|
beat_iommu.o
|
||||||
|
|
||||||
obj-$(CONFIG_SMP) += beat_smp.o
|
|
||||||
obj-$(CONFIG_PPC_UDBG_BEAT) += beat_udbg.o
|
obj-$(CONFIG_PPC_UDBG_BEAT) += beat_udbg.o
|
||||||
obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o
|
obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o
|
||||||
obj-$(CONFIG_SPU_BASE) += beat_spu_priv1.o
|
obj-$(CONFIG_SPU_BASE) += beat_spu_priv1.o
|
||||||
|
|
|
@ -257,22 +257,6 @@ void __init beatic_init_IRQ(void)
|
||||||
irq_set_default_host(beatic_host);
|
irq_set_default_host(beatic_host);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
|
||||||
|
|
||||||
/* Nullified to compile with SMP mode */
|
|
||||||
void beatic_setup_cpu(int cpu)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void beatic_cause_IPI(int cpu, int mesg)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void beatic_request_IPIs(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_SMP */
|
|
||||||
|
|
||||||
void beatic_deinit_IRQ(void)
|
void beatic_deinit_IRQ(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
|
@ -24,9 +24,6 @@
|
||||||
|
|
||||||
extern void beatic_init_IRQ(void);
|
extern void beatic_init_IRQ(void);
|
||||||
extern unsigned int beatic_get_irq(void);
|
extern unsigned int beatic_get_irq(void);
|
||||||
extern void beatic_cause_IPI(int cpu, int mesg);
|
|
||||||
extern void beatic_request_IPIs(void);
|
|
||||||
extern void beatic_setup_cpu(int);
|
|
||||||
extern void beatic_deinit_IRQ(void);
|
extern void beatic_deinit_IRQ(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,107 +0,0 @@
|
||||||
/*
|
|
||||||
* SMP support for Celleb platform. (Incomplete)
|
|
||||||
*
|
|
||||||
* (C) Copyright 2006 TOSHIBA CORPORATION
|
|
||||||
*
|
|
||||||
* This code is based on arch/powerpc/platforms/cell/smp.c:
|
|
||||||
* Dave Engebretsen, Peter Bergner, and
|
|
||||||
* Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
|
|
||||||
* Plus various changes from other IBM teams...
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#undef DEBUG
|
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
|
||||||
#include <linux/smp.h>
|
|
||||||
#include <linux/interrupt.h>
|
|
||||||
#include <linux/init.h>
|
|
||||||
#include <linux/threads.h>
|
|
||||||
#include <linux/cpu.h>
|
|
||||||
|
|
||||||
#include <asm/irq.h>
|
|
||||||
#include <asm/smp.h>
|
|
||||||
#include <asm/machdep.h>
|
|
||||||
#include <asm/udbg.h>
|
|
||||||
|
|
||||||
#include "beat_interrupt.h"
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
#define DBG(fmt...) udbg_printf(fmt)
|
|
||||||
#else
|
|
||||||
#define DBG(fmt...)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The primary thread of each non-boot processor is recorded here before
|
|
||||||
* smp init.
|
|
||||||
*/
|
|
||||||
/* static cpumask_t of_spin_map; */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* smp_startup_cpu() - start the given cpu
|
|
||||||
*
|
|
||||||
* At boot time, there is nothing to do for primary threads which were
|
|
||||||
* started from Open Firmware. For anything else, call RTAS with the
|
|
||||||
* appropriate start location.
|
|
||||||
*
|
|
||||||
* Returns:
|
|
||||||
* 0 - failure
|
|
||||||
* 1 - success
|
|
||||||
*/
|
|
||||||
static inline int __devinit smp_startup_cpu(unsigned int lcpu)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init smp_beatic_probe(void)
|
|
||||||
{
|
|
||||||
return cpumask_weight(cpu_possible_mask);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __devinit smp_beatic_setup_cpu(int cpu)
|
|
||||||
{
|
|
||||||
beatic_setup_cpu(cpu);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __devinit smp_celleb_kick_cpu(int nr)
|
|
||||||
{
|
|
||||||
BUG_ON(nr < 0 || nr >= NR_CPUS);
|
|
||||||
|
|
||||||
return smp_startup_cpu(nr);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int smp_celleb_cpu_bootable(unsigned int nr)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
static struct smp_ops_t bpa_beatic_smp_ops = {
|
|
||||||
.message_pass = beatic_cause_IPI,
|
|
||||||
.probe = smp_beatic_probe,
|
|
||||||
.kick_cpu = smp_celleb_kick_cpu,
|
|
||||||
.setup_cpu = smp_beatic_setup_cpu,
|
|
||||||
.cpu_bootable = smp_celleb_cpu_bootable,
|
|
||||||
};
|
|
||||||
|
|
||||||
/* This is called very early */
|
|
||||||
void __init smp_init_celleb(void)
|
|
||||||
{
|
|
||||||
DBG(" -> smp_init_celleb()\n");
|
|
||||||
|
|
||||||
smp_ops = &bpa_beatic_smp_ops;
|
|
||||||
|
|
||||||
DBG(" <- smp_init_celleb()\n");
|
|
||||||
}
|
|
|
@ -128,10 +128,6 @@ static void __init celleb_setup_arch_beat(void)
|
||||||
spu_management_ops = &spu_management_of_ops;
|
spu_management_ops = &spu_management_of_ops;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
|
||||||
smp_init_celleb();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
celleb_setup_arch_common();
|
celleb_setup_arch_common();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче