From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>,
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>,
Paul Mundt <lethal@linux-sh.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
hpa@zytor.com
Subject: Re: [PATCH 10/12] PCI: powerpc: use generic pci_swizzle_interrupt_pin()
Date: Sat, 13 Dec 2008 07:03:47 +1100 [thread overview]
Message-ID: <1229112227.22413.222.camel@pasglop> (raw)
In-Reply-To: <20081209231227.18153.14913.stgit@bob.kio>
On Tue, 2008-12-09 at 16:12 -0700, Bjorn Helgaas wrote:
> Use the generic pci_swizzle_interrupt_pin() instead of arch-specific code.
>
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> ---
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> arch/powerpc/kernel/prom_parse.c | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
> index a11d689..a377abe 100644
> --- a/arch/powerpc/kernel/prom_parse.c
> +++ b/arch/powerpc/kernel/prom_parse.c
> @@ -232,11 +232,6 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,
> }
> EXPORT_SYMBOL_GPL(of_pci_address_to_resource);
>
> -static u8 of_irq_pci_swizzle(u8 slot, u8 pin)
> -{
> - return (((pin - 1) + slot) % 4) + 1;
> -}
> -
> int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
> {
> struct device_node *dn, *ppnode;
> @@ -306,7 +301,7 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
> /* We can only get here if we hit a P2P bridge with no node,
> * let's do standard swizzling and try again
> */
> - lspec = of_irq_pci_swizzle(PCI_SLOT(pdev->devfn), lspec);
> + lspec = pci_swizzle_interrupt_pin(pdev, lspec);
> pdev = ppdev;
> }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arch" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2008-12-12 20:06 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 ` [PATCH 05/12] PCI: add pci_swizzle_interrupt_pin() Bjorn Helgaas
2008-12-09 23:12 ` 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 [this message]
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=1229112227.22413.222.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=bjorn.helgaas@hp.com \
--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