Messages in this thread | | | Date | Wed, 19 Sep 2007 14:59:31 +0400 | From | Valentine Barshak <> | Subject | Re: [PATCH] pci: Fix e100 interrupt quirk |
| |
Jarek Poplawski wrote: > On 18-09-2007 13:17, Valentine Barshak wrote: >> PCI memory space may have a 64-bit offset on some architectures >> (for example, PowerPC 440) and the actual PCI memory address >> has to fixed up (an offset to PCI mem space shuld be added) >> before remapping. So, pci_iomap should be used instead of >> reading and remapping PCI BAR directly. This has been tested >> on Sequoia PowerPC 440EPx board. >> >> Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com> >> --- >> >> --- linux-2.6.orig/drivers/pci/quirks.c 2007-09-04 21:15:43.000000000 +0400 >> +++ linux-2.6.bld/drivers/pci/quirks.c 2007-09-05 20:46:14.000000000 +0400 >> @@ -1444,9 +1444,9 @@ >> static void __devinit quirk_e100_interrupt(struct pci_dev *dev) >> { >> u16 command; >> - u32 bar; >> u8 __iomem *csr; >> u8 cmd_hi; >> + int rc; >> >> switch (dev->device) { >> /* PCI IDs taken from drivers/net/e100.c */ >> @@ -1476,16 +1476,17 @@ >> * re-enable them when it's ready. >> */ >> pci_read_config_word(dev, PCI_COMMAND, &command); >> - pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar); >> >> - if (!(command & PCI_COMMAND_MEMORY) || !bar) >> + rc = pci_request_region(dev, 0, "e100_quirk"); >> + >> + if (!(command & PCI_COMMAND_MEMORY) || (rc < 0)) >> return; > > I didn't look at this too much, but isn't something like: > if (rc >= 0) > goto e100_quirk_exit; > needed before this return?
I'll split these 2 checks and submit new patch in a minute. Thanks.
> > Regards, > Jarek P.
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |