From hpa@c2micro.com Fri Jun 9 11:28:41 2006 Message-ID: <4489BDCD.4000400@c2micro.com> Date: Fri, 09 Jun 2006 11:28:29 -0700 From: "H. Peter Anvin" To: Bjorn Helgaas Cc: Andrew Morton , Greg KH , mchan@broadcom.com Subject: PCI: fix to pci ignore pre-set 64-bit bars on 32-bit platforms From: Bjorn Helgaas When we detect a 64-bit pre-set address in a BAR on a 32-bit platform, we disable it and treat it as if it had been unset, thus allowing the general address assignment code to assign a new address to it when the device is enabled. This can happen either if the firmware assigns 64-bit addresses; additionally, some cards have been found "in the wild" which do not come out of reset with all the BAR registers set to zero. Unfortunately, the patch that implemented this tested the low part of the address instead of the high part of the address. This patch fixes that. Signed-off-by: Bjorn Helgaas Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman --- drivers/pci/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- gregkh-2.6.orig/drivers/pci/probe.c +++ gregkh-2.6/drivers/pci/probe.c @@ -199,7 +199,7 @@ static void pci_read_bases(struct pci_de printk(KERN_ERR "PCI: Unable to handle 64-bit BAR for device %s\n", pci_name(dev)); res->start = 0; res->flags = 0; - } else if (l) { + } else if (lhi) { /* 64-bit wide address, treat as disabled */ pci_write_config_dword(dev, reg, l & ~(u32)PCI_BASE_ADDRESS_MEM_MASK); pci_write_config_dword(dev, reg+4, 0);