PCI: versatile: Remove usage of PHYS_OFFSET (2999dea8) · Commits · 戴 / test

PHYS_OFFSET is not universally defined on all arches and using it prevents enabling COMPILE_TEST. PAGE_OFFSET and __pa() are always available, so use them to get the physical start of memory address. This should have probably used 'dma-ranges' to get the address, but we don't want to force a DT update to do that. At least in QEMU, the SMAP registers have no effect (or perhaps the only value that is handled is 0). Signed-off-by:

Rob Herring <robh@kernel.org> Signed-off-by:

Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Acked-by:

Linus Walleij <linus.walleij@linaro.org> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Andrew Murray <andrew.murray@arm.com> Cc: Bjorn Helgaas <bhelgaas@google.com>

drivers/pci/controller/pci-versatile.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ static int versatile_pci_probe(struct platform_device *pdev)
		resource_list_for_each_entry(entry, &bridge->windows) {
		if (resource_type(entry->res) == IORESOURCE_MEM) {
		writel(entry->res->start >> 28, PCI_IMAP(mem));
		writel(PHYS_OFFSET >> 28, PCI_SMAP(mem));
		writel(__pa(PAGE_OFFSET) >> 28, PCI_SMAP(mem));
		mem++;
		}
		}
		@@ -136,9 +136,9 @@ static int versatile_pci_probe(struct platform_device *pdev)
		/*
		* Configure the PCI inbound memory windows to be 1:1 mapped to SDRAM
		*/
		writel(PHYS_OFFSET, local_pci_cfg_base + PCI_BASE_ADDRESS_0);
		writel(PHYS_OFFSET, local_pci_cfg_base + PCI_BASE_ADDRESS_1);
		writel(PHYS_OFFSET, local_pci_cfg_base + PCI_BASE_ADDRESS_2);
		writel(__pa(PAGE_OFFSET), local_pci_cfg_base + PCI_BASE_ADDRESS_0);
		writel(__pa(PAGE_OFFSET), local_pci_cfg_base + PCI_BASE_ADDRESS_1);
		writel(__pa(PAGE_OFFSET), local_pci_cfg_base + PCI_BASE_ADDRESS_2);

		/*
		* For many years the kernel and QEMU were symbiotically buggy

Admin message