Commit 16b17cad authored by Niklas Cassel's avatar Niklas Cassel Committed by Lorenzo Pieralisi
Browse files

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: default avatarNiklas Cassel <niklas.cassel@axis.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 96a3be43

drivers/misc/pci_endpoint_test.c

+7 −5
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, 
	}



	for (bar = BAR_0; bar <= BAR_5; 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);
@@ -541,6 +542,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, 
			}

			test->bar[bar] = base;

		}

	}



	test->base = test->bar[test_reg_bar];

	if (!test->base) {