Hi Lorenzo
Many thanks for putting all of this together.
> -----Original Message-----
> From: Lorenzo Pieralisi [mailto:[email protected]]
> Sent: 27 February 2017 15:14
> To: [email protected]; [email protected]
> Cc: [email protected]; [email protected]; Lorenzo
> Pieralisi; Bjorn Helgaas; Gabriele Paoloni; Wangzhou (B)
> Subject: [PATCH 14/20] 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 <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: Gabriele Paoloni <[email protected]>
> Cc: Zhou Wang <[email protected]>
> ---
> drivers/pci/dwc/pcie-hisi.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/pci/dwc/pcie-hisi.c b/drivers/pci/dwc/pcie-hisi.c
> index e3e4fed..8042780 100644
> --- a/drivers/pci/dwc/pcie-hisi.c
> +++ b/drivers/pci/dwc/pcie-hisi.c
> @@ -294,10 +294,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);
> --
> 2.10.0
I think you missed a couple of places where cfg space is ioremapped.
I have added these and merged with your changes in the patch below:
Thanks again
Gab
---------------------------------
From: Lorenzo Pieralisi <[email protected]>
Date: Tue, 21 Feb 2017 15:24:34 +0000
Subject: [PATCH 09/15] 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 <[email protected]>
Signed-off-by: Gabriele Paoloni <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Gabriele Paoloni <[email protected]>
Cc: Zhou Wang <[email protected]>
---
drivers/pci/dwc/pcie-hisi.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/dwc/pcie-hisi.c b/drivers/pci/dwc/pcie-hisi.c
index e3e4fed..a5b542c 100644
--- a/drivers/pci/dwc/pcie-hisi.c
+++ b/drivers/pci/dwc/pcie-hisi.c
@@ -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;
@@ -294,10 +294,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);
@@ -358,7 +357,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;
--
2.7.4
[...]
>
> I will fold the changes into v2 (and I hope other host controllers
> maintainers will follow suit - I do not have enough knowledge of
> all host bridges drivers internals to understand what ioremap calls
> need patching).
Ok great, many thanks!
Gab
>
> Thanks !
> Lorenzo
Hi Gabriele,
On Thu, Mar 02, 2017 at 10:56:16AM +0000, Gabriele Paoloni wrote:
> Hi Lorenzo
>
> Many thanks for putting all of this together.
>
> > -----Original Message-----
> > From: Lorenzo Pieralisi [mailto:[email protected]]
> > Sent: 27 February 2017 15:14
> > To: [email protected]; [email protected]
> > Cc: [email protected]; [email protected]; Lorenzo
> > Pieralisi; Bjorn Helgaas; Gabriele Paoloni; Wangzhou (B)
> > Subject: [PATCH 14/20] 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 <[email protected]>
> > Cc: Bjorn Helgaas <[email protected]>
> > Cc: Gabriele Paoloni <[email protected]>
> > Cc: Zhou Wang <[email protected]>
> > ---
> > drivers/pci/dwc/pcie-hisi.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/pci/dwc/pcie-hisi.c b/drivers/pci/dwc/pcie-hisi.c
> > index e3e4fed..8042780 100644
> > --- a/drivers/pci/dwc/pcie-hisi.c
> > +++ b/drivers/pci/dwc/pcie-hisi.c
> > @@ -294,10 +294,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);
> > --
> > 2.10.0
>
> I think you missed a couple of places where cfg space is ioremapped.
> I have added these and merged with your changes in the patch below:
>
> Thanks again
> Gab
>
> ---------------------------------
> From: Lorenzo Pieralisi <[email protected]>
> Date: Tue, 21 Feb 2017 15:24:34 +0000
> Subject: [PATCH 09/15] 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 <[email protected]>
> Signed-off-by: Gabriele Paoloni <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: Gabriele Paoloni <[email protected]>
> Cc: Zhou Wang <[email protected]>
> ---
> drivers/pci/dwc/pcie-hisi.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/dwc/pcie-hisi.c b/drivers/pci/dwc/pcie-hisi.c
> index e3e4fed..a5b542c 100644
> --- a/drivers/pci/dwc/pcie-hisi.c
> +++ b/drivers/pci/dwc/pcie-hisi.c
> @@ -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;
>
> @@ -294,10 +294,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);
> @@ -358,7 +357,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;
I will fold the changes into v2 (and I hope other host controllers
maintainers will follow suit - I do not have enough knowledge of
all host bridges drivers internals to understand what ioremap calls
need patching).
Thanks !
Lorenzo