diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-10 08:03:41 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-10 08:03:41 -0400 |
commit | 69a80d3f69d0b2d7fae5a73c6e034d402d434d8a (patch) | |
tree | dd66f34510eae791a04c8dd77ce77a223b2f46d6 /arch | |
parent | ab1f9dac6eea25ee59e4c8e1cf0b7476afbbfe07 (diff) |
powerpc: move pSeries files to arch/powerpc/platforms/pseries
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/hvCall.S (renamed from arch/ppc64/kernel/pSeries_hvCall.S) | 0 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c (renamed from arch/ppc64/kernel/pSeries_iommu.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/lpar.c (renamed from arch/ppc64/kernel/pSeries_lpar.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/nvram.c (renamed from arch/ppc64/kernel/pSeries_nvram.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/pci.c (renamed from arch/ppc64/kernel/pSeries_pci.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/reconfig.c (renamed from arch/ppc64/kernel/pSeries_reconfig.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c (renamed from arch/ppc64/kernel/pSeries_setup.c) | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/smp.c (renamed from arch/ppc64/kernel/pSeries_smp.c) | 48 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/vio.c (renamed from arch/ppc64/kernel/pSeries_vio.c) | 0 | ||||
-rw-r--r-- | arch/ppc64/kernel/Makefile | 4 |
12 files changed, 10 insertions, 53 deletions
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile index 7637ff3642c3..181ae612b2d3 100644 --- a/arch/powerpc/platforms/Makefile +++ b/arch/powerpc/platforms/Makefile | |||
@@ -4,4 +4,5 @@ endif | |||
4 | obj-$(CONFIG_4xx) += 4xx/ | 4 | obj-$(CONFIG_4xx) += 4xx/ |
5 | obj-$(CONFIG_83xx) += 83xx/ | 5 | obj-$(CONFIG_83xx) += 83xx/ |
6 | obj-$(CONFIG_85xx) += 85xx/ | 6 | obj-$(CONFIG_85xx) += 85xx/ |
7 | obj-$(CONFIG_PPC_PSERIES) += pseries/ | ||
7 | obj-$(CONFIG_PPC_ISERIES) += iseries/ | 8 | obj-$(CONFIG_PPC_ISERIES) += iseries/ |
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile new file mode 100644 index 000000000000..9ebb34180a10 --- /dev/null +++ b/arch/powerpc/platforms/pseries/Makefile | |||
@@ -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 | ||
diff --git a/arch/ppc64/kernel/pSeries_hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S index 176e8da76466..176e8da76466 100644 --- a/arch/ppc64/kernel/pSeries_hvCall.S +++ b/arch/powerpc/platforms/pseries/hvCall.S | |||
diff --git a/arch/ppc64/kernel/pSeries_iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 9e90d41131d8..9e90d41131d8 100644 --- a/arch/ppc64/kernel/pSeries_iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
diff --git a/arch/ppc64/kernel/pSeries_lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 268d8362dde7..268d8362dde7 100644 --- a/arch/ppc64/kernel/pSeries_lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c | |||
diff --git a/arch/ppc64/kernel/pSeries_nvram.c b/arch/powerpc/platforms/pseries/nvram.c index 18abfb1f4e24..18abfb1f4e24 100644 --- a/arch/ppc64/kernel/pSeries_nvram.c +++ b/arch/powerpc/platforms/pseries/nvram.c | |||
diff --git a/arch/ppc64/kernel/pSeries_pci.c b/arch/powerpc/platforms/pseries/pci.c index 2dd477eb1c53..2dd477eb1c53 100644 --- a/arch/ppc64/kernel/pSeries_pci.c +++ b/arch/powerpc/platforms/pseries/pci.c | |||
diff --git a/arch/ppc64/kernel/pSeries_reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index 58c61219d08e..58c61219d08e 100644 --- a/arch/ppc64/kernel/pSeries_reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c | |||
diff --git a/arch/ppc64/kernel/pSeries_setup.c b/arch/powerpc/platforms/pseries/setup.c index 5a9fe96f9f67..eb25ee2eead8 100644 --- a/arch/ppc64/kernel/pSeries_setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -64,8 +64,8 @@ | |||
64 | #include <asm/pmc.h> | 64 | #include <asm/pmc.h> |
65 | #include <asm/mpic.h> | 65 | #include <asm/mpic.h> |
66 | #include <asm/ppc-pci.h> | 66 | #include <asm/ppc-pci.h> |
67 | 67 | #include <asm/i8259.h> | |
68 | #include "i8259.h" | 68 | #include <asm/udbg.h> |
69 | 69 | ||
70 | #ifdef DEBUG | 70 | #ifdef DEBUG |
71 | #define DBG(fmt...) udbg_printf(fmt) | 71 | #define DBG(fmt...) udbg_printf(fmt) |
@@ -124,7 +124,7 @@ static int pSeries_irq_cascade(struct pt_regs *regs, void *data) | |||
124 | if (chrp_int_ack_special) | 124 | if (chrp_int_ack_special) |
125 | return readb(chrp_int_ack_special); | 125 | return readb(chrp_int_ack_special); |
126 | else | 126 | else |
127 | return i8259_irq(smp_processor_id()); | 127 | return i8259_irq(regs); |
128 | } | 128 | } |
129 | 129 | ||
130 | static void __init pSeries_init_mpic(void) | 130 | static void __init pSeries_init_mpic(void) |
diff --git a/arch/ppc64/kernel/pSeries_smp.c b/arch/powerpc/platforms/pseries/smp.c index 5d1ed850f47b..ae1bd270f308 100644 --- a/arch/ppc64/kernel/pSeries_smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * SMP support for pSeries and BPA machines. | 2 | * SMP support for pSeries machines. |
3 | * | 3 | * |
4 | * Dave Engebretsen, Peter Bergner, and | 4 | * Dave Engebretsen, Peter Bergner, and |
5 | * Mike Corrigan {engebret|bergner|mikec}@us.ibm.com | 5 | * Mike Corrigan {engebret|bergner|mikec}@us.ibm.com |
@@ -48,8 +48,6 @@ | |||
48 | #include <asm/pSeries_reconfig.h> | 48 | #include <asm/pSeries_reconfig.h> |
49 | #include <asm/mpic.h> | 49 | #include <asm/mpic.h> |
50 | 50 | ||
51 | #include "bpa_iic.h" | ||
52 | |||
53 | #ifdef DEBUG | 51 | #ifdef DEBUG |
54 | #define DBG(fmt...) udbg_printf(fmt) | 52 | #define DBG(fmt...) udbg_printf(fmt) |
55 | #else | 53 | #else |
@@ -343,36 +341,6 @@ static void __devinit smp_xics_setup_cpu(int cpu) | |||
343 | 341 | ||
344 | } | 342 | } |
345 | #endif /* CONFIG_XICS */ | 343 | #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 */ | ||
376 | 344 | ||
377 | static DEFINE_SPINLOCK(timebase_lock); | 345 | static DEFINE_SPINLOCK(timebase_lock); |
378 | static unsigned long timebase = 0; | 346 | static unsigned long timebase = 0; |
@@ -444,15 +412,6 @@ static struct smp_ops_t pSeries_xics_smp_ops = { | |||
444 | .cpu_bootable = smp_pSeries_cpu_bootable, | 412 | .cpu_bootable = smp_pSeries_cpu_bootable, |
445 | }; | 413 | }; |
446 | #endif | 414 | #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 | ||
456 | 415 | ||
457 | /* This is called very early */ | 416 | /* This is called very early */ |
458 | void __init smp_init_pSeries(void) | 417 | void __init smp_init_pSeries(void) |
@@ -472,11 +431,6 @@ void __init smp_init_pSeries(void) | |||
472 | smp_ops = &pSeries_xics_smp_ops; | 431 | smp_ops = &pSeries_xics_smp_ops; |
473 | break; | 432 | break; |
474 | #endif | 433 | #endif |
475 | #ifdef CONFIG_BPA_IIC | ||
476 | case IC_BPA_IIC: | ||
477 | smp_ops = &bpa_iic_smp_ops; | ||
478 | break; | ||
479 | #endif | ||
480 | default: | 434 | default: |
481 | panic("Invalid interrupt controller"); | 435 | panic("Invalid interrupt controller"); |
482 | } | 436 | } |
diff --git a/arch/ppc64/kernel/pSeries_vio.c b/arch/powerpc/platforms/pseries/vio.c index 866379b80c09..866379b80c09 100644 --- a/arch/ppc64/kernel/pSeries_vio.c +++ b/arch/powerpc/platforms/pseries/vio.c | |||
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index 32fd3f1c7935..6a0fea272386 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -24,9 +24,7 @@ obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y) | |||
24 | 24 | ||
25 | obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o | 25 | obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o |
26 | 26 | ||
27 | obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \ | 27 | obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o |
28 | pSeries_nvram.o rtasd.o ras.o pSeries_reconfig.o \ | ||
29 | pSeries_setup.o pSeries_iommu.o udbg_16550.o | ||
30 | 28 | ||
31 | obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \ | 29 | obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \ |
32 | bpa_iic.o spider-pic.o | 30 | bpa_iic.o spider-pic.o |