PCI/Layerscape: fix wrongly invoking of outbound window disable accessor

Message ID 20181025085323.8819-1-Zhiqiang.Hou@nxp.com
State New
Delegated to: Lorenzo Pieralisi
Headers show
Series
  • PCI/Layerscape: fix wrongly invoking of outbound window disable accessor
Related show

Commit Message

Z.q. Hou Oct. 25, 2018, 8:53 a.m.
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

This issue is introduced by commit 4a2745d760fac ("PCI: layerscape: Disable
outbound windows configured by bootloader").

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
 drivers/pci/controller/dwc/pci-layerscape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Bjorn Helgaas Oct. 25, 2018, 1:45 p.m. | #1
$ git log --oneline --follow drivers/pci/controller/dwc/pci-layerscape.c | head
  6e0832fa432e PCI: Collect all native drivers under drivers/pci/controller/
  3f43ccc4ea1b PCI: dwc: Remove old MSI IRQs API
  8cfab3cf63cf PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
  84d897d69938 PCI: layerscape: Change default error response behavior
  a335b122ba27 PCI: layerscape: Add support for ls1012a
  03fc6134c260 PCI: layerscape: Add support for ls1088a
  8f89357094e6 PCI: layerscape: Add support for ls2088a
  c3f909398827 PCI: layerscape: Remove unnecessary class code fixup
  e44abfed6fcb PCI: dwc: Add accessors for write permission of DBI read-only registers
  4a2745d760fa PCI: layerscape: Disable outbound windows configured by bootloader

Make yours match, e.g., "PCI: layerscape: Call dw_pcie_disable_atu()
correctly"

On Thu, Oct 25, 2018 at 08:53:37AM +0000, Z.q. Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> This issue is introduced by commit 4a2745d760fac ("PCI: layerscape: Disable
> outbound windows configured by bootloader").

Conventional commit reference:

  $ git --no-pager show -s --abbrev-commit --abbrev=12 --pretty=format:"%h (\"%s\")%n" 4a2745d760fac
  4a2745d760fa ("PCI: layerscape: Disable outbound windows configured by bootloader")

Holy cow, this has been broken since v4.14.  If fixing this makes a
difference, you might want to tag it for stable.

> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
>  drivers/pci/controller/dwc/pci-layerscape.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/controller/dwc/pci-layerscape.c b/drivers/pci/controller/dwc/pci-layerscape.c
> index 69f3f1a5a782..b2085988dbee 100644
> --- a/drivers/pci/controller/dwc/pci-layerscape.c
> +++ b/drivers/pci/controller/dwc/pci-layerscape.c
> @@ -88,7 +88,7 @@ static void ls_pcie_disable_outbound_atus(struct ls_pcie *pcie)
>  	int i;
>  
>  	for (i = 0; i < PCIE_IATU_NUM; i++)
> -		dw_pcie_disable_atu(pcie->pci, DW_PCIE_REGION_OUTBOUND, i);
> +		dw_pcie_disable_atu(pcie->pci, i, DW_PCIE_REGION_OUTBOUND);
>  }
>  
>  static int ls1021_pcie_link_up(struct dw_pcie *pci)
> -- 
> 2.17.1
>
Z.q. Hou Oct. 26, 2018, 2:20 a.m. | #2
Hi Bjorn,

Thanks a lot for your comments!

> -----Original Message-----
> From: Bjorn Helgaas <helgaas@kernel.org>
> Sent: 2018年10月25日 21:45
> To: Z.q. Hou <zhiqiang.hou@nxp.com>
> Cc: linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org;
> bhelgaas@google.com; lorenzo.pieralisi@arm.com; Roy Zang
> <roy.zang@nxp.com>; M.h. Lian <minghuan.lian@nxp.com>
> Subject: Re: [PATCH] PCI/Layerscape: fix wrongly invoking of outbound
> window disable accessor
> 
>   $ git log --oneline --follow drivers/pci/controller/dwc/pci-layerscape.c |
> head
>   6e0832fa432e PCI: Collect all native drivers under drivers/pci/controller/
>   3f43ccc4ea1b PCI: dwc: Remove old MSI IRQs API
>   8cfab3cf63cf PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
>   84d897d69938 PCI: layerscape: Change default error response behavior
>   a335b122ba27 PCI: layerscape: Add support for ls1012a
>   03fc6134c260 PCI: layerscape: Add support for ls1088a
>   8f89357094e6 PCI: layerscape: Add support for ls2088a
>   c3f909398827 PCI: layerscape: Remove unnecessary class code fixup
>   e44abfed6fcb PCI: dwc: Add accessors for write permission of DBI
> read-only registers
>   4a2745d760fa PCI: layerscape: Disable outbound windows configured by
> bootloader
> 
> Make yours match, e.g., "PCI: layerscape: Call dw_pcie_disable_atu()
> correctly"
> 

Yes, will uniform the subject in v2.

> On Thu, Oct 25, 2018 at 08:53:37AM +0000, Z.q. Hou wrote:
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > This issue is introduced by commit 4a2745d760fac ("PCI: layerscape:
> > Disable outbound windows configured by bootloader").
> 
> Conventional commit reference:
> 
>   $ git --no-pager show -s --abbrev-commit --abbrev=12 --pretty=format:"%h
> (\"%s\")%n" 4a2745d760fac
>   4a2745d760fa ("PCI: layerscape: Disable outbound windows configured by
> bootloader")
> 

Will correct the commit ID length.

> Holy cow, this has been broken since v4.14.  If fixing this makes a difference,
> you might want to tag it for stable.
> 

How can I tag it for stable?

> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> >  drivers/pci/controller/dwc/pci-layerscape.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/pci/controller/dwc/pci-layerscape.c
> > b/drivers/pci/controller/dwc/pci-layerscape.c
> > index 69f3f1a5a782..b2085988dbee 100644
> > --- a/drivers/pci/controller/dwc/pci-layerscape.c
> > +++ b/drivers/pci/controller/dwc/pci-layerscape.c
> > @@ -88,7 +88,7 @@ static void ls_pcie_disable_outbound_atus(struct
> ls_pcie *pcie)
> >  	int i;
> >
> >  	for (i = 0; i < PCIE_IATU_NUM; i++)
> > -		dw_pcie_disable_atu(pcie->pci, DW_PCIE_REGION_OUTBOUND, i);
> > +		dw_pcie_disable_atu(pcie->pci, i, DW_PCIE_REGION_OUTBOUND);
> >  }
> >
> >  static int ls1021_pcie_link_up(struct dw_pcie *pci)
> > --
> > 2.17.1
> >

Thanks,
Zhiqiang
Bjorn Helgaas Oct. 29, 2018, 4:31 p.m. | #3
On Fri, Oct 26, 2018 at 02:20:21AM +0000, Z.q. Hou wrote:
> > From: Bjorn Helgaas <helgaas@kernel.org>

> > Holy cow, this has been broken since v4.14.  If fixing this makes
> > a difference, you might want to tag it for stable.
> 
> How can I tag it for stable?

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst
Z.q. Hou Nov. 7, 2018, 4:41 a.m. | #4
Hi Bjorn,

Thanks a lot for your guide!
I'll tag it for stable in v2.

Thanks,
Zhiqiang

> -----Original Message-----
> From: Bjorn Helgaas <helgaas@kernel.org>
> Sent: 2018年10月30日 0:31
> To: Z.q. Hou <zhiqiang.hou@nxp.com>
> Cc: linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org;
> bhelgaas@google.com; lorenzo.pieralisi@arm.com; Roy Zang
> <roy.zang@nxp.com>; M.h. Lian <minghuan.lian@nxp.com>
> Subject: Re: [PATCH] PCI/Layerscape: fix wrongly invoking of outbound
> window disable accessor
> 
> On Fri, Oct 26, 2018 at 02:20:21AM +0000, Z.q. Hou wrote:
> > > From: Bjorn Helgaas <helgaas@kernel.org>
> 
> > > Holy cow, this has been broken since v4.14.  If fixing this makes a
> > > difference, you might want to tag it for stable.
> >
> > How can I tag it for stable?
> 
> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.k
> ernel.org%2Fcgit%2Flinux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git%2Ftree%
> 2FDocumentation%2Fprocess%2Fstable-kernel-rules.rst&amp;data=02%7C01
> %7Czhiqiang.hou%40nxp.com%7Cd3bb6e26e2bd4dc06c6808d63dbbee06%7
> C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63676427469732183
> 0&amp;sdata=k6DF2U2P%2Fx5iayl29qhC3llqIEo%2BnOq1dNdhRgFlAsg%3D&
> amp;reserved=0

Patch

diff --git a/drivers/pci/controller/dwc/pci-layerscape.c b/drivers/pci/controller/dwc/pci-layerscape.c
index 69f3f1a5a782..b2085988dbee 100644
--- a/drivers/pci/controller/dwc/pci-layerscape.c
+++ b/drivers/pci/controller/dwc/pci-layerscape.c
@@ -88,7 +88,7 @@  static void ls_pcie_disable_outbound_atus(struct ls_pcie *pcie)
 	int i;
 
 	for (i = 0; i < PCIE_IATU_NUM; i++)
-		dw_pcie_disable_atu(pcie->pci, DW_PCIE_REGION_OUTBOUND, i);
+		dw_pcie_disable_atu(pcie->pci, i, DW_PCIE_REGION_OUTBOUND);
 }
 
 static int ls1021_pcie_link_up(struct dw_pcie *pci)