PCI: endpoint: Make sure that BAR_5 does not have 64-bit flag set when clearing
authorNiklas Cassel <niklas.cassel@axis.com>
Wed, 28 Mar 2018 11:50:15 +0000 (13:50 +0200)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tue, 3 Apr 2018 11:38:05 +0000 (12:38 +0100)
Since a 64-bit BAR consists of a BAR pair, and since there is no
BAR after BAR_5, BAR_5 cannot be 64-bits wide.

This sanity check is done in pci_epc_clear_bar(), so that we don't need
to do this sanity check in all epc->ops->clear_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>
drivers/pci/endpoint/pci-epc-core.c

index eccc942..b0ee427 100644 (file)
@@ -285,7 +285,9 @@ void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no,
 {
        unsigned long flags;
 
-       if (IS_ERR_OR_NULL(epc) || func_no >= epc->max_functions)
+       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))
                return;
 
        if (!epc->ops->clear_bar)