| Message ID | 1460074573-7481-3-git-send-email-yinghai@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Thu, Apr 07, 2016 at 05:15:15PM -0700, Yinghai Lu wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > The alpha pci_mmap_resource() is used for both IORESOURCE_MEM and > IORESOURCE_IO resources, but iomem_is_exclusive() is only applicable for > IORESOURCE_MEM. > > Call iomem_is_exclusive() only for IORESOURCE_MEM resources, and do it > earlier to match the generic version of pci_mmap_resource(). > > Fixes: 10a0ef39fbd1 ("PCI/alpha: pci sysfs resources") > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru> I applied these first two patches to pci/resource for v4.7. > --- > arch/alpha/kernel/pci-sysfs.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c > index 99e8d47..92c0d46 100644 > --- a/arch/alpha/kernel/pci-sysfs.c > +++ b/arch/alpha/kernel/pci-sysfs.c > @@ -77,10 +77,10 @@ static int pci_mmap_resource(struct kobject *kobj, > if (i >= PCI_ROM_RESOURCE) > return -ENODEV; > > - if (!__pci_mmap_fits(pdev, i, vma, sparse)) > + if (res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start)) > return -EINVAL; > > - if (iomem_is_exclusive(res->start)) > + if (!__pci_mmap_fits(pdev, i, vma, sparse)) > return -EINVAL; > > pcibios_resource_to_bus(pdev->bus, &bar, res); > -- > 1.8.4.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c index 99e8d47..92c0d46 100644 --- a/arch/alpha/kernel/pci-sysfs.c +++ b/arch/alpha/kernel/pci-sysfs.c @@ -77,10 +77,10 @@ static int pci_mmap_resource(struct kobject *kobj, if (i >= PCI_ROM_RESOURCE) return -ENODEV; - if (!__pci_mmap_fits(pdev, i, vma, sparse)) + if (res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start)) return -EINVAL; - if (iomem_is_exclusive(res->start)) + if (!__pci_mmap_fits(pdev, i, vma, sparse)) return -EINVAL; pcibios_resource_to_bus(pdev->bus, &bar, res);