lkml.org 
[lkml]   [2016]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 167/206] alpha/PCI: Call iomem_is_exclusive() for IORESOURCE_MEM, but not IORESOURCE_IO
    Date
    4.2.8-ckt12 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Bjorn Helgaas <bhelgaas@google.com>

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    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);
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-06-10 00:01    [W:4.065 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site