UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Zhou Wang <wangzhou1@hisilicon.com>
This commit is contained in:
Lorenzo Pieralisi 2017-04-19 17:49:07 +01:00 committed by Bjorn Helgaas
parent 3e02dc439b
commit e313a447e7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pci/dwc/pcie-hisi.c
View File

@ -99,7 +99,7 @@ static int hisi_pcie_init(struct pci_config_window *cfg)
return -ENOMEM; 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) if (!reg_base)
return -ENOMEM; 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"); 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)) if (IS_ERR(pci->dbi_base))
return PTR_ERR(pci->dbi_base); return PTR_ERR(pci->dbi_base);
platform_set_drvdata(pdev, hisi_pcie); platform_set_drvdata(pdev, hisi_pcie);
ret = hisi_add_pcie_port(hisi_pcie, pdev); 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; 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) if (!reg_base)
return -ENOMEM; return -ENOMEM;