[PATCH 1/2] PCI: dwc: Adjust Kconfig to allow IMX6 PCIe host on IMX7

[PATCH 1/2] PCI: dwc: Adjust Kconfig to allow IMX6 PCIe host on IMX7

[Trent Piepho]

The IMX6 PCI-e host driver also supports the IMX7d.  However, the
Kconfig dependencies of the driver prevented it from being enabled
unless the kernel was built with both IMX6 and IMX7 support.  It works
fine to build with only IMX7 support enabled.

Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Richard Zhu <hongxing.zhu@nxp.com>
CC: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Trent Piepho <tpiepho@impinj.com>
---
 drivers/pci/dwc/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
index 22ec82fcdea2..85cf392921a9 100644
--- a/drivers/pci/dwc/Kconfig
+++ b/drivers/pci/dwc/Kconfig
@@ -71,9 +71,9 @@ config PCI_EXYNOS
 	select PCIE_DW_HOST
 
 config PCI_IMX6
-	bool "Freescale i.MX6 PCIe controller"
+	bool "Freescale i.MX6/7 PCIe controller"
 	depends on PCI
-	depends on SOC_IMX6Q
+	depends on SOC_IMX6Q || SOC_IMX7D
 	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIEPORTBUS
 	select PCIE_DW_HOST
-- 
2.13.6


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 1/2] PCI: dwc: Adjust Kconfig to allow IMX6 PCIe host on IMX7

[Trent Piepho]

The IMX6 PCI-e host driver also supports the IMX7d.  However, the
Kconfig dependencies of the driver prevented it from being enabled
unless the kernel was built with both IMX6 and IMX7 support.  It works
fine to build with only IMX7 support enabled.

Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Richard Zhu <hongxing.zhu@nxp.com>
CC: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Trent Piepho <tpiepho@impinj.com>
---
 drivers/pci/dwc/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
index 22ec82fcdea2..85cf392921a9 100644
--- a/drivers/pci/dwc/Kconfig
+++ b/drivers/pci/dwc/Kconfig
@@ -71,9 +71,9 @@ config PCI_EXYNOS
 	select PCIE_DW_HOST
 
 config PCI_IMX6
-	bool "Freescale i.MX6 PCIe controller"
+	bool "Freescale i.MX6/7 PCIe controller"
 	depends on PCI
-	depends on SOC_IMX6Q
+	depends on SOC_IMX6Q || SOC_IMX7D
 	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIEPORTBUS
 	select PCIE_DW_HOST
-- 
2.13.6

[PATCH 2/2] PCI: imx6: Check for link training status in link up check

[Trent Piepho]

This fixes a regression introduced in merge 562df5c8521e.

Prior to this the link up check done by imx6_pcie_wait_for_link()
consisted of a polling loop on imx6_pcie_link_up() (via the former
calling dw_pcie_link_up() which called the latter as callback), and
imx6_pcie_link_up() polled the link status register checking for link
up *and link not still training*.

This was a polling loop inside another polling loop.  And the outermost
loop was duplicated with minor variations in a number of other dwc based
host drivers.

This was addressed in two commits.  Commit 4d107d3b5a68 ("PCI: imx6: Move
link up check into imx6_pcie_wait_for_link()"), changed
imx6_pcie_wait_for_link() to poll the link status register directly,
checking for link up and not training, and made imx6_pcie_link_up() only
check the link up bit (once, not a polling loop).

While commit commit 886bc5ceb5cc ("PCI: designware: Add generic
dw_pcie_wait_for_link()"), replaced the loop in imx6_pcie_wait_for_link()
with a call to a new dwc core function, which polled imx6_pcie_link_up(),
which still checked both link up and not training in a loop.

When these two commits were merged, the version of
imx6_pcie_wait_for_link() from '886 was kept, which eliminated the link
training check placed there by '4d1.  But the version of
imx6_pcie_link_up() from '4d1 was kept, which eliminated the link training
check that had been there and was moved to imx6_pcie_wait_for_link().

There result is no link training check.

Then commit dac29e6c5460 ("PCI: designware: Add default link up check if
sub-driver doesn't override") added a link training check to the default
version of dw_pcie_link_up(), but since imx6 uses imx6_pcie_link_up() it
does not use the default version with this fix.

This commit eliminates imx6_pcie_link_up() so that the default
dw_pcie_link_up() is used.  The default has the correct code and is what
the imx6 driver used to do.

Fixes: 562df5c8521e1371f3cbd0b7b868034da376d714
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Joao Pinto <Joao.Pinto@synopsys.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Trent Piepho <tpiepho@impinj.com>
---
 drivers/pci/dwc/pci-imx6.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c
index b73483534a5b..1f1069b70e45 100644
--- a/drivers/pci/dwc/pci-imx6.c
+++ b/drivers/pci/dwc/pci-imx6.c
@@ -83,8 +83,6 @@ struct imx6_pcie {
 #define PCIE_PL_PFLR_FORCE_LINK			(1 << 15)
 #define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28)
 #define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c)
-#define PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING	(1 << 29)
-#define PCIE_PHY_DEBUG_R1_XMLH_LINK_UP		(1 << 4)
 
 #define PCIE_PHY_CTRL (PL_OFFSET + 0x114)
 #define PCIE_PHY_CTRL_DATA_LOC 0
@@ -653,12 +651,6 @@ static int imx6_pcie_host_init(struct pcie_port *pp)
 	return 0;
 }
 
-static int imx6_pcie_link_up(struct dw_pcie *pci)
-{
-	return dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1) &
-			PCIE_PHY_DEBUG_R1_XMLH_LINK_UP;
-}
-
 static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
 	.host_init = imx6_pcie_host_init,
 };
@@ -701,7 +693,7 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
 }
 
 static const struct dw_pcie_ops dw_pcie_ops = {
-	.link_up = imx6_pcie_link_up,
+	/* No special ops needed, but pcie-designware still expects this struct */
 };
 
 static int imx6_pcie_probe(struct platform_device *pdev)
-- 
2.13.6


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/2] PCI: imx6: Check for link training status in link up check

[Trent Piepho]

This fixes a regression introduced in merge 562df5c8521e.

Prior to this the link up check done by imx6_pcie_wait_for_link()
consisted of a polling loop on imx6_pcie_link_up() (via the former
calling dw_pcie_link_up() which called the latter as callback), and
imx6_pcie_link_up() polled the link status register checking for link
up *and link not still training*.

This was a polling loop inside another polling loop.  And the outermost
loop was duplicated with minor variations in a number of other dwc based
host drivers.

This was addressed in two commits.  Commit 4d107d3b5a68 ("PCI: imx6: Move
link up check into imx6_pcie_wait_for_link()"), changed
imx6_pcie_wait_for_link() to poll the link status register directly,
checking for link up and not training, and made imx6_pcie_link_up() only
check the link up bit (once, not a polling loop).

While commit commit 886bc5ceb5cc ("PCI: designware: Add generic
dw_pcie_wait_for_link()"), replaced the loop in imx6_pcie_wait_for_link()
with a call to a new dwc core function, which polled imx6_pcie_link_up(),
which still checked both link up and not training in a loop.

When these two commits were merged, the version of
imx6_pcie_wait_for_link() from '886 was kept, which eliminated the link
training check placed there by '4d1.  But the version of
imx6_pcie_link_up() from '4d1 was kept, which eliminated the link training
check that had been there and was moved to imx6_pcie_wait_for_link().

There result is no link training check.

Then commit dac29e6c5460 ("PCI: designware: Add default link up check if
sub-driver doesn't override") added a link training check to the default
version of dw_pcie_link_up(), but since imx6 uses imx6_pcie_link_up() it
does not use the default version with this fix.

This commit eliminates imx6_pcie_link_up() so that the default
dw_pcie_link_up() is used.  The default has the correct code and is what
the imx6 driver used to do.

Fixes: 562df5c8521e1371f3cbd0b7b868034da376d714
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Joao Pinto <Joao.Pinto@synopsys.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Trent Piepho <tpiepho@impinj.com>
---
 drivers/pci/dwc/pci-imx6.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c
index b73483534a5b..1f1069b70e45 100644
--- a/drivers/pci/dwc/pci-imx6.c
+++ b/drivers/pci/dwc/pci-imx6.c
@@ -83,8 +83,6 @@ struct imx6_pcie {
 #define PCIE_PL_PFLR_FORCE_LINK			(1 << 15)
 #define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28)
 #define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c)
-#define PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING	(1 << 29)
-#define PCIE_PHY_DEBUG_R1_XMLH_LINK_UP		(1 << 4)
 
 #define PCIE_PHY_CTRL (PL_OFFSET + 0x114)
 #define PCIE_PHY_CTRL_DATA_LOC 0
@@ -653,12 +651,6 @@ static int imx6_pcie_host_init(struct pcie_port *pp)
 	return 0;
 }
 
-static int imx6_pcie_link_up(struct dw_pcie *pci)
-{
-	return dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1) &
-			PCIE_PHY_DEBUG_R1_XMLH_LINK_UP;
-}
-
 static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
 	.host_init = imx6_pcie_host_init,
 };
@@ -701,7 +693,7 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
 }
 
 static const struct dw_pcie_ops dw_pcie_ops = {
-	.link_up = imx6_pcie_link_up,
+	/* No special ops needed, but pcie-designware still expects this struct */
 };
 
 static int imx6_pcie_probe(struct platform_device *pdev)
-- 
2.13.6

Re: [PATCH 1/2] PCI: dwc: Adjust Kconfig to allow IMX6 PCIe host on IMX7

[Lucas Stach]

QW0gTW9udGFnLCBkZW4gMTYuMTAuMjAxNywgMTc6MTEgLTA3MDAgc2NocmllYiBUcmVudCBQaWVw
aG86Cj4gVGhlIElNWDYgUENJLWUgaG9zdCBkcml2ZXIgYWxzbyBzdXBwb3J0cyB0aGUgSU1YN2Qu
wqDCoEhvd2V2ZXIsIHRoZQo+IEtjb25maWcgZGVwZW5kZW5jaWVzIG9mIHRoZSBkcml2ZXIgcHJl
dmVudGVkIGl0IGZyb20gYmVpbmcgZW5hYmxlZAo+IHVubGVzcyB0aGUga2VybmVsIHdhcyBidWls
dCB3aXRoIGJvdGggSU1YNiBhbmQgSU1YNyBzdXBwb3J0LsKgwqBJdAo+IHdvcmtzCj4gZmluZSB0
byBidWlsZCB3aXRoIG9ubHkgSU1YNyBzdXBwb3J0IGVuYWJsZWQuCj4gCj4gQ2M6IEFuZHJleSBT
bWlybm92IDxhbmRyZXcuc21pcm5vdkBnbWFpbC5jb20+Cj4gQ2M6IFJpY2hhcmQgWmh1IDxob25n
eGluZy56aHVAbnhwLmNvbT4KPiBDQzogTHVjYXMgU3RhY2ggPGwuc3RhY2hAcGVuZ3V0cm9uaXgu
ZGU+Cj4gU2lnbmVkLW9mZi1ieTogVHJlbnQgUGllcGhvIDx0cGllcGhvQGltcGluai5jb20+CgpS
ZXZpZXdlZC1ieTogTHVjYXMgU3RhY2ggPGwuc3RhY2hAcGVuZ3V0cm9uaXguZGU+Cgo+IC0tLQo+
IMKgZHJpdmVycy9wY2kvZHdjL0tjb25maWcgfCA0ICsrLS0KPiDCoDEgZmlsZSBjaGFuZ2VkLCAy
IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv
cGNpL2R3Yy9LY29uZmlnIGIvZHJpdmVycy9wY2kvZHdjL0tjb25maWcKPiBpbmRleCAyMmVjODJm
Y2RlYTIuLjg1Y2YzOTI5MjFhOSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3BjaS9kd2MvS2NvbmZp
Zwo+ICsrKyBiL2RyaXZlcnMvcGNpL2R3Yy9LY29uZmlnCj4gQEAgLTcxLDkgKzcxLDkgQEAgY29u
ZmlnIFBDSV9FWFlOT1MKPiDCoAlzZWxlY3QgUENJRV9EV19IT1NUCj4gwqAKPiDCoGNvbmZpZyBQ
Q0lfSU1YNgo+IC0JYm9vbCAiRnJlZXNjYWxlIGkuTVg2IFBDSWUgY29udHJvbGxlciIKPiArCWJv
b2wgIkZyZWVzY2FsZSBpLk1YNi83IFBDSWUgY29udHJvbGxlciIKPiDCoAlkZXBlbmRzIG9uIFBD
SQo+IC0JZGVwZW5kcyBvbiBTT0NfSU1YNlEKPiArCWRlcGVuZHMgb24gU09DX0lNWDZRIHx8IFNP
Q19JTVg3RAo+IMKgCWRlcGVuZHMgb24gUENJX01TSV9JUlFfRE9NQUlOCj4gwqAJc2VsZWN0IFBD
SUVQT1JUQlVTCj4gwqAJc2VsZWN0IFBDSUVfRFdfSE9TVAoKX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QK
bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRl
YWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=

[PATCH 1/2] PCI: dwc: Adjust Kconfig to allow IMX6 PCIe host on IMX7

[Lucas Stach]

Am Montag, den 16.10.2017, 17:11 -0700 schrieb Trent Piepho:
> The IMX6 PCI-e host driver also supports the IMX7d.??However, the
> Kconfig dependencies of the driver prevented it from being enabled
> unless the kernel was built with both IMX6 and IMX7 support.??It
> works
> fine to build with only IMX7 support enabled.
> 
> Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
> Cc: Richard Zhu <hongxing.zhu@nxp.com>
> CC: Lucas Stach <l.stach@pengutronix.de>
> Signed-off-by: Trent Piepho <tpiepho@impinj.com>

Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

> ---
> ?drivers/pci/dwc/Kconfig | 4 ++--
> ?1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
> index 22ec82fcdea2..85cf392921a9 100644
> --- a/drivers/pci/dwc/Kconfig
> +++ b/drivers/pci/dwc/Kconfig
> @@ -71,9 +71,9 @@ config PCI_EXYNOS
> ?	select PCIE_DW_HOST
> ?
> ?config PCI_IMX6
> -	bool "Freescale i.MX6 PCIe controller"
> +	bool "Freescale i.MX6/7 PCIe controller"
> ?	depends on PCI
> -	depends on SOC_IMX6Q
> +	depends on SOC_IMX6Q || SOC_IMX7D
> ?	depends on PCI_MSI_IRQ_DOMAIN
> ?	select PCIEPORTBUS
> ?	select PCIE_DW_HOST

Re: [PATCH 2/2] PCI: imx6: Check for link training status in link up check

[Lucas Stach]

QW0gTW9udGFnLCBkZW4gMTYuMTAuMjAxNywgMTc6MTEgLTA3MDAgc2NocmllYiBUcmVudCBQaWVw
aG86Cj4gVGhpcyBmaXhlcyBhIHJlZ3Jlc3Npb24gaW50cm9kdWNlZCBpbiBtZXJnZSA1NjJkZjVj
ODUyMWUuCj4gCj4gUHJpb3IgdG8gdGhpcyB0aGUgbGluayB1cCBjaGVjayBkb25lIGJ5IGlteDZf
cGNpZV93YWl0X2Zvcl9saW5rKCkKPiBjb25zaXN0ZWQgb2YgYSBwb2xsaW5nIGxvb3Agb24gaW14
Nl9wY2llX2xpbmtfdXAoKSAodmlhIHRoZSBmb3JtZXIKPiBjYWxsaW5nIGR3X3BjaWVfbGlua191
cCgpIHdoaWNoIGNhbGxlZCB0aGUgbGF0dGVyIGFzIGNhbGxiYWNrKSwgYW5kCj4gaW14Nl9wY2ll
X2xpbmtfdXAoKSBwb2xsZWQgdGhlIGxpbmsgc3RhdHVzIHJlZ2lzdGVyIGNoZWNraW5nIGZvciBs
aW5rCj4gdXAgKmFuZCBsaW5rIG5vdCBzdGlsbCB0cmFpbmluZyouCj4gCj4gVGhpcyB3YXMgYSBw
b2xsaW5nIGxvb3AgaW5zaWRlIGFub3RoZXIgcG9sbGluZyBsb29wLsKgwqBBbmQgdGhlIG91dGVy
bW9zdAo+IGxvb3Agd2FzIGR1cGxpY2F0ZWQgd2l0aCBtaW5vciB2YXJpYXRpb25zIGluIGEgbnVt
YmVyIG9mIG90aGVyIGR3YyBiYXNlZAo+IGhvc3QgZHJpdmVycy4KPiAKPiBUaGlzIHdhcyBhZGRy
ZXNzZWQgaW4gdHdvIGNvbW1pdHMuwqDCoENvbW1pdCA0ZDEwN2QzYjVhNjggKCJQQ0k6IGlteDY6
IE1vdmUKPiBsaW5rIHVwIGNoZWNrIGludG8gaW14Nl9wY2llX3dhaXRfZm9yX2xpbmsoKSIpLCBj
aGFuZ2VkCj4gaW14Nl9wY2llX3dhaXRfZm9yX2xpbmsoKSB0byBwb2xsIHRoZSBsaW5rIHN0YXR1
cyByZWdpc3RlciBkaXJlY3RseSwKPiBjaGVja2luZyBmb3IgbGluayB1cCBhbmQgbm90IHRyYWlu
aW5nLCBhbmQgbWFkZSBpbXg2X3BjaWVfbGlua191cCgpIG9ubHkKPiBjaGVjayB0aGUgbGluayB1
cCBiaXQgKG9uY2UsIG5vdCBhIHBvbGxpbmcgbG9vcCkuCj4gCj4gV2hpbGUgY29tbWl0IGNvbW1p
dCA4ODZiYzVjZWI1Y2MgKCJQQ0k6IGRlc2lnbndhcmU6IEFkZCBnZW5lcmljCj4gZHdfcGNpZV93
YWl0X2Zvcl9saW5rKCkiKSwgcmVwbGFjZWQgdGhlIGxvb3AgaW4gaW14Nl9wY2llX3dhaXRfZm9y
X2xpbmsoKQo+IHdpdGggYSBjYWxsIHRvIGEgbmV3IGR3YyBjb3JlIGZ1bmN0aW9uLCB3aGljaCBw
b2xsZWQgaW14Nl9wY2llX2xpbmtfdXAoKSwKPiB3aGljaCBzdGlsbCBjaGVja2VkIGJvdGggbGlu
ayB1cCBhbmQgbm90IHRyYWluaW5nIGluIGEgbG9vcC4KPiAKPiBXaGVuIHRoZXNlIHR3byBjb21t
aXRzIHdlcmUgbWVyZ2VkLCB0aGUgdmVyc2lvbiBvZgo+IGlteDZfcGNpZV93YWl0X2Zvcl9saW5r
KCkgZnJvbSAnODg2IHdhcyBrZXB0LCB3aGljaCBlbGltaW5hdGVkIHRoZSBsaW5rCj4gdHJhaW5p
bmcgY2hlY2sgcGxhY2VkIHRoZXJlIGJ5ICc0ZDEuwqDCoEJ1dCB0aGUgdmVyc2lvbiBvZgo+IGlt
eDZfcGNpZV9saW5rX3VwKCkgZnJvbSAnNGQxIHdhcyBrZXB0LCB3aGljaCBlbGltaW5hdGVkIHRo
ZSBsaW5rIHRyYWluaW5nCj4gY2hlY2sgdGhhdCBoYWQgYmVlbiB0aGVyZSBhbmQgd2FzIG1vdmVk
IHRvIGlteDZfcGNpZV93YWl0X2Zvcl9saW5rKCkuCj4gCj4gVGhlcmUgcmVzdWx0IGlzIG5vIGxp
bmsgdHJhaW5pbmcgY2hlY2suCj4gCj4gVGhlbiBjb21taXQgZGFjMjllNmM1NDYwICgiUENJOiBk
ZXNpZ253YXJlOiBBZGQgZGVmYXVsdCBsaW5rIHVwIGNoZWNrIGlmCj4gc3ViLWRyaXZlciBkb2Vz
bid0IG92ZXJyaWRlIikKCkkgdGhpbmsgeW91IG1lYW50IDAxYzA3NjczMmU4MiAoUENJOiBkZXNp
Z253YXJlOiBDaGVjayBMVFNTTSB0cmFpbmluZwpiaXQgYmVmb3JlIGRlY2lkaW5nIGxpbmsgaXMg
dXApIGhlcmUuCgo+ICBhZGRlZCBhIGxpbmsgdHJhaW5pbmcgY2hlY2sgdG8gdGhlIGRlZmF1bHQK
PiB2ZXJzaW9uIG9mIGR3X3BjaWVfbGlua191cCgpLCBidXQgc2luY2UgaW14NiB1c2VzIGlteDZf
cGNpZV9saW5rX3VwKCkgaXQKPiBkb2VzIG5vdCB1c2UgdGhlIGRlZmF1bHQgdmVyc2lvbiB3aXRo
IHRoaXMgZml4Lgo+IAo+IFRoaXMgY29tbWl0IGVsaW1pbmF0ZXMgaW14Nl9wY2llX2xpbmtfdXAo
KSBzbyB0aGF0IHRoZSBkZWZhdWx0Cj4gZHdfcGNpZV9saW5rX3VwKCkgaXMgdXNlZC7CoMKgVGhl
IGRlZmF1bHQgaGFzIHRoZSBjb3JyZWN0IGNvZGUgYW5kIGlzIHdoYXQKPiB0aGUgaW14NiBkcml2
ZXIgdXNlZCB0byBkby4KPiAKPiBGaXhlczogNTYyZGY1Yzg1MjFlMTM3MWYzY2JkMGI3Yjg2ODAz
NGRhMzc2ZDcxNAo+ID4gQ2M6IEJqb3JuIEhlbGdhYXMgPGJoZWxnYWFzQGdvb2dsZS5jb20+Cj4g
PiBDYzogSm9hbyBQaW50byA8Sm9hby5QaW50b0BzeW5vcHN5cy5jb20+Cj4gPiBDYzogTHVjYXMg
U3RhY2ggPGwuc3RhY2hAcGVuZ3V0cm9uaXguZGU+Cj4gU2lnbmVkLW9mZi1ieTogVHJlbnQgUGll
cGhvIDx0cGllcGhvQGltcGluai5jb20+CgpXaXRoIHRoZSBjb21taXQgbWVzc2FnZSBmaXhlZDoK
ClJldmlld2VkLWJ5OiBMdWNhcyBTdGFjaCA8bC5zdGFjaEBwZW5ndXRyb25peC5kZT4KCj4gLS0t
Cj4gwqBkcml2ZXJzL3BjaS9kd2MvcGNpLWlteDYuYyB8IDEwICstLS0tLS0tLS0KPiDCoDEgZmls
ZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgOSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0
IGEvZHJpdmVycy9wY2kvZHdjL3BjaS1pbXg2LmMgYi9kcml2ZXJzL3BjaS9kd2MvcGNpLWlteDYu
Ywo+IGluZGV4IGI3MzQ4MzUzNGE1Yi4uMWYxMDY5YjcwZTQ1IDEwMDY0NAo+IC0tLSBhL2RyaXZl
cnMvcGNpL2R3Yy9wY2ktaW14Ni5jCj4gKysrIGIvZHJpdmVycy9wY2kvZHdjL3BjaS1pbXg2LmMK
PiBAQCAtODMsOCArODMsNiBAQCBzdHJ1Y3QgaW14Nl9wY2llIHsKPiA+IMKgI2RlZmluZSBQQ0lF
X1BMX1BGTFJfRk9SQ0VfTElOSwkJCSgxIDw8IDE1KQo+IMKgI2RlZmluZSBQQ0lFX1BIWV9ERUJV
R19SMCAoUExfT0ZGU0VUICsgMHgyOCkKPiDCoCNkZWZpbmUgUENJRV9QSFlfREVCVUdfUjEgKFBM
X09GRlNFVCArIDB4MmMpCj4gPiAtI2RlZmluZSBQQ0lFX1BIWV9ERUJVR19SMV9YTUxIX0xJTktf
SU5fVFJBSU5JTkcJKDEgPDwgMjkpCj4gPiAtI2RlZmluZSBQQ0lFX1BIWV9ERUJVR19SMV9YTUxI
X0xJTktfVVAJCSgxIDw8IDQpCj4gwqAKPiDCoCNkZWZpbmUgUENJRV9QSFlfQ1RSTCAoUExfT0ZG
U0VUICsgMHgxMTQpCj4gwqAjZGVmaW5lIFBDSUVfUEhZX0NUUkxfREFUQV9MT0MgMAo+IEBAIC02
NTMsMTIgKzY1MSw2IEBAIHN0YXRpYyBpbnQgaW14Nl9wY2llX2hvc3RfaW5pdChzdHJ1Y3QgcGNp
ZV9wb3J0ICpwcCkKPiA+IMKgCXJldHVybiAwOwo+IMKgfQo+IMKgCj4gLXN0YXRpYyBpbnQgaW14
Nl9wY2llX2xpbmtfdXAoc3RydWN0IGR3X3BjaWUgKnBjaSkKPiAtewo+ID4gLQlyZXR1cm4gZHdf
cGNpZV9yZWFkbF9kYmkocGNpLCBQQ0lFX1BIWV9ERUJVR19SMSkgJgo+ID4gLQkJCVBDSUVfUEhZ
X0RFQlVHX1IxX1hNTEhfTElOS19VUDsKPiAtfQo+IC0KPiDCoHN0YXRpYyBjb25zdCBzdHJ1Y3Qg
ZHdfcGNpZV9ob3N0X29wcyBpbXg2X3BjaWVfaG9zdF9vcHMgPSB7Cj4gPiDCoAkuaG9zdF9pbml0
ID0gaW14Nl9wY2llX2hvc3RfaW5pdCwKPiDCoH07Cj4gQEAgLTcwMSw3ICs2OTMsNyBAQCBzdGF0
aWMgaW50IGlteDZfYWRkX3BjaWVfcG9ydChzdHJ1Y3QgaW14Nl9wY2llICppbXg2X3BjaWUsCj4g
wqB9Cj4gwqAKPiDCoHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHdfcGNpZV9vcHMgZHdfcGNpZV9vcHMg
PSB7Cj4gPiAtCS5saW5rX3VwID0gaW14Nl9wY2llX2xpbmtfdXAsCj4gPiArCS8qIE5vIHNwZWNp
YWwgb3BzIG5lZWRlZCwgYnV0IHBjaWUtZGVzaWdud2FyZSBzdGlsbCBleHBlY3RzIHRoaXMgc3Ry
dWN0ICovCj4gwqB9Owo+IMKgCj4gwqBzdGF0aWMgaW50IGlteDZfcGNpZV9wcm9iZShzdHJ1Y3Qg
cGxhdGZvcm1fZGV2aWNlICpwZGV2KQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtl
cm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxt
YW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=

[PATCH 2/2] PCI: imx6: Check for link training status in link up check

[Lucas Stach]

Am Montag, den 16.10.2017, 17:11 -0700 schrieb Trent Piepho:
> This fixes a regression introduced in merge 562df5c8521e.
> 
> Prior to this the link up check done by imx6_pcie_wait_for_link()
> consisted of a polling loop on imx6_pcie_link_up() (via the former
> calling dw_pcie_link_up() which called the latter as callback), and
> imx6_pcie_link_up() polled the link status register checking for link
> up *and link not still training*.
> 
> This was a polling loop inside another polling loop.??And the outermost
> loop was duplicated with minor variations in a number of other dwc based
> host drivers.
> 
> This was addressed in two commits.??Commit 4d107d3b5a68 ("PCI: imx6: Move
> link up check into imx6_pcie_wait_for_link()"), changed
> imx6_pcie_wait_for_link() to poll the link status register directly,
> checking for link up and not training, and made imx6_pcie_link_up() only
> check the link up bit (once, not a polling loop).
> 
> While commit commit 886bc5ceb5cc ("PCI: designware: Add generic
> dw_pcie_wait_for_link()"), replaced the loop in imx6_pcie_wait_for_link()
> with a call to a new dwc core function, which polled imx6_pcie_link_up(),
> which still checked both link up and not training in a loop.
> 
> When these two commits were merged, the version of
> imx6_pcie_wait_for_link() from '886 was kept, which eliminated the link
> training check placed there by '4d1.??But the version of
> imx6_pcie_link_up() from '4d1 was kept, which eliminated the link training
> check that had been there and was moved to imx6_pcie_wait_for_link().
> 
> There result is no link training check.
> 
> Then commit dac29e6c5460 ("PCI: designware: Add default link up check if
> sub-driver doesn't override")

I think you meant 01c076732e82 (PCI: designware: Check LTSSM training
bit before deciding link is up) here.

>  added a link training check to the default
> version of dw_pcie_link_up(), but since imx6 uses imx6_pcie_link_up() it
> does not use the default version with this fix.
> 
> This commit eliminates imx6_pcie_link_up() so that the default
> dw_pcie_link_up() is used.??The default has the correct code and is what
> the imx6 driver used to do.
> 
> Fixes: 562df5c8521e1371f3cbd0b7b868034da376d714
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: Joao Pinto <Joao.Pinto@synopsys.com>
> > Cc: Lucas Stach <l.stach@pengutronix.de>
> Signed-off-by: Trent Piepho <tpiepho@impinj.com>

With the commit message fixed:

Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

> ---
> ?drivers/pci/dwc/pci-imx6.c | 10 +---------
> ?1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c
> index b73483534a5b..1f1069b70e45 100644
> --- a/drivers/pci/dwc/pci-imx6.c
> +++ b/drivers/pci/dwc/pci-imx6.c
> @@ -83,8 +83,6 @@ struct imx6_pcie {
> > ?#define PCIE_PL_PFLR_FORCE_LINK			(1 << 15)
> ?#define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28)
> ?#define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c)
> > -#define PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING	(1 << 29)
> > -#define PCIE_PHY_DEBUG_R1_XMLH_LINK_UP		(1 << 4)
> ?
> ?#define PCIE_PHY_CTRL (PL_OFFSET + 0x114)
> ?#define PCIE_PHY_CTRL_DATA_LOC 0
> @@ -653,12 +651,6 @@ static int imx6_pcie_host_init(struct pcie_port *pp)
> > ?	return 0;
> ?}
> ?
> -static int imx6_pcie_link_up(struct dw_pcie *pci)
> -{
> > -	return dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1) &
> > -			PCIE_PHY_DEBUG_R1_XMLH_LINK_UP;
> -}
> -
> ?static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
> > ?	.host_init = imx6_pcie_host_init,
> ?};
> @@ -701,7 +693,7 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
> ?}
> ?
> ?static const struct dw_pcie_ops dw_pcie_ops = {
> > -	.link_up = imx6_pcie_link_up,
> > +	/* No special ops needed, but pcie-designware still expects this struct */
> ?};
> ?
> ?static int imx6_pcie_probe(struct platform_device *pdev)

Re: [PATCH 2/2] PCI: imx6: Check for link training status in link up check

[Trent Piepho]

On Tue, 2017-10-17 at 10:44 +0200, Lucas Stach wrote:
> Am Montag, den 16.10.2017, 17:11 -0700 schrieb Trent Piepho:
> > 
> > 
> > There result is no link training check.
> > 
> > Then commit dac29e6c5460 ("PCI: designware: Add default link up check if
> > sub-driver doesn't override")
> 
> I think you meant 01c076732e82 (PCI: designware: Check LTSSM training
> bit before deciding link is up) here.
> 
> >  added a link training check to the default
> > version of dw_pcie_link_up(), but since imx6 uses imx6_pcie_link_up() it
> > does not use the default version with this fix.

It was really the combination of both commits.  'dac added the common
link up check, which imx6 didn't use, and then '01c added the training
check to it.  It appears I've attributed both changes to 'dac in my
message and forgot '01c.  I'll fix.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/2] PCI: imx6: Check for link training status in link up check

[Trent Piepho]

On Tue, 2017-10-17 at 10:44 +0200, Lucas Stach wrote:
> Am Montag, den 16.10.2017, 17:11 -0700 schrieb Trent Piepho:
> > 
> > 
> > There result is no link training check.
> > 
> > Then commit dac29e6c5460 ("PCI: designware: Add default link up check if
> > sub-driver doesn't override")
> 
> I think you meant 01c076732e82 (PCI: designware: Check LTSSM training
> bit before deciding link is up) here.
> 
> >  added a link training check to the default
> > version of dw_pcie_link_up(), but since imx6 uses imx6_pcie_link_up() it
> > does not use the default version with this fix.

It was really the combination of both commits.  'dac added the common
link up check, which imx6 didn't use, and then '01c added the training
check to it.  It appears I've attributed both changes to 'dac in my
message and forgot '01c.  I'll fix.