Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e313a447 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Bjorn Helgaas
Browse files

PCI: hisi: Update PCI config space remap function 



PCI configuration space should be mapped with a memory region type that
generates on the CPU host bus non-posted write transations. Update the
driver to use the devm_pci_remap_cfg* interface to make sure the correct
memory mappings for PCI configuration space are used.

Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarGabriele Paoloni <gabriele.paoloni@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Zhou Wang <wangzhou1@hisilicon.com>
parent 3e02dc43

drivers/pci/dwc/pcie-hisi.c

+3 −4
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int hisi_pcie_init(struct pci_config_window *cfg) 
		return -ENOMEM;

	}



	reg_base = devm_ioremap(dev, res->start, resource_size(res));

	reg_base = devm_pci_remap_cfgspace(dev, res->start, resource_size(res));

	if (!reg_base)

		return -ENOMEM;
@@ -296,10 +296,9 @@ static int hisi_pcie_probe(struct platform_device *pdev) 
	}



	reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi");

	pci->dbi_base = devm_ioremap_resource(dev, reg);

	pci->dbi_base = devm_pci_remap_cfg_resource(dev, reg);

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	platform_set_drvdata(pdev, hisi_pcie);



	ret = hisi_add_pcie_port(hisi_pcie, pdev);
@@ -360,7 +359,7 @@ static int hisi_pcie_platform_init(struct pci_config_window *cfg) 
		return -EINVAL;

	}



	reg_base = devm_ioremap(dev, res->start, resource_size(res));

	reg_base = devm_pci_remap_cfgspace(dev, res->start, resource_size(res));

	if (!reg_base)

		return -ENOMEM;