[PATCH 1/2] fsl/pci: fix RC cannot detect PME message coming

[PATCH 1/2] fsl/pci: fix RC cannot detect PME message coming

[Dongsheng Wang]

From: Wang Dongsheng <dongsheng.wang@freescale.com>

PCI controller disable PME message report feature, that shouldn't
have happened. Fix it and enable PME message report feature.

Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 3f415e2..4bd091a 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -1150,8 +1150,7 @@ static int fsl_pci_pme_probe(struct pci_controller *hose)
 	pci = hose->private_data;
 
 	/* Enable PTOD, ENL23D & EXL23D */
-	out_be32(&pci->pex_pme_mes_disr, 0);
-	setbits32(&pci->pex_pme_mes_disr,
+	clrbits32(&pci->pex_pme_mes_disr,
 		  PME_DISR_EN_PTOD | PME_DISR_EN_ENL23D | PME_DISR_EN_EXL23D);
 
 	out_be32(&pci->pex_pme_mes_ier, 0);
-- 
1.8.5

[PATCH 2/2] fsl/pci: fix EP device sometimes hangup when system resume from sleep

[Dongsheng Wang]

From: Wang Dongsheng <dongsheng.wang@freescale.com>

Root cause is pcie power management state transition need a delay.
The delay time define in "PCI Bus Power Management Interface Specification".

D0, D1 or D2 --> D3 need to delay 10ms.
D3 --> D0 need to delay 10ms.

Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 4bd091a..33950ad 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -1175,15 +1175,24 @@ static void send_pme_turnoff_message(struct pci_controller *hose)
 	setbits32(&pci->pex_pmcr, PEX_PMCR_PTOMR);
 
 	/* Wait trun off done */
-	for (i = 0; i < 150; i++) {
+	/* RC will get this detect quickly */
+	for (i = 0; i < 50; i++) {
 		dr = in_be32(&pci->pex_pme_mes_dr);
-		if (dr) {
+		if (dr & ENL23_DETECT_BIT) {
 			out_be32(&pci->pex_pme_mes_dr, dr);
 			break;
 		}
 
 		udelay(1000);
 	}
+
+	/*
+	 * "PCI Bus Power Management Interface Specification" define
+	 * Minimum System Software Guaranteed Delays
+	 *
+	 * D0, D1 or D2 --> D3, need delay 10ms.
+	 */
+	mdelay(10);
 }
 
 static void fsl_pci_syscore_do_suspend(struct pci_controller *hose)
@@ -1211,9 +1220,10 @@ static void fsl_pci_syscore_do_resume(struct pci_controller *hose)
 	setbits32(&pci->pex_pmcr, PEX_PMCR_EXL2S);
 
 	/* Wait exit done */
-	for (i = 0; i < 150; i++) {
+	/* RC will get this detect quickly */
+	for (i = 0; i < 50; i++) {
 		dr = in_be32(&pci->pex_pme_mes_dr);
-		if (dr) {
+		if (dr & EXL23_DETECT_BIT) {
 			out_be32(&pci->pex_pme_mes_dr, dr);
 			break;
 		}
@@ -1221,6 +1231,14 @@ static void fsl_pci_syscore_do_resume(struct pci_controller *hose)
 		udelay(1000);
 	}
 
+	/*
+	 * "PCI Bus Power Management Interface Specification" define
+	 * Minimum System Software Guaranteed Delays
+	 *
+	 * D3 hot --> D0, need delay 10ms.
+	 */
+	mdelay(10);
+
 	setup_pci_atmu(hose);
 }
 
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h
index c1cec77..37fc644 100644
--- a/arch/powerpc/sysdev/fsl_pci.h
+++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -39,6 +39,9 @@ struct platform_device;
 #define PME_DISR_EN_ENL23D	0x00002000
 #define PME_DISR_EN_EXL23D	0x00001000
 
+#define ENL23_DETECT_BIT        0x00002000
+#define EXL23_DETECT_BIT        0x00001000
+
 /* PCI/PCI Express outbound window reg */
 struct pci_outbound_window_regs {
 	__be32	potar;	/* 0x.0 - Outbound translation address register */
-- 
1.8.5

RE: [PATCH 2/2] fsl/pci: fix EP device sometimes hangup when system resume from sleep

[Dongsheng.Wang]

Hi all,

Please ignore this patch. :(
I will resend it. Because I found when e1000 card plug in P1020 PCIe slot 2=
, we need more delay time
to let EP device return back.

Regards,
-Dongsheng

> -----Original Message-----
> From: Dongsheng Wang [mailto:dongsheng.wang@freescale.com]
> Sent: Tuesday, April 15, 2014 3:43 PM
> To: Wood Scott-B07421
> Cc: Zang Roy-R61911; Jin Zhengxiong-R64188; linuxppc-dev@lists.ozlabs.org=
; Wang
> Dongsheng-B40534
> Subject: [PATCH 2/2] fsl/pci: fix EP device sometimes hangup when system =
resume
> from sleep
>=20
> From: Wang Dongsheng <dongsheng.wang@freescale.com>
>=20
> Root cause is pcie power management state transition need a delay.
> The delay time define in "PCI Bus Power Management Interface Specificatio=
n".
>=20
> D0, D1 or D2 --> D3 need to delay 10ms.
> D3 --> D0 need to delay 10ms.
>=20
> Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>
>=20
> diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.=
c
> index 4bd091a..33950ad 100644
> --- a/arch/powerpc/sysdev/fsl_pci.c
> +++ b/arch/powerpc/sysdev/fsl_pci.c
> @@ -1175,15 +1175,24 @@ static void send_pme_turnoff_message(struct
> pci_controller *hose)
>  	setbits32(&pci->pex_pmcr, PEX_PMCR_PTOMR);
>=20
>  	/* Wait trun off done */
> -	for (i =3D 0; i < 150; i++) {
> +	/* RC will get this detect quickly */
> +	for (i =3D 0; i < 50; i++) {
>  		dr =3D in_be32(&pci->pex_pme_mes_dr);
> -		if (dr) {
> +		if (dr & ENL23_DETECT_BIT) {
>  			out_be32(&pci->pex_pme_mes_dr, dr);
>  			break;
>  		}
>=20
>  		udelay(1000);
>  	}
> +
> +	/*
> +	 * "PCI Bus Power Management Interface Specification" define
> +	 * Minimum System Software Guaranteed Delays
> +	 *
> +	 * D0, D1 or D2 --> D3, need delay 10ms.
> +	 */
> +	mdelay(10);
>  }
>=20
>  static void fsl_pci_syscore_do_suspend(struct pci_controller *hose)
> @@ -1211,9 +1220,10 @@ static void fsl_pci_syscore_do_resume(struct
> pci_controller *hose)
>  	setbits32(&pci->pex_pmcr, PEX_PMCR_EXL2S);
>=20
>  	/* Wait exit done */
> -	for (i =3D 0; i < 150; i++) {
> +	/* RC will get this detect quickly */
> +	for (i =3D 0; i < 50; i++) {
>  		dr =3D in_be32(&pci->pex_pme_mes_dr);
> -		if (dr) {
> +		if (dr & EXL23_DETECT_BIT) {
>  			out_be32(&pci->pex_pme_mes_dr, dr);
>  			break;
>  		}
> @@ -1221,6 +1231,14 @@ static void fsl_pci_syscore_do_resume(struct
> pci_controller *hose)
>  		udelay(1000);
>  	}
>=20
> +	/*
> +	 * "PCI Bus Power Management Interface Specification" define
> +	 * Minimum System Software Guaranteed Delays
> +	 *
> +	 * D3 hot --> D0, need delay 10ms.
> +	 */
> +	mdelay(10);
> +
>  	setup_pci_atmu(hose);
>  }
>=20
> diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.=
h
> index c1cec77..37fc644 100644
> --- a/arch/powerpc/sysdev/fsl_pci.h
> +++ b/arch/powerpc/sysdev/fsl_pci.h
> @@ -39,6 +39,9 @@ struct platform_device;
>  #define PME_DISR_EN_ENL23D	0x00002000
>  #define PME_DISR_EN_EXL23D	0x00001000
>=20
> +#define ENL23_DETECT_BIT        0x00002000
> +#define EXL23_DETECT_BIT        0x00001000
> +
>  /* PCI/PCI Express outbound window reg */
>  struct pci_outbound_window_regs {
>  	__be32	potar;	/* 0x.0 - Outbound translation address register */
> --
> 1.8.5
>=20

Re: [PATCH 2/2] fsl/pci: fix EP device sometimes hangup when system resume from sleep

[Scott Wood]

On Tue, 2014-04-15 at 15:43 +0800, Dongsheng Wang wrote:
> From: Wang Dongsheng <dongsheng.wang@freescale.com>
> 
> Root cause is pcie power management state transition need a delay.
> The delay time define in "PCI Bus Power Management Interface Specification".
> 
> D0, D1 or D2 --> D3 need to delay 10ms.
> D3 --> D0 need to delay 10ms.
> 
> Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>

Could you describe the other changes besides the addition of a delay at
the end?

-Scott