On Wed, Mar 19, 2014 at 12:54 PM, Bjorn Helgaas <bhelgaas@xxxxxxxxxx> wrote: > [+cc Ming, Rusty, Pekka, Sasha] > ... > I plan to replace this patch with the following, which only sets > IORESOURCE_UNSET when we already have been clearing the bus region start > address. (This probably should have been a separate patch to begin with, > mea culpa.) > > This is intended for the v3.15 merge window, so I made the minimal change > to reduce risk. I put this patch in my pci/resource branch and re-merged it into my "next" branch. This rebased both pci/resource and next, which is unfortunate, but I think it's the cleanest and least risky way at this point. Bjorn > PCI: Mark 64-bit resource as IORESOURCE_UNSET if we only support 32-bit > > From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > > If we don't support 64-bit addresses, i.e., CONFIG_PHYS_ADDR_T_64BIT is not > set, we can't deal with BARs above 4GB. In this case we already pretend > the BAR contained zero; this patch also sets IORESOURCE_UNSET so we can try > to reallocate it later. > > I don't think this is exactly correct: what we care about here are *bus* > addresses, not CPU addresses, so the tests of sizeof(resource_size_t) > probably should be on sizeof(dma_addr_t) instead. But this is what's been > in -next, so we'll fix that later. > > Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > --- > drivers/pci/probe.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 6e34498ec9f0..78335efbbb74 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -252,6 +252,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, > /* Address above 32-bit boundary; disable the BAR */ > pci_write_config_dword(dev, pos, 0); > pci_write_config_dword(dev, pos + 4, 0); > + res->flags |= IORESOURCE_UNSET; > region.start = 0; > region.end = sz64; > bar_disabled = true; -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
