From: Michael Ellerman <michael@ellerman.id.au>
To: Paul Mackerras <paulus@samba.org>
Cc: linux-pci@atrey.karlin.mff.cuni.cz, linuxppc-dev@ozlabs.org
Subject: [PATCH 4/9] Enable MSI on Powerpc
Date: Wed, 13 Dec 2006 21:39:44 +1100 [thread overview]
Message-ID: <20061213103955.9295468021@ozlabs.org> (raw)
In-Reply-To: <1166006370.90082.476088563252.qpush@cradle>
Allow PCI_MSI to build on Powerpc.
We still need CONFIG_POWERPC.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/kernel/Makefile | 5 +++++
drivers/pci/Kconfig | 2 +-
drivers/pci/Makefile | 4 +++-
3 files changed, 9 insertions(+), 2 deletions(-)
Index: msi/arch/powerpc/kernel/Makefile
===================================================================
--- msi.orig/arch/powerpc/kernel/Makefile
+++ msi/arch/powerpc/kernel/Makefile
@@ -65,6 +65,11 @@ obj-$(CONFIG_MODULES) += $(module-y)
pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o
pci32-$(CONFIG_PPC32) := pci_32.o
obj-$(CONFIG_PCI) += $(pci64-y) $(pci32-y)
+
+msiobj-y := msi.o
+msiobj-$(CONFIG_PPC_RTAS) += msi-rtas.o
+obj-$(CONFIG_PCI_MSI) += $(msiobj-y)
+
kexec-$(CONFIG_PPC64) := machine_kexec_64.o
kexec-$(CONFIG_PPC32) := machine_kexec_32.o
obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o $(kexec-y)
Index: msi/drivers/pci/Kconfig
===================================================================
--- msi.orig/drivers/pci/Kconfig
+++ msi/drivers/pci/Kconfig
@@ -4,7 +4,7 @@
config PCI_MSI
bool "Message Signaled Interrupts (MSI and MSI-X)"
depends on PCI
- depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64
+ depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64 || PPC_MERGE
help
This allows device drivers to enable MSI (Message Signaled
Interrupts). Message Signaled Interrupts enable a device to
Index: msi/drivers/pci/Makefile
===================================================================
--- msi.orig/drivers/pci/Makefile
+++ msi/drivers/pci/Makefile
@@ -14,8 +14,10 @@ obj-$(CONFIG_HOTPLUG) += hotplug.o
# Build the PCI Hotplug drivers if we were asked to
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
-# Build the PCI MSI interrupt support
+# Build the PCI MSI interrupt support, but not for arch/powerpc
+ifndef CONFIG_PPC_MERGE
obj-$(CONFIG_PCI_MSI) += msi.o
+endif
# Build the Hypertransport interrupt support
obj-$(CONFIG_HT_IRQ) += htirq.o
next prev parent reply other threads:[~2006-12-13 10:39 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-13 10:39 [PATCH 0/9] Powerpc MSI Implementation (.. again) Michael Ellerman
2006-12-13 10:39 ` [PATCH 1/9] Add #defines for Hypertransport MSI fields Michael Ellerman
2006-12-13 10:39 ` [PATCH 2/9] Rip out the existing powerpc msi stubs Michael Ellerman
2006-12-13 10:39 ` [PATCH 3/9] Powerpc MSI implementation Michael Ellerman
2006-12-13 10:39 ` Michael Ellerman [this message]
2006-12-13 10:39 ` [PATCH 5/9] RTAS " Michael Ellerman
2006-12-13 10:40 ` [PATCH 6/9] MPIC MSI allocator Michael Ellerman
2006-12-13 18:23 ` Olof Johansson
2006-12-13 23:25 ` Benjamin Herrenschmidt
2006-12-14 0:09 ` Olof Johansson
2006-12-14 0:32 ` Benjamin Herrenschmidt
2006-12-14 0:59 ` Michael Ellerman
2006-12-14 1:02 ` Benjamin Herrenschmidt
2006-12-14 1:06 ` Michael Ellerman
2006-12-14 14:46 ` Segher Boessenkool
2006-12-14 19:44 ` Benjamin Herrenschmidt
2006-12-15 1:47 ` Segher Boessenkool
2006-12-15 1:51 ` Michael Ellerman
2006-12-15 2:28 ` Benjamin Herrenschmidt
2006-12-15 2:58 ` Segher Boessenkool
2006-12-15 6:42 ` Olof Johansson
2006-12-14 1:06 ` Olof Johansson
2006-12-14 0:34 ` Michael Ellerman
2006-12-13 10:40 ` [PATCH 7/9] MPIC MSI backend Michael Ellerman
2006-12-13 10:40 ` [PATCH 9/9] Enable MSI mappings for MPIC Michael Ellerman
2006-12-13 10:40 ` [PATCH 8/9] Activate MSI on Powerpc Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061213103955.9295468021@ozlabs.org \
--to=michael@ellerman.id.au \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).