diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2007-05-07 22:58:34 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:40:31 -0400 |
commit | df87ef5508b40fc655b6c4771be31741d8ec1596 (patch) | |
tree | df6062876a6abc11bdb5accf47f1d51f01a2ed11 /arch | |
parent | f728b5c3a599d0410a079f447f921a10be7d59d6 (diff) |
[POWERPC] PowerPC MSI infrastructure
This provides the architecture specific hooks to support MSI on
powerpc. We implement the newly added arch_setup_msi_irqs() and
arch_teardown_msi_irqs(), and then delegate to ppc_md routines.
Platforms that don't implement MSI will leave the ppc_md calls blank,
arch_msi_check_device() will detect this and return ENOSYS. Drivers
should detect this error and continue to use LSI.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/msi.c | 38 |
3 files changed, 40 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 67668fdb0292..abb13cfd2ef9 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -682,6 +682,7 @@ config PCI | |||
682 | && !PPC_85xx && !PPC_86xx | 682 | && !PPC_85xx && !PPC_86xx |
683 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS | 683 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS |
684 | default PCI_QSPAN if !4xx && !CPM2 && 8xx | 684 | default PCI_QSPAN if !4xx && !CPM2 && 8xx |
685 | select ARCH_SUPPORTS_MSI | ||
685 | help | 686 | help |
686 | Find out whether your system includes a PCI bus. PCI is the name of | 687 | Find out whether your system includes a PCI bus. PCI is the name of |
687 | a bus system, i.e. the way the CPU talks to the other stuff inside | 688 | a bus system, i.e. the way the CPU talks to the other stuff inside |
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 94c703a95013..3e779f07f21b 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -68,6 +68,7 @@ obj-$(CONFIG_MODULES) += $(module-y) | |||
68 | pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o | 68 | pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o |
69 | pci32-$(CONFIG_PPC32) := pci_32.o | 69 | pci32-$(CONFIG_PPC32) := pci_32.o |
70 | obj-$(CONFIG_PCI) += $(pci64-y) $(pci32-y) | 70 | obj-$(CONFIG_PCI) += $(pci64-y) $(pci32-y) |
71 | obj-$(CONFIG_PCI_MSI) += msi.o | ||
71 | kexec-$(CONFIG_PPC64) := machine_kexec_64.o | 72 | kexec-$(CONFIG_PPC64) := machine_kexec_64.o |
72 | kexec-$(CONFIG_PPC32) := machine_kexec_32.o | 73 | kexec-$(CONFIG_PPC32) := machine_kexec_32.o |
73 | obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o $(kexec-y) | 74 | obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o $(kexec-y) |
diff --git a/arch/powerpc/kernel/msi.c b/arch/powerpc/kernel/msi.c new file mode 100644 index 000000000000..c62d1012c013 --- /dev/null +++ b/arch/powerpc/kernel/msi.c | |||
@@ -0,0 +1,38 @@ | |||
1 | /* | ||
2 | * Copyright 2006-2007, Michael Ellerman, IBM Corporation. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * as published by the Free Software Foundation; either version | ||
7 | * 2 of the License, or (at your option) any later version. | ||
8 | */ | ||
9 | |||
10 | #include <linux/kernel.h> | ||
11 | #include <linux/msi.h> | ||
12 | |||
13 | #include <asm/machdep.h> | ||
14 | |||
15 | int arch_msi_check_device(struct pci_dev* dev, int nvec, int type) | ||
16 | { | ||
17 | if (!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs) { | ||
18 | pr_debug("msi: Platform doesn't provide MSI callbacks.\n"); | ||
19 | return -ENOSYS; | ||
20 | } | ||
21 | |||
22 | if (ppc_md.msi_check_device) { | ||
23 | pr_debug("msi: Using platform check routine.\n"); | ||
24 | return ppc_md.msi_check_device(dev, nvec, type); | ||
25 | } | ||
26 | |||
27 | return 0; | ||
28 | } | ||
29 | |||
30 | int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | ||
31 | { | ||
32 | return ppc_md.setup_msi_irqs(dev, nvec, type); | ||
33 | } | ||
34 | |||
35 | void arch_teardown_msi_irqs(struct pci_dev *dev) | ||
36 | { | ||
37 | return ppc_md.teardown_msi_irqs(dev); | ||
38 | } | ||