aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Cassel <niklas.cassel@axis.com>2018-03-28 07:50:17 -0400
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2018-04-03 07:38:06 -0400
commit16b17cad0990f13cdcdfd9694cc7c41c7c76b0cf (patch)
tree1fc0d558c5c728835fc1e194cf6b4547e9f1ccca
parent96a3be43261b919a1785d080b501fae26ce97bc2 (diff)
misc: pci_endpoint_test: Handle 64-bit BARs properly
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>
-rw-r--r--drivers/misc/pci_endpoint_test.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
index 320276f42653..fe8897e64635 100644
--- a/drivers/misc/pci_endpoint_test.c
+++ b/drivers/misc/pci_endpoint_test.c
@@ -534,12 +534,14 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
534 } 534 }
535 535
536 for (bar = BAR_0; bar <= BAR_5; bar++) { 536 for (bar = BAR_0; bar <= BAR_5; bar++) {
537 base = pci_ioremap_bar(pdev, bar); 537 if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
538 if (!base) { 538 base = pci_ioremap_bar(pdev, bar);
539 dev_err(dev, "failed to read BAR%d\n", bar); 539 if (!base) {
540 WARN_ON(bar == test_reg_bar); 540 dev_err(dev, "failed to read BAR%d\n", bar);
541 WARN_ON(bar == test_reg_bar);
542 }
543 test->bar[bar] = base;
541 } 544 }
542 test->bar[bar] = base;
543 } 545 }
544 546
545 test->base = test->bar[test_reg_bar]; 547 test->base = test->bar[test_reg_bar];