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 11/12] PCI: sh: use generic pci_swizzle_interrupt_pin()
Date: Tue, 09 Dec 2008 16:12:32 -0700 [thread overview]
Message-ID: <20081209231232.18153.20376.stgit@bob.kio> (raw)
In-Reply-To: <20081209231037.18153.86962.stgit@bob.kio>
Use the generic pci_swizzle_interrupt_pin() instead of arch-specific code.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
arch/sh/drivers/pci/ops-cayman.c | 9 ++-------
arch/sh/drivers/pci/pci.c | 7 +------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/arch/sh/drivers/pci/ops-cayman.c b/arch/sh/drivers/pci/ops-cayman.c
index 5ccf9ea..38ef762 100644
--- a/arch/sh/drivers/pci/ops-cayman.c
+++ b/arch/sh/drivers/pci/ops-cayman.c
@@ -5,11 +5,6 @@
#include <cpu/irq.h>
#include "pci-sh5.h"
-static inline u8 bridge_swizzle(u8 pin, u8 slot)
-{
- return (((pin - 1) + slot) % 4) + 1;
-}
-
int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
int result = -1;
@@ -42,7 +37,7 @@ int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
while (dev->bus->number > 0) {
slot = path[i].slot = PCI_SLOT(dev->devfn);
- pin = path[i].pin = bridge_swizzle(pin, slot);
+ pin = path[i].pin = pci_swizzle_interrupt_pin(dev, pin);
dev = dev->bus->self;
i++;
if (i > 3) panic("PCI path to root bus too long!\n");
@@ -56,7 +51,7 @@ int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
if ((slot < 3) || (i == 0)) {
/* Bus 0 (incl. PCI-PCI bridge itself) : perform the final
swizzle now. */
- result = IRQ_INTA + bridge_swizzle(pin, slot) - 1;
+ result = IRQ_INTA + pci_swizzle_interrupt_pin(dev, pin) - 1;
} else {
i--;
slot = path[i].slot;
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index d3839e6..aea3b6b 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -21,17 +21,12 @@
#include <linux/init.h>
#include <asm/io.h>
-static inline u8 bridge_swizzle(u8 pin, u8 slot)
-{
- return (((pin - 1) + slot) % 4) + 1;
-}
-
static u8 __init simple_swizzle(struct pci_dev *dev, u8 *pinp)
{
u8 pin = *pinp;
while (dev->bus->parent) {
- pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
+ pin = pci_swizzle_interrupt_pin(dev, pin);
/* Move up the chain of bridges. */
dev = dev->bus->self;
}
next prev parent reply other threads:[~2008-12-09 23:12 UTC|newest]
Thread overview: 24+ 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 ` [PATCH 02/12] PCI: use config space encoding in pci_get_interrupt_pin() 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: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 17:34 ` David Howells
2008-12-11 18:03 ` Bjorn Helgaas
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 ` [PATCH 08/12] PCI: mips: " Bjorn Helgaas
2008-12-10 13:35 ` Ralf Baechle
2008-12-09 23:12 ` [PATCH 09/12] PCI: parisc: " Bjorn Helgaas
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 ` Bjorn Helgaas [this message]
2008-12-10 3:49 ` [PATCH 11/12] PCI: sh: " 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
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=20081209231232.18153.20376.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 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.