misc: pci_endpoint_test: Handle 64-bit BARs properly
authorNiklas Cassel <niklas.cassel@axis.com>
Wed, 28 Mar 2018 11:50:17 +0000 (13:50 +0200)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tue, 3 Apr 2018 11:38:06 +0000 (12:38 +0100)
A 64-bit BAR consists of a BAR pair, where the second BAR has the
upper bits, so we cannot simply call pci_ioremap_bar() on every single
BAR index.

The second BAR in a BAR pair will not have the IORESOURCE_MEM resource
flag set. Only call ioremap on BARs that have the IORESOURCE_MEM
resource flag set.

pci 0000:01:00.0: BAR 4: assigned [mem 0xc0300000-0xc031ffff 64bit]
pci 0000:01:00.0: BAR 2: assigned [mem 0xc0320000-0xc03203ff 64bit]
pci 0000:01:00.0: BAR 0: assigned [mem 0xc0320400-0xc03204ff 64bit]
pci-endpoint-test 0000:01:00.0: can't ioremap BAR 1: [??? 0x00000000 flags 0x0]
pci-endpoint-test 0000:01:00.0: failed to read BAR1
pci-endpoint-test 0000:01:00.0: can't ioremap BAR 3: [??? 0x00000000 flags 0x0]
pci-endpoint-test 0000:01:00.0: failed to read BAR3
pci-endpoint-test 0000:01:00.0: can't ioremap BAR 5: [??? 0x00000000 flags 0x0]
pci-endpoint-test 0000:01:00.0: failed to read BAR5

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/misc/pci_endpoint_test.c

index 320276f..fe8897e 100644 (file)
@@ -534,12 +534,14 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
        }
 
        for (bar = BAR_0; bar <= BAR_5; bar++) {
-               base = pci_ioremap_bar(pdev, bar);
-               if (!base) {
-                       dev_err(dev, "failed to read BAR%d\n", bar);
-                       WARN_ON(bar == test_reg_bar);
+               if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
+                       base = pci_ioremap_bar(pdev, bar);
+                       if (!base) {
+                               dev_err(dev, "failed to read BAR%d\n", bar);
+                               WARN_ON(bar == test_reg_bar);
+                       }
+                       test->bar[bar] = base;
                }
-               test->bar[bar] = base;
        }
 
        test->base = test->bar[test_reg_bar];