Commit c1aa4b55 authored by Pali Rohár's avatar Pali Rohár Committed by Lorenzo Pieralisi
Browse files

PCI: mvebu: Replace pci_ioremap_io() usage by devm_pci_remap_iospace() 

Now when ARM architecture code also provides standard PCI core function
pci_remap_iospace(), use its devm_pci_remap_iospace() variant in
pci-mvebu.c driver instead of old ARM-specific pci_ioremap_io() function.

Call devm_pci_remap_iospace() before adding IO resource to host bridge
structure, at the place where it should be.

Link: https://lore.kernel.org/r/20211124154116.916-3-pali@kernel.org


Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent bc02973a

drivers/pci/controller/pci-mvebu.c

+4 −9
Original line number Diff line number Diff line
@@ -992,6 +992,10 @@ static int mvebu_pcie_parse_request_resources(struct mvebu_pcie *pcie) 
					 resource_size(&pcie->io) - 1);

		pcie->realio.name = "PCI I/O";



		ret = devm_pci_remap_iospace(dev, &pcie->realio, pcie->io.start);

		if (ret)

			return ret;



		pci_add_resource(&bridge->windows, &pcie->realio);

		ret = devm_request_resource(dev, &ioport_resource, &pcie->realio);

		if (ret)
@@ -1010,7 +1014,6 @@ static int mvebu_pcie_parse_request_resources(struct mvebu_pcie *pcie) 
 */

static int mvebu_pci_host_probe(struct pci_host_bridge *bridge)

{

	struct mvebu_pcie *pcie;

	struct pci_bus *bus, *child;

	int ret;
@@ -1020,14 +1023,6 @@ static int mvebu_pci_host_probe(struct pci_host_bridge *bridge) 
		return ret;

	}



	pcie = pci_host_bridge_priv(bridge);

	if (resource_size(&pcie->io) != 0) {

		unsigned int i;



		for (i = 0; i < resource_size(&pcie->realio); i += SZ_64K)

			pci_ioremap_io(i, pcie->io.start + i);

	}



	bus = bridge->bus;



	/*