PCI: endpoint: Setting 64-bit/prefetch bit is invalid when IO is set

If flag PCI_BASE_ADDRESS_SPACE_IO is set, also having any
PCI_BASE_ADDRESS_MEM_* bit set is invalid.

This sanity check is done in pci_epc_set_bar(), so that we don't need
to do this sanity check in all epc->ops->set_bar() implementations.

Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
index 109d75f0b7d2c4e48cbed58e29d0a0ca61a76664..40eea20d21f9ff492c620d59c119eeaba937fd05 100644 (file)
--- a/drivers/pci/endpoint/pci-epc-core.c
+++ b/drivers/pci/endpoint/pci-epc-core.c
@@ -309,10 +309,13 @@ int pci_epc_set_bar(struct pci_epc *epc, u8 func_no,
 {
        int ret;
        unsigned long irq_flags;
+       int flags = epf_bar->flags;
 
        if (IS_ERR_OR_NULL(epc) || func_no >= epc->max_functions ||
            (epf_bar->barno == BAR_5 &&
-            epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64))
+            flags & PCI_BASE_ADDRESS_MEM_TYPE_64) ||
+           (flags & PCI_BASE_ADDRESS_SPACE_IO &&
+            flags & PCI_BASE_ADDRESS_IO_MASK))
                return -EINVAL;
 
        if (!epc->ops->set_bar)