From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: akpm@osdl.org, linux-kernel@vger.kernel.org, ak@muc.de
Subject: [PATCH] pci: x86-32/64 switch to pci_get API
Date: Mon, 16 Oct 2006 16:51:32 +0100 [thread overview]
Message-ID: <1161013892.24237.100.camel@localhost.localdomain> (raw)
Use pci_get_bus_and_slot to find the router (and lock it for the kernel
lifetime), also use pci_get_device_reverse() to walk the list finding
calgary IOMMUs
Signed-off-by: Alan Cox <alan@redhat.com>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/i386/pci/irq.c linux-2.6.19-rc1-mm1/arch/i386/pci/irq.c
--- linux.vanilla-2.6.19-rc1-mm1/arch/i386/pci/irq.c 2006-10-13 15:10:06.000000000 +0100
+++ linux-2.6.19-rc1-mm1/arch/i386/pci/irq.c 2006-10-13 17:14:40.000000000 +0100
@@ -758,7 +758,7 @@
DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
rt->rtr_vendor, rt->rtr_device);
- pirq_router_dev = pci_find_slot(rt->rtr_bus, rt->rtr_devfn);
+ pirq_router_dev = pci_get_bus_and_slot(rt->rtr_bus, rt->rtr_devfn);
if (!pirq_router_dev) {
DBG(KERN_DEBUG "PCI: Interrupt router not found at "
"%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
@@ -778,6 +778,8 @@
pirq_router_dev->vendor,
pirq_router_dev->device,
pci_name(pirq_router_dev));
+
+ /* The device remains referenced for the kernel lifetime */
}
static struct irq_info *pirq_get_info(struct pci_dev *dev)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/x86_64/kernel/pci-calgary.c linux-2.6.19-rc1-mm1/arch/x86_64/kernel/pci-calgary.c
--- linux.vanilla-2.6.19-rc1-mm1/arch/x86_64/kernel/pci-calgary.c 2006-10-13 15:10:06.000000000 +0100
+++ linux-2.6.19-rc1-mm1/arch/x86_64/kernel/pci-calgary.c 2006-10-13 17:14:40.000000000 +0100
@@ -879,7 +879,7 @@
error:
do {
- dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+ dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
PCI_DEVICE_ID_IBM_CALGARY,
dev);
if (!dev)
next reply other threads:[~2006-10-16 15:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-16 15:51 Alan Cox [this message]
2006-10-16 15:34 ` [PATCH] pci: x86-32/64 switch to pci_get API Muli Ben-Yehuda
2006-10-16 16:07 ` Andi Kleen
2006-10-16 16:45 ` Alan Cox
2006-10-16 16:24 ` Andi Kleen
2006-10-16 17:05 ` Alan Cox
2006-10-16 19:01 ` Andi Kleen
2006-10-16 20:52 ` Muli Ben-Yehuda
2006-10-16 21:18 ` Alan Cox
2006-10-16 17:23 ` Muli Ben-Yehuda
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=1161013892.24237.100.camel@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=ak@muc.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.