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

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

PCI: designware: 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 avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Joao Pinto <Joao.Pinto@synopsys.com>
parent 868564da

drivers/pci/dwc/pcie-designware-host.c

+7 −5
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	}



	if (!pci->dbi_base) {

		pci->dbi_base = devm_ioremap(dev, pp->cfg->start,

		pci->dbi_base = devm_pci_remap_cfgspace(dev,

						pp->cfg->start,

						resource_size(pp->cfg));

		if (!pci->dbi_base) {

			dev_err(dev, "error with ioremap\n");
@@ -350,8 +351,8 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	pp->mem_base = pp->mem->start;



	if (!pp->va_cfg0_base) {

		pp->va_cfg0_base = devm_ioremap(dev, pp->cfg0_base,

						pp->cfg0_size);

		pp->va_cfg0_base = devm_pci_remap_cfgspace(dev,

					pp->cfg0_base, pp->cfg0_size);

		if (!pp->va_cfg0_base) {

			dev_err(dev, "error with ioremap in function\n");

			ret = -ENOMEM;
@@ -360,7 +361,8 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	}



	if (!pp->va_cfg1_base) {

		pp->va_cfg1_base = devm_ioremap(dev, pp->cfg1_base,

		pp->va_cfg1_base = devm_pci_remap_cfgspace(dev,

						pp->cfg1_base,

						pp->cfg1_size);

		if (!pp->va_cfg1_base) {

			dev_err(dev, "error with ioremap\n");