Skip to content

Commit 69a80d3

Browse files
paulusmackpaulusmack
committed
powerpc: move pSeries files to arch/powerpc/platforms/pseries
Signed-off-by: Paul Mackerras <paulus@samba.org>
1 parent ab1f9da commit 69a80d3

File tree

12 files changed

+10
-53
lines changed

12 files changed

+10
-53
lines changed

‎arch/powerpc/platforms/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ endif
44
obj-$(CONFIG_4xx) += 4xx/
55
obj-$(CONFIG_83xx) += 83xx/
66
obj-$(CONFIG_85xx) += 85xx/
7+
obj-$(CONFIG_PPC_PSERIES) += pseries/
78
obj-$(CONFIG_PPC_ISERIES) += iseries/

‎arch/powerpc/platforms/pseries/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \
2+
setup.o iommu.o
3+
obj-$(CONFIG_SMP) += smp.o
4+
obj-$(CONFIG_IBMVIO) += vio.o

‎arch/ppc64/kernel/pSeries_hvCall.S renamed to ‎arch/powerpc/platforms/pseries/hvCall.S

File renamed without changes.

‎arch/ppc64/kernel/pSeries_iommu.c renamed to ‎arch/powerpc/platforms/pseries/iommu.c

File renamed without changes.

‎arch/ppc64/kernel/pSeries_lpar.c renamed to ‎arch/powerpc/platforms/pseries/lpar.c

File renamed without changes.

‎arch/ppc64/kernel/pSeries_nvram.c renamed to ‎arch/powerpc/platforms/pseries/nvram.c

File renamed without changes.

‎arch/ppc64/kernel/pSeries_pci.c renamed to ‎arch/powerpc/platforms/pseries/pci.c

File renamed without changes.

‎arch/ppc64/kernel/pSeries_reconfig.c renamed to ‎arch/powerpc/platforms/pseries/reconfig.c

File renamed without changes.

‎arch/ppc64/kernel/pSeries_setup.c renamed to ‎arch/powerpc/platforms/pseries/setup.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
#include <asm/pmc.h>
6565
#include <asm/mpic.h>
6666
#include <asm/ppc-pci.h>
67-
68-
#include "i8259.h"
67+
#include <asm/i8259.h>
68+
#include <asm/udbg.h>
6969

7070
#ifdef DEBUG
7171
#define DBG(fmt...) udbg_printf(fmt)
@@ -124,7 +124,7 @@ static int pSeries_irq_cascade(struct pt_regs *regs, void *data)
124124
if (chrp_int_ack_special)
125125
return readb(chrp_int_ack_special);
126126
else
127-
return i8259_irq(smp_processor_id());
127+
return i8259_irq(regs);
128128
}
129129

130130
static void __init pSeries_init_mpic(void)

‎arch/ppc64/kernel/pSeries_smp.c renamed to ‎arch/powerpc/platforms/pseries/smp.c

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SMP support for pSeries and BPA machines.
2+
* SMP support for pSeries machines.
33
*
44
* Dave Engebretsen, Peter Bergner, and
55
* Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
@@ -48,8 +48,6 @@
4848
#include <asm/pSeries_reconfig.h>
4949
#include <asm/mpic.h>
5050

51-
#include "bpa_iic.h"
52-
5351
#ifdef DEBUG
5452
#define DBG(fmt...) udbg_printf(fmt)
5553
#else
@@ -343,36 +341,6 @@ static void __devinit smp_xics_setup_cpu(int cpu)
343341

344342
}
345343
#endif /* CONFIG_XICS */
346-
#ifdef CONFIG_BPA_IIC
347-
static void smp_iic_message_pass(int target, int msg)
348-
{
349-
unsigned int i;
350-
351-
if (target < NR_CPUS) {
352-
iic_cause_IPI(target, msg);
353-
} else {
354-
for_each_online_cpu(i) {
355-
if (target == MSG_ALL_BUT_SELF
356-
&& i == smp_processor_id())
357-
continue;
358-
iic_cause_IPI(i, msg);
359-
}
360-
}
361-
}
362-
363-
static int __init smp_iic_probe(void)
364-
{
365-
iic_request_IPIs();
366-
367-
return cpus_weight(cpu_possible_map);
368-
}
369-
370-
static void __devinit smp_iic_setup_cpu(int cpu)
371-
{
372-
if (cpu != boot_cpuid)
373-
iic_setup_cpu();
374-
}
375-
#endif /* CONFIG_BPA_IIC */
376344

377345
static DEFINE_SPINLOCK(timebase_lock);
378346
static unsigned long timebase = 0;
@@ -444,15 +412,6 @@ static struct smp_ops_t pSeries_xics_smp_ops = {
444412
.cpu_bootable = smp_pSeries_cpu_bootable,
445413
};
446414
#endif
447-
#ifdef CONFIG_BPA_IIC
448-
static struct smp_ops_t bpa_iic_smp_ops = {
449-
.message_pass = smp_iic_message_pass,
450-
.probe = smp_iic_probe,
451-
.kick_cpu = smp_pSeries_kick_cpu,
452-
.setup_cpu = smp_iic_setup_cpu,
453-
.cpu_bootable = smp_pSeries_cpu_bootable,
454-
};
455-
#endif
456415

457416
/* This is called very early */
458417
void __init smp_init_pSeries(void)
@@ -471,11 +430,6 @@ void __init smp_init_pSeries(void)
471430
case IC_PPC_XIC:
472431
smp_ops = &pSeries_xics_smp_ops;
473432
break;
474-
#endif
475-
#ifdef CONFIG_BPA_IIC
476-
case IC_BPA_IIC:
477-
smp_ops = &bpa_iic_smp_ops;
478-
break;
479433
#endif
480434
default:
481435
panic("Invalid interrupt controller");

‎arch/ppc64/kernel/pSeries_vio.c renamed to ‎arch/powerpc/platforms/pseries/vio.c

File renamed without changes.

‎arch/ppc64/kernel/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)
2424

2525
obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o
2626

27-
obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \
28-
pSeries_nvram.o rtasd.o ras.o pSeries_reconfig.o \
29-
pSeries_setup.o pSeries_iommu.o udbg_16550.o
27+
obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o
3028

3129
obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \
3230
bpa_iic.o spider-pic.o

0 commit comments

Comments
 (0)