Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[sfrench/cifs-2.6.git] / drivers / xen / xen-pciback / conf_space_header.c

diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c
index 5fbfd9cfb6d63e61c1c89e6a9deb071ce6de2d32..5b3d57fc82d39bc8fdbcfb89582589a2be854357 100644 (file)
--- a/drivers/xen/xen-pciback/conf_space_header.c
+++ b/drivers/xen/xen-pciback/conf_space_header.c
@@ -169,6 +169,9 @@ static int rom_write(struct pci_dev *dev, int offset, u32 value, void *data)
 static int bar_write(struct pci_dev *dev, int offset, u32 value, void *data)
 {
        struct pci_bar_info *bar = data;
+       unsigned int pos = (offset - PCI_BASE_ADDRESS_0) / 4;
+       const struct resource *res = dev->resource;
+       u32 mask;
 
        if (unlikely(!bar)) {
                pr_warn(DRV_NAME ": driver data not found for %s\n",
@@ -179,7 +182,13 @@ static int bar_write(struct pci_dev *dev, int offset, u32 value, void *data)
        /* A write to obtain the length must happen as a 32-bit write.
         * This does not (yet) support writing individual bytes
         */
-       if (value == ~0)
+       if (res[pos].flags & IORESOURCE_IO)
+               mask = ~PCI_BASE_ADDRESS_IO_MASK;
+       else if (pos && (res[pos - 1].flags & IORESOURCE_MEM_64))
+               mask = 0;
+       else
+               mask = ~PCI_BASE_ADDRESS_MEM_MASK;
+       if ((value | mask) == ~0U)
                bar->which = 1;
        else {
                u32 tmpval;