From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: linux-pci@vger.kernel.org, linux-arch@vger.kernel.org,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Russell King <rmk@arm.linux.org.uk>,
Ralf Baechle <ralf@linux-mips.org>,
Kyle McMartin <kyle@parisc-linux.org>,
Matthew Wilcox <matthew@wil.cx>,
Grant Grundler <grundler@parisc-linux.org>,
Paul Mackerras <paulus@samba.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mundt <lethal@linux-sh.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
hpa@zytor.com
Subject: [PATCH 05/12] PCI: add pci_swizzle_interrupt_pin()
Date: Tue, 09 Dec 2008 16:12:02 -0700 [thread overview]
Message-ID: <20081209231202.18153.60227.stgit@bob.kio> (raw)
In-Reply-To: <20081209231037.18153.86962.stgit@bob.kio>
This patch adds pci_swizzle_interrupt_pin(), which implements the
INTx swizzling algorithm specified in Table 9-1 of the "PCI-to-PCI
Bridge Architecture Specification," revision 1.2.
There are many architecture-specific implementations of this
swizzle that can be replaced by this common one.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
drivers/pci/pci.c | 8 +++++++-
include/linux/pci.h | 1 +
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 46f6821..5a882cc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1337,6 +1337,12 @@ void pci_enable_ari(struct pci_dev *dev)
bridge->ari_enabled = 1;
}
+u8 pci_swizzle_interrupt_pin(struct pci_dev *dev, u8 pin)
+{
+ /* This implements Table 9-1 of the PCI-to-PCI bridge spec */
+ return (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1;
+}
+
int
pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge)
{
@@ -1347,7 +1353,7 @@ pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge)
return -1;
while (dev->bus->self) {
- pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1;
+ pin = pci_swizzle_interrupt_pin(dev, pin);
dev = dev->bus->self;
}
*bridge = dev;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index feb4657..4be596f 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -527,6 +527,7 @@ int __must_check pci_bus_add_device(struct pci_dev *dev);
void pci_read_bridge_bases(struct pci_bus *child);
struct resource *pci_find_parent_resource(const struct pci_dev *dev,
struct resource *res);
+u8 pci_swizzle_interrupt_pin(struct pci_dev *dev, u8 pin);
int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge);
extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
extern void pci_dev_put(struct pci_dev *dev);
next prev parent reply other threads:[~2008-12-09 23:12 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-09 23:11 [PATCH 00/12] PCI: unify P2P bridge INTx swizzling Bjorn Helgaas
2008-12-09 23:11 ` [PATCH 01/12] PCI Hotplug: cpqphp: use config space PCI interrupt pin encoding Bjorn Helgaas
2008-12-09 23:11 ` Bjorn Helgaas
2008-12-09 23:11 ` [PATCH 02/12] PCI: use config space encoding in pci_get_interrupt_pin() Bjorn Helgaas
2008-12-09 23:11 ` Bjorn Helgaas
2008-12-09 23:11 ` [PATCH 03/12] x86/PCI: use config space encoding for interrupt pins Bjorn Helgaas
2008-12-09 23:11 ` [PATCH 04/12] x86/PCI: minor logic simplications Bjorn Helgaas
2008-12-09 23:11 ` Bjorn Helgaas
2008-12-09 23:12 ` Bjorn Helgaas [this message]
2008-12-09 23:12 ` [PATCH 05/12] PCI: add pci_swizzle_interrupt_pin() Bjorn Helgaas
2008-12-11 15:00 ` David Howells
2008-12-11 16:48 ` Bjorn Helgaas
2008-12-11 16:48 ` Bjorn Helgaas
2008-12-11 17:34 ` David Howells
2008-12-11 18:03 ` Bjorn Helgaas
2008-12-11 18:14 ` David Howells
2008-12-11 18:14 ` David Howells
2008-12-11 18:24 ` Bjorn Helgaas
2008-12-09 23:12 ` [PATCH 06/12] PCI: alpha: use generic pci_swizzle_interrupt_pin() Bjorn Helgaas
2008-12-09 23:12 ` [PATCH 07/12] PCI: arm: " Bjorn Helgaas
2008-12-09 23:12 ` Bjorn Helgaas
2008-12-09 23:12 ` [PATCH 08/12] PCI: mips: " Bjorn Helgaas
2008-12-10 13:35 ` Ralf Baechle
2008-12-10 13:35 ` Ralf Baechle
2008-12-09 23:12 ` [PATCH 09/12] PCI: parisc: " Bjorn Helgaas
2008-12-09 23:12 ` Bjorn Helgaas
2008-12-09 23:26 ` Kyle McMartin
2008-12-09 23:26 ` Kyle McMartin
2008-12-09 23:12 ` [PATCH 10/12] PCI: powerpc: " Bjorn Helgaas
2008-12-12 20:03 ` Benjamin Herrenschmidt
2008-12-09 23:12 ` [PATCH 11/12] PCI: sh: " Bjorn Helgaas
2008-12-09 23:12 ` Bjorn Helgaas
2008-12-10 3:49 ` Paul Mundt
2008-12-09 23:12 ` [PATCH 12/12] PCI: x86: " Bjorn Helgaas
2008-12-16 20:20 ` [PATCH 00/12] PCI: unify P2P bridge INTx swizzling Jesse Barnes
2008-12-16 20:20 ` Jesse Barnes
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=20081209231202.18153.60227.stgit@bob.kio \
--to=bjorn.helgaas@hp.com \
--cc=benh@kernel.crashing.org \
--cc=grundler@parisc-linux.org \
--cc=hpa@zytor.com \
--cc=ink@jurassic.park.msu.ru \
--cc=jbarnes@virtuousgeek.org \
--cc=kyle@parisc-linux.org \
--cc=lethal@linux-sh.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=ralf@linux-mips.org \
--cc=rmk@arm.linux.org.uk \
--cc=tglx@linutronix.de \
/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