PCI: endpoint: Setting a BAR size > 4 GB is invalid if 64-bit flag is not set

Setting a BAR size > 4 GB is invalid if PCI_BASE_ADDRESS_MEM_TYPE_64
flag is not set.

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 40eea20d21f9ff492c620d59c119eeaba937fd05..8637822605ff69df8dcc5e33431feda7ac92c766 100644 (file)
--- a/drivers/pci/endpoint/pci-epc-core.c
+++ b/drivers/pci/endpoint/pci-epc-core.c
@@ -315,7 +315,9 @@ int pci_epc_set_bar(struct pci_epc *epc, u8 func_no,
            (epf_bar->barno == BAR_5 &&
             flags & PCI_BASE_ADDRESS_MEM_TYPE_64) ||
            (flags & PCI_BASE_ADDRESS_SPACE_IO &&
-            flags & PCI_BASE_ADDRESS_IO_MASK))
+            flags & PCI_BASE_ADDRESS_IO_MASK) ||
+           (upper_32_bits(epf_bar->size) &&
+            !(flags & PCI_BASE_ADDRESS_MEM_TYPE_64)))
                return -EINVAL;
 
        if (!epc->ops->set_bar)