Re: small PCI probe patch for odd 64 bit BARs

From: Tim Hockin
Date: Thu Nov 11 2004 - 13:10:49 EST


On Wed, Nov 10, 2004 at 09:51:42PM -0800, Andrew Morton wrote:
> Tim Hockin <thockin@xxxxxxxxxx> wrote:
> >
> > + sz = pci_size(sz, 0xffffffff);
>
> pci_size() takes three arguments, so this patch appears to not have been
> runtime tested :(

Doh, I sent the 2.4 patch. This one should work on 2.6.9, though I do
not have 2.6.9 running on this hardware, yet. It was definitely runtime
tested on 2.4.


--- linux-2.6.9/drivers/pci/probe.c.orig 2004-11-10 20:42:03.000000000 -0800
+++ linux-2.6.9/drivers/pci/probe.c 2004-11-11 09:30:07.000000000 -0800
@@ -144,9 +144,11 @@
pci_write_config_dword(dev, reg+4, ~0);
pci_read_config_dword(dev, reg+4, &sz);
pci_write_config_dword(dev, reg+4, l);
- if (~sz)
- res->end = res->start + 0xffffffff +
- (((unsigned long) ~sz) << 32);
+ sz = pci_size(l, sz, 0xffffffff);
+ if (sz) {
+ /* This BAR needs > 4GB? Wow. */
+ res->end |= (unsigned long)sz<<32;
+ }
#else
if (l) {
printk(KERN_ERR "PCI: Unable to handle 64-bit address for device %s\n", pci_name(dev));
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/