alpha/PCI: Call iomem_is_exclusive() for IORESOURCE_MEM, but not IORESOURCE_IO
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 25 Apr 2016 20:59:50 +0000 (15:59 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 22 Aug 2016 21:37:08 +0000 (22:37 +0100)
commit c20e128030caf0537d5e906753eac1c28fefdb75 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/alpha/kernel/pci-sysfs.c

index 53649c7..cb63d52 100644 (file)
@@ -78,10 +78,10 @@ static int pci_mmap_resource(struct kobject *kobj,
        if (i >= PCI_ROM_RESOURCE)
                return -ENODEV;
 
        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;
 
                return -EINVAL;
 
-       if (iomem_is_exclusive(res->start))
+       if (!__pci_mmap_fits(pdev, i, vma, sparse))
                return -EINVAL;
 
        pcibios_resource_to_bus(pdev, &bar, res);
                return -EINVAL;
 
        pcibios_resource_to_bus(pdev, &bar, res);