On Mon, 2007-04-16 at 01:18 -0500, Olof Johansson wrote:
> Fixes for ethernet IRQ mapping, to move it to the driver instead of in
> the platform setup code.
>
>
> Signed-off-by: Olof Johansson <[EMAIL PROTECTED]>
>
> Index: powerpc/arch/powerpc/platforms/pasemi/pci.c
> ===================================================================
> --- powerpc.orig/arch/powerpc/platforms/pasemi/pci.c
> +++ powerpc/arch/powerpc/platforms/pasemi/pci.c
> @@ -163,19 +163,6 @@ static void __init pas_fixup_phb_resourc
> }
>
>
> -void __devinit pas_pci_irq_fixup(struct pci_dev *dev)
> -{
> - /* DMA is special, 84 interrupts (128 -> 211), all but 128
> - * need to be mapped by hand here.
> - */
> - if (dev->vendor == 0x1959 && dev->device == 0xa007) {
> - int i;
> - for (i = 129; i < 212; i++)
> - irq_create_mapping(NULL, i);
> - }
> -}
> -
> -
> void __init pas_pci_init(void)
> {
> struct device_node *np, *root;
> Index: powerpc/arch/powerpc/platforms/pasemi/setup.c
> ===================================================================
> --- powerpc.orig/arch/powerpc/platforms/pasemi/setup.c
> +++ powerpc/arch/powerpc/platforms/pasemi/setup.c
> @@ -240,5 +240,4 @@ define_machine(pas) {
> .check_legacy_ioport = pas_check_legacy_ioport,
> .progress = pas_progress,
> .machine_check_exception = pas_machine_check_handler,
> - .pci_irq_fixup = pas_pci_irq_fixup,
> };
> Index: powerpc/drivers/net/pasemi_mac.c
> ===================================================================
> --- powerpc.orig/drivers/net/pasemi_mac.c
> +++ powerpc/drivers/net/pasemi_mac.c
> @@ -537,6 +537,9 @@ static irqreturn_t pasemi_mac_tx_intr(in
> static int pasemi_mac_open(struct net_device *dev)
> {
> struct pasemi_mac *mac = netdev_priv(dev);
> + struct device_node *dma_dn = pci_device_to_OF_node(mac->dma_pdev);
> + const unsigned int *prop;
> + int base_irq;
> unsigned int flags;
> int ret;
>
> @@ -600,8 +603,24 @@ static int pasemi_mac_open(struct net_de
> netif_start_queue(dev);
> netif_poll_enable(dev);
>
> - ret = request_irq(mac->dma_pdev->irq + mac->dma_txch,
> - &pasemi_mac_tx_intr, IRQF_DISABLED,
> + /* Interrupts are a bit different for our DMA controller: While
> + * it's got one a regular PCI device header, the interrupt there
> + * is really the base of the range it's using. Each tx and rx
> + * channel has it's own interrupt source.
> + *
> + * The only way to get to the actual hardware interrupt is by
> + * getting it from the device tree, since the kernel has done
> + * virtual remapping of the sources by the time we can get them
> + * from the PCI device.
> + */
> +
> + prop = of_get_property(dma_dn, "interrupts", NULL);
> + base_irq = *prop;
The recently added virq_to_hw() makes it nice 'n easy to reverse map the
hw irq from the pci_dev:
base_irq = virq_to_hw(pdev->irq);
You should also probably check that irq_create_mapping() succeeds, just
to be pedantic.
cheers
--
Michael Ellerman
OzLabs, IBM Australia Development Lab
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
signature.asc
Description: This is a digitally signed message part
