powerpc: move pSeries files to arch/powerpc/platforms/pseries
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
ab1f9dac6e
commit
69a80d3f69
|
@ -4,4 +4,5 @@ endif
|
|||
obj-$(CONFIG_4xx) += 4xx/
|
||||
obj-$(CONFIG_83xx) += 83xx/
|
||||
obj-$(CONFIG_85xx) += 85xx/
|
||||
obj-$(CONFIG_PPC_PSERIES) += pseries/
|
||||
obj-$(CONFIG_PPC_ISERIES) += iseries/
|
||||
|
|
4
arch/powerpc/platforms/pseries/Makefile
Normal file
4
arch/powerpc/platforms/pseries/Makefile
Normal file
|
@ -0,0 +1,4 @@
|
|||
obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \
|
||||
setup.o iommu.o
|
||||
obj-$(CONFIG_SMP) += smp.o
|
||||
obj-$(CONFIG_IBMVIO) += vio.o
|
|
@ -64,8 +64,8 @@
|
|||
#include <asm/pmc.h>
|
||||
#include <asm/mpic.h>
|
||||
#include <asm/ppc-pci.h>
|
||||
|
||||
#include "i8259.h"
|
||||
#include <asm/i8259.h>
|
||||
#include <asm/udbg.h>
|
||||
|
||||
#ifdef DEBUG
|
||||
#define DBG(fmt...) udbg_printf(fmt)
|
||||
|
@ -124,7 +124,7 @@ static int pSeries_irq_cascade(struct pt_regs *regs, void *data)
|
|||
if (chrp_int_ack_special)
|
||||
return readb(chrp_int_ack_special);
|
||||
else
|
||||
return i8259_irq(smp_processor_id());
|
||||
return i8259_irq(regs);
|
||||
}
|
||||
|
||||
static void __init pSeries_init_mpic(void)
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SMP support for pSeries and BPA machines.
|
||||
* SMP support for pSeries machines.
|
||||
*
|
||||
* Dave Engebretsen, Peter Bergner, and
|
||||
* Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
|
||||
|
@ -48,8 +48,6 @@
|
|||
#include <asm/pSeries_reconfig.h>
|
||||
#include <asm/mpic.h>
|
||||
|
||||
#include "bpa_iic.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
#define DBG(fmt...) udbg_printf(fmt)
|
||||
#else
|
||||
|
@ -343,36 +341,6 @@ static void __devinit smp_xics_setup_cpu(int cpu)
|
|||
|
||||
}
|
||||
#endif /* CONFIG_XICS */
|
||||
#ifdef CONFIG_BPA_IIC
|
||||
static void smp_iic_message_pass(int target, int msg)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
if (target < NR_CPUS) {
|
||||
iic_cause_IPI(target, msg);
|
||||
} else {
|
||||
for_each_online_cpu(i) {
|
||||
if (target == MSG_ALL_BUT_SELF
|
||||
&& i == smp_processor_id())
|
||||
continue;
|
||||
iic_cause_IPI(i, msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int __init smp_iic_probe(void)
|
||||
{
|
||||
iic_request_IPIs();
|
||||
|
||||
return cpus_weight(cpu_possible_map);
|
||||
}
|
||||
|
||||
static void __devinit smp_iic_setup_cpu(int cpu)
|
||||
{
|
||||
if (cpu != boot_cpuid)
|
||||
iic_setup_cpu();
|
||||
}
|
||||
#endif /* CONFIG_BPA_IIC */
|
||||
|
||||
static DEFINE_SPINLOCK(timebase_lock);
|
||||
static unsigned long timebase = 0;
|
||||
|
@ -444,15 +412,6 @@ static struct smp_ops_t pSeries_xics_smp_ops = {
|
|||
.cpu_bootable = smp_pSeries_cpu_bootable,
|
||||
};
|
||||
#endif
|
||||
#ifdef CONFIG_BPA_IIC
|
||||
static struct smp_ops_t bpa_iic_smp_ops = {
|
||||
.message_pass = smp_iic_message_pass,
|
||||
.probe = smp_iic_probe,
|
||||
.kick_cpu = smp_pSeries_kick_cpu,
|
||||
.setup_cpu = smp_iic_setup_cpu,
|
||||
.cpu_bootable = smp_pSeries_cpu_bootable,
|
||||
};
|
||||
#endif
|
||||
|
||||
/* This is called very early */
|
||||
void __init smp_init_pSeries(void)
|
||||
|
@ -471,11 +430,6 @@ void __init smp_init_pSeries(void)
|
|||
case IC_PPC_XIC:
|
||||
smp_ops = &pSeries_xics_smp_ops;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_BPA_IIC
|
||||
case IC_BPA_IIC:
|
||||
smp_ops = &bpa_iic_smp_ops;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
panic("Invalid interrupt controller");
|
|
@ -24,9 +24,7 @@ obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)
|
|||
|
||||
obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o
|
||||
|
||||
obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \
|
||||
pSeries_nvram.o rtasd.o ras.o pSeries_reconfig.o \
|
||||
pSeries_setup.o pSeries_iommu.o udbg_16550.o
|
||||
obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o
|
||||
|
||||
obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \
|
||||
bpa_iic.o spider-pic.o
|
||||
|
|
Loading…
Reference in a new issue