On Wednesday, April 19, 2017 12:49 PM, Lorenzo Pieralisi wrote:
>
> 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: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: Jingoo Han <jingoohan1@xxxxxxxxx>
Acked-by: Jingoo Han <jingoohan1@xxxxxxxxx>
Best regards,
Jingoo Han
> Cc: Joao Pinto <Joao.Pinto@xxxxxxxxxxxx>
> ---
> drivers/pci/dwc/pcie-designware-host.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pci/dwc/pcie-designware-host.c
> b/drivers/pci/dwc/pcie-designware-host.c
> index 5ba3349..2b789af 100644
> --- a/drivers/pci/dwc/pcie-designware-host.c
> +++ b/drivers/pci/dwc/pcie-designware-host.c
> @@ -338,8 +338,9 @@ int dw_pcie_host_init(struct pcie_port *pp)
> }
>
> if (!pci->dbi_base) {
> - pci->dbi_base = devm_ioremap(dev, pp->cfg->start,
> - resource_size(pp->cfg));
> + 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");
> ret = -ENOMEM;
> @@ -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");
> --
> 2.10.0
