diff mbox series

PCI: imx: do not remap invalid res

Message ID 20211101180243.23761-1-tharvey@gateworks.com (mailing list archive)
State Accepted
Delegated to: Lorenzo Pieralisi
Headers show
Series PCI: imx: do not remap invalid res | expand

Commit Message

Tim Harvey Nov. 1, 2021, 6:02 p.m. UTC
On imx6 and perhaps others when pcie probes you get a:
imx6q-pcie 33800000.pcie: invalid resource

This occurs because the atu is not specified in the DT and as such it
should not be remapped.

Cc: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---
 drivers/pci/controller/dwc/pcie-designware.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Tim Harvey Dec. 1, 2021, 10:06 p.m. UTC | #1
On Mon, Nov 1, 2021 at 11:03 AM Tim Harvey <tharvey@gateworks.com> wrote:
>
> On imx6 and perhaps others when pcie probes you get a:
> imx6q-pcie 33800000.pcie: invalid resource
>
> This occurs because the atu is not specified in the DT and as such it
> should not be remapped.
>
> Cc: Richard Zhu <hongxing.zhu@nxp.com>
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> ---
>  drivers/pci/controller/dwc/pcie-designware.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
> index a945f0c0e73d..3254f60d1713 100644
> --- a/drivers/pci/controller/dwc/pcie-designware.c
> +++ b/drivers/pci/controller/dwc/pcie-designware.c
> @@ -671,10 +671,11 @@ void dw_pcie_iatu_detect(struct dw_pcie *pci)
>                 if (!pci->atu_base) {
>                         struct resource *res =
>                                 platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");
> -                       if (res)
> +                       if (res) {
>                                 pci->atu_size = resource_size(res);
> -                       pci->atu_base = devm_ioremap_resource(dev, res);
> -                       if (IS_ERR(pci->atu_base))
> +                               pci->atu_base = devm_ioremap_resource(dev, res);
> +                       }
> +                       if (!pci->atu_base || IS_ERR(pci->atu_base))
>                                 pci->atu_base = pci->dbi_base + DEFAULT_DBI_ATU_OFFSET;
>                 }
>
> --
> 2.17.1
>

ping - any feedback on this?

Best regards,

Tim
Rob Herring (Arm) Dec. 1, 2021, 11:46 p.m. UTC | #2
On Mon, Nov 1, 2021 at 1:37 PM Tim Harvey <tharvey@gateworks.com> wrote:
>
> On imx6 and perhaps others when pcie probes you get a:
> imx6q-pcie 33800000.pcie: invalid resource
>
> This occurs because the atu is not specified in the DT and as such it
> should not be remapped.
>

Fixes: 281f1f99cf3a ("PCI: dwc: Detect number of iATU windows")
Reviewed-by: Rob Herring <robh@kernel.org>

> Cc: Richard Zhu <hongxing.zhu@nxp.com>
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> ---
>  drivers/pci/controller/dwc/pcie-designware.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
Hongxing Zhu Dec. 2, 2021, 12:48 a.m. UTC | #3
> -----Original Message-----
> From: Tim Harvey <tharvey@gateworks.com>
> Sent: Thursday, December 2, 2021 6:07 AM
> To: Jingoo Han <jingoohan1@gmail.com>; Gustavo Pimentel
> <gustavo.pimentel@synopsys.com>; Rob Herring <robh@kernel.org>;
> Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>; Krzysztof Wilczyński
> <kw@linux.com>; Bjorn Helgaas <bhelgaas@google.com>;
> linux-pci@vger.kernel.org
> Cc: open list <linux-kernel@vger.kernel.org>; Hongxing Zhu
> <hongxing.zhu@nxp.com>
> Subject: Re: [PATCH] PCI: imx: do not remap invalid res
> 
> On Mon, Nov 1, 2021 at 11:03 AM Tim Harvey <tharvey@gateworks.com>
> wrote:
> >
> > On imx6 and perhaps others when pcie probes you get a:
> > imx6q-pcie 33800000.pcie: invalid resource
> >
> > This occurs because the atu is not specified in the DT and as such it
> > should not be remapped.
> >
> > Cc: Richard Zhu <hongxing.zhu@nxp.com>
> > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
[Richard Zhu] Please merge Rob's commit log changes.
Then, Acked-by: Richard Zhu <hongxing.zhu@nxp.com>

Best Regards
Richard Zhu
> > ---
> >  drivers/pci/controller/dwc/pcie-designware.c | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/pci/controller/dwc/pcie-designware.c
> > b/drivers/pci/controller/dwc/pcie-designware.c
> > index a945f0c0e73d..3254f60d1713 100644
> > --- a/drivers/pci/controller/dwc/pcie-designware.c
> > +++ b/drivers/pci/controller/dwc/pcie-designware.c
> > @@ -671,10 +671,11 @@ void dw_pcie_iatu_detect(struct dw_pcie
> *pci)
> >                 if (!pci->atu_base) {
> >                         struct resource *res =
> >
> platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");
> > -                       if (res)
> > +                       if (res) {
> >                                 pci->atu_size =
> resource_size(res);
> > -                       pci->atu_base =
> devm_ioremap_resource(dev, res);
> > -                       if (IS_ERR(pci->atu_base))
> > +                               pci->atu_base =
> devm_ioremap_resource(dev, res);
> > +                       }
> > +                       if (!pci->atu_base ||
> IS_ERR(pci->atu_base))
> >                                 pci->atu_base = pci->dbi_base
> + DEFAULT_DBI_ATU_OFFSET;
> >                 }
> >
> > --
> > 2.17.1
> >
> 
> ping - any feedback on this?
> 
> Best regards,
> 
> Tim
Rob Herring (Arm) Dec. 2, 2021, 2:41 a.m. UTC | #4
On Wed, Dec 1, 2021 at 6:48 PM Hongxing Zhu <hongxing.zhu@nxp.com> wrote:
>
>
> > -----Original Message-----
> > From: Tim Harvey <tharvey@gateworks.com>
> > Sent: Thursday, December 2, 2021 6:07 AM
> > To: Jingoo Han <jingoohan1@gmail.com>; Gustavo Pimentel
> > <gustavo.pimentel@synopsys.com>; Rob Herring <robh@kernel.org>;
> > Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>; Krzysztof Wilczyński
> > <kw@linux.com>; Bjorn Helgaas <bhelgaas@google.com>;
> > linux-pci@vger.kernel.org
> > Cc: open list <linux-kernel@vger.kernel.org>; Hongxing Zhu
> > <hongxing.zhu@nxp.com>
> > Subject: Re: [PATCH] PCI: imx: do not remap invalid res

Please fix your quoting style with all the headers (hint: don't use
Outlook). It's base64 encoded too which isn't ideal for maillists, but
somewhat tolerated nowadays.

> >
> > On Mon, Nov 1, 2021 at 11:03 AM Tim Harvey <tharvey@gateworks.com>
> > wrote:
> > >
> > > On imx6 and perhaps others when pcie probes you get a:
> > > imx6q-pcie 33800000.pcie: invalid resource
> > >
> > > This occurs because the atu is not specified in the DT and as such it
> > > should not be remapped.
> > >
> > > Cc: Richard Zhu <hongxing.zhu@nxp.com>
> > > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> [Richard Zhu] Please merge Rob's commit log changes.

The maintainer tools do that automatically.

> Then, Acked-by: Richard Zhu <hongxing.zhu@nxp.com>

But probably not when you prefix your tag with 'Then, '... :(

Rob
Lorenzo Pieralisi Dec. 2, 2021, 9:43 a.m. UTC | #5
On Mon, 1 Nov 2021 11:02:43 -0700, Tim Harvey wrote:
> On imx6 and perhaps others when pcie probes you get a:
> imx6q-pcie 33800000.pcie: invalid resource
> 
> This occurs because the atu is not specified in the DT and as such it
> should not be remapped.
> 
> 
> [...]

Applied to pci/dwc, thanks!

[1/1] PCI: imx: do not remap invalid res
      https://git.kernel.org/lpieralisi/pci/c/6e5ebc96ec

Thanks,
Lorenzo
Bjorn Helgaas Dec. 3, 2021, 8:28 p.m. UTC | #6
On Wed, Dec 01, 2021 at 02:06:44PM -0800, Tim Harvey wrote:
> On Mon, Nov 1, 2021 at 11:03 AM Tim Harvey <tharvey@gateworks.com> wrote:
> >
> > On imx6 and perhaps others when pcie probes you get a:
> > imx6q-pcie 33800000.pcie: invalid resource
> >
> > This occurs because the atu is not specified in the DT and as such it
> > should not be remapped.
> >
> > Cc: Richard Zhu <hongxing.zhu@nxp.com>
> > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> > ---
> >  drivers/pci/controller/dwc/pcie-designware.c | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
> > index a945f0c0e73d..3254f60d1713 100644
> > --- a/drivers/pci/controller/dwc/pcie-designware.c
> > +++ b/drivers/pci/controller/dwc/pcie-designware.c
> > @@ -671,10 +671,11 @@ void dw_pcie_iatu_detect(struct dw_pcie *pci)
> >                 if (!pci->atu_base) {
> >                         struct resource *res =
> >                                 platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");
> > -                       if (res)
> > +                       if (res) {
> >                                 pci->atu_size = resource_size(res);
> > -                       pci->atu_base = devm_ioremap_resource(dev, res);
> > -                       if (IS_ERR(pci->atu_base))
> > +                               pci->atu_base = devm_ioremap_resource(dev, res);
> > +                       }
> > +                       if (!pci->atu_base || IS_ERR(pci->atu_base))
> >                                 pci->atu_base = pci->dbi_base + DEFAULT_DBI_ATU_OFFSET;
> >                 }
> >
> > --
> > 2.17.1
> >
> 
> ping - any feedback on this?

Looks like Lorenzo corrected the subject line for you and applied it:

https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=6e5ebc96ec65
Tim Harvey Dec. 3, 2021, 8:49 p.m. UTC | #7
On Fri, Dec 3, 2021 at 12:28 PM Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> On Wed, Dec 01, 2021 at 02:06:44PM -0800, Tim Harvey wrote:
> > On Mon, Nov 1, 2021 at 11:03 AM Tim Harvey <tharvey@gateworks.com> wrote:
> > >
> > > On imx6 and perhaps others when pcie probes you get a:
> > > imx6q-pcie 33800000.pcie: invalid resource
> > >
> > > This occurs because the atu is not specified in the DT and as such it
> > > should not be remapped.
> > >
> > > Cc: Richard Zhu <hongxing.zhu@nxp.com>
> > > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> > > ---
> > >  drivers/pci/controller/dwc/pcie-designware.c | 7 ++++---
> > >  1 file changed, 4 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
> > > index a945f0c0e73d..3254f60d1713 100644
> > > --- a/drivers/pci/controller/dwc/pcie-designware.c
> > > +++ b/drivers/pci/controller/dwc/pcie-designware.c
> > > @@ -671,10 +671,11 @@ void dw_pcie_iatu_detect(struct dw_pcie *pci)
> > >                 if (!pci->atu_base) {
> > >                         struct resource *res =
> > >                                 platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");
> > > -                       if (res)
> > > +                       if (res) {
> > >                                 pci->atu_size = resource_size(res);
> > > -                       pci->atu_base = devm_ioremap_resource(dev, res);
> > > -                       if (IS_ERR(pci->atu_base))
> > > +                               pci->atu_base = devm_ioremap_resource(dev, res);
> > > +                       }
> > > +                       if (!pci->atu_base || IS_ERR(pci->atu_base))
> > >                                 pci->atu_base = pci->dbi_base + DEFAULT_DBI_ATU_OFFSET;
> > >                 }
> > >
> > > --
> > > 2.17.1
> > >
> >
> > ping - any feedback on this?
>
> Looks like Lorenzo corrected the subject line for you and applied it:
>
> https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=6e5ebc96ec65

Yes, I saw that. Thanks everyone!

Best regards,

Tim
diff mbox series

Patch

diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
index a945f0c0e73d..3254f60d1713 100644
--- a/drivers/pci/controller/dwc/pcie-designware.c
+++ b/drivers/pci/controller/dwc/pcie-designware.c
@@ -671,10 +671,11 @@  void dw_pcie_iatu_detect(struct dw_pcie *pci)
 		if (!pci->atu_base) {
 			struct resource *res =
 				platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");
-			if (res)
+			if (res) {
 				pci->atu_size = resource_size(res);
-			pci->atu_base = devm_ioremap_resource(dev, res);
-			if (IS_ERR(pci->atu_base))
+				pci->atu_base = devm_ioremap_resource(dev, res);
+			}
+			if (!pci->atu_base || IS_ERR(pci->atu_base))
 				pci->atu_base = pci->dbi_base + DEFAULT_DBI_ATU_OFFSET;
 		}