diff mbox

[U-Boot] Revert "T2080QDS/PCIe: Soft Reset PCIe on T2080QDS for down-training issue"

Message ID 1460364798-44182-1-git-send-email-qiang.zhao@nxp.com
State Deferred
Delegated to: York Sun
Headers show

Commit Message

Qiang Zhao April 11, 2016, 8:53 a.m. UTC 
This reverts commit 5066e62847bddf6030262ade2aa3e7bcdc930037.

The reverted patch will block t2080RDB iNiC, it was a workaround for
T2080QDS
down-training issue, we need to revert it and find the root cause for
T2080QDS
down-training issue.

Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
 drivers/pci/fsl_pci_init.c | 15 ---------------
 include/configs/T208xQDS.h |  1 -
 2 files changed, 16 deletions(-)

Comments

York Sun April 20, 2016, 4:57 p.m. UTC | #1 
On 04/11/2016 02:02 AM, Zhao Qiang wrote:
> This reverts commit 5066e62847bddf6030262ade2aa3e7bcdc930037.
> 
> The reverted patch will block t2080RDB iNiC, it was a workaround for
> T2080QDS
> down-training issue, we need to revert it and find the root cause for
> T2080QDS
> down-training issue.

You have a bad wrap-back in commit message.

Does the workaround block anything? Can you revert it after figuring out the
root cause?

York

> 
> Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
> ---
>  drivers/pci/fsl_pci_init.c | 15 ---------------
>  include/configs/T208xQDS.h |  1 -
>  2 files changed, 16 deletions(-)
> 
> diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
> index 52792dc..1143178 100644
> --- a/drivers/pci/fsl_pci_init.c
> +++ b/drivers/pci/fsl_pci_init.c
> @@ -444,21 +444,6 @@ void fsl_pci_init(struct pci_controller *hose, struct fsl_pci_info *pci_info)
>  			ltssm = (in_be32(&pci->pex_csr0)
>  				& PEX_CSR0_LTSSM_MASK) >> PEX_CSR0_LTSSM_SHIFT;
>  			enabled = (ltssm == 0x11) ? 1 : 0;
> -#ifdef CONFIG_FSL_PCIE_RESET
> -			int i;
> -			/* assert PCIe reset */
> -			setbits_be32(&pci->pdb_stat, 0x08000000);
> -			(void) in_be32(&pci->pdb_stat);
> -			udelay(1000);
> -			/* clear PCIe reset */
> -			clrbits_be32(&pci->pdb_stat, 0x08000000);
> -			asm("sync;isync");
> -			for (i = 0; i < 100 && ltssm < PCI_LTSSM_L0; i++) {
> -				pci_hose_read_config_word(hose, dev, PCI_LTSSM,
> -							  &ltssm);
> -				udelay(1000);
> -			}
> -#endif
>  		} else {
>  		/* pci_hose_read_config_word(hose, dev, PCI_LTSSM, &ltssm); */
>  		/* enabled = ltssm >= PCI_LTSSM_L0; */
> diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
> index 5957fa8..c895818 100644
> --- a/include/configs/T208xQDS.h
> +++ b/include/configs/T208xQDS.h
> @@ -559,7 +559,6 @@ unsigned long get_board_ddr_clk(void);
>  #define CONFIG_PCIE2		/* PCIE controler 2 */
>  #define CONFIG_PCIE3		/* PCIE controler 3 */
>  #define CONFIG_PCIE4		/* PCIE controler 4 */
> -#define CONFIG_FSL_PCIE_RESET
>  #define CONFIG_FSL_PCI_INIT	/* Use common FSL init code */
>  #define CONFIG_SYS_PCI_64BIT	/* enable 64-bit PCI resources */
>  /* controller 1, direct to uli, tgtid 3, Base address 20000 */
>
Qiang Zhao April 21, 2016, 1:05 a.m. UTC | #2 
On 04/21/2016 12:58 AM, York Sun wrote:
> -----Original Message-----
> From: York Sun [mailto:york.sun@nxp.com]
> Sent: Thursday, April 21, 2016 12:58 AM
> To: Qiang Zhao <qiang.zhao@nxp.com>
> Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; u-boot@lists.denx.de
> Subject: Re: [PATCH] Revert "T2080QDS/PCIe: Soft Reset PCIe on T2080QDS for
> down-training issue"
> 
> On 04/11/2016 02:02 AM, Zhao Qiang wrote:
> > This reverts commit 5066e62847bddf6030262ade2aa3e7bcdc930037.
> >
> > The reverted patch will block t2080RDB iNiC, it was a workaround for
> > T2080QDS down-training issue, we need to revert it and find the root
> > cause for T2080QDS down-training issue.
> 
> You have a bad wrap-back in commit message.
> 
> Does the workaround block anything? Can you revert it after figuring out the
> root cause?
> 

Yes, it blocks t2080RDB and c29x when using them as iNIC.
If revert it after figuring out the root cause, how about iNIC?
And I am afraid of it is a hard way to find the root cause.

> 
> >
> > Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
> > ---
> >  drivers/pci/fsl_pci_init.c | 15 ---------------
> > include/configs/T208xQDS.h |  1 -
> >  2 files changed, 16 deletions(-)
> >
> > diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
> > index 52792dc..1143178 100644
> > --- a/drivers/pci/fsl_pci_init.c
> > +++ b/drivers/pci/fsl_pci_init.c
> > @@ -444,21 +444,6 @@ void fsl_pci_init(struct pci_controller *hose, struct
> fsl_pci_info *pci_info)
> >  			ltssm = (in_be32(&pci->pex_csr0)
> >  				& PEX_CSR0_LTSSM_MASK) >>
> PEX_CSR0_LTSSM_SHIFT;
> >  			enabled = (ltssm == 0x11) ? 1 : 0; -#ifdef
> CONFIG_FSL_PCIE_RESET
> > -			int i;
> > -			/* assert PCIe reset */
> > -			setbits_be32(&pci->pdb_stat, 0x08000000);
> > -			(void) in_be32(&pci->pdb_stat);
> > -			udelay(1000);
> > -			/* clear PCIe reset */
> > -			clrbits_be32(&pci->pdb_stat, 0x08000000);
> > -			asm("sync;isync");
> > -			for (i = 0; i < 100 && ltssm < PCI_LTSSM_L0; i++) {
> > -				pci_hose_read_config_word(hose, dev,
> PCI_LTSSM,
> > -							  &ltssm);
> > -				udelay(1000);
> > -			}
> > -#endif
> >  		} else {
> >  		/* pci_hose_read_config_word(hose, dev, PCI_LTSSM, &ltssm);
> */
> >  		/* enabled = ltssm >= PCI_LTSSM_L0; */ diff --git
> > a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index
> > 5957fa8..c895818 100644
> > --- a/include/configs/T208xQDS.h
> > +++ b/include/configs/T208xQDS.h
> > @@ -559,7 +559,6 @@ unsigned long get_board_ddr_clk(void);
> >  #define CONFIG_PCIE2		/* PCIE controler 2 */
> >  #define CONFIG_PCIE3		/* PCIE controler 3 */
> >  #define CONFIG_PCIE4		/* PCIE controler 4 */
> > -#define CONFIG_FSL_PCIE_RESET
> >  #define CONFIG_FSL_PCI_INIT	/* Use common FSL init code */
> >  #define CONFIG_SYS_PCI_64BIT	/* enable 64-bit PCI resources */
> >  /* controller 1, direct to uli, tgtid 3, Base address 20000 */
> >
York Sun April 21, 2016, 1:12 a.m. UTC | #3 
+Roy to comment on iNIC.

On 04/20/2016 06:05 PM, Qiang Zhao wrote:
> On 04/21/2016 12:58 AM, York Sun wrote:
>> -----Original Message-----
>> From: York Sun [mailto:york.sun@nxp.com]
>> Sent: Thursday, April 21, 2016 12:58 AM
>> To: Qiang Zhao <qiang.zhao@nxp.com>
>> Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; u-boot@lists.denx.de
>> Subject: Re: [PATCH] Revert "T2080QDS/PCIe: Soft Reset PCIe on T2080QDS for
>> down-training issue"
>>
>> On 04/11/2016 02:02 AM, Zhao Qiang wrote:
>>> This reverts commit 5066e62847bddf6030262ade2aa3e7bcdc930037.
>>>
>>> The reverted patch will block t2080RDB iNiC, it was a workaround for
>>> T2080QDS down-training issue, we need to revert it and find the root
>>> cause for T2080QDS down-training issue.
>>
>> You have a bad wrap-back in commit message.
>>
>> Does the workaround block anything? Can you revert it after figuring out the
>> root cause?
>>
> 
> Yes, it blocks t2080RDB and c29x when using them as iNIC.
> If revert it after figuring out the root cause, how about iNIC?
> And I am afraid of it is a hard way to find the root cause.
> 

Qiang,

You delete the code gated by CONFIG_FSL_PCIE_RESET, and the macro for T208xQDS.
How does that affect T2080RDB or C29x?

York
York Sun July 19, 2016, 10:04 p.m. UTC | #4 
On 04/20/2016 06:12 PM, York Sun wrote:
> +Roy to comment on iNIC.
>
> On 04/20/2016 06:05 PM, Qiang Zhao wrote:
>> On 04/21/2016 12:58 AM, York Sun wrote:
>>> -----Original Message-----
>>> From: York Sun [mailto:york.sun@nxp.com]
>>> Sent: Thursday, April 21, 2016 12:58 AM
>>> To: Qiang Zhao <qiang.zhao@nxp.com>
>>> Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; u-boot@lists.denx.de
>>> Subject: Re: [PATCH] Revert "T2080QDS/PCIe: Soft Reset PCIe on T2080QDS for
>>> down-training issue"
>>>
>>> On 04/11/2016 02:02 AM, Zhao Qiang wrote:
>>>> This reverts commit 5066e62847bddf6030262ade2aa3e7bcdc930037.
>>>>
>>>> The reverted patch will block t2080RDB iNiC, it was a workaround for
>>>> T2080QDS down-training issue, we need to revert it and find the root
>>>> cause for T2080QDS down-training issue.
>>>
>>> You have a bad wrap-back in commit message.
>>>
>>> Does the workaround block anything? Can you revert it after figuring out the
>>> root cause?
>>>
>>
>> Yes, it blocks t2080RDB and c29x when using them as iNIC.
>> If revert it after figuring out the root cause, how about iNIC?
>> And I am afraid of it is a hard way to find the root cause.
>>
>
> Qiang,
>
> You delete the code gated by CONFIG_FSL_PCIE_RESET, and the macro for T208xQDS.
> How does that affect T2080RDB or C29x?
>

Qiang,

Do you have an update? If not, I will defer this patch.

York
Qiang Zhao July 20, 2016, 1:27 a.m. UTC | #5 
On 07/20/2016 06:05 PM, York Sun wrote:
> -----Original Message-----
> From: york sun
> Sent: Wednesday, July 20, 2016 6:05 AM
> To: Qiang Zhao <qiang.zhao@nxp.com>
> Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; u-boot@lists.denx.de; Roy Zang
> <roy.zang@nxp.com>
> Subject: Re: [PATCH] Revert "T2080QDS/PCIe: Soft Reset PCIe on T2080QDS for
> down-training issue"
> 
> On 04/20/2016 06:12 PM, York Sun wrote:
> > +Roy to comment on iNIC.
> >
> > On 04/20/2016 06:05 PM, Qiang Zhao wrote:
> >> On 04/21/2016 12:58 AM, York Sun wrote:
> >>> -----Original Message-----
> >>> From: York Sun [mailto:york.sun@nxp.com]
> >>> Sent: Thursday, April 21, 2016 12:58 AM
> >>> To: Qiang Zhao <qiang.zhao@nxp.com>
> >>> Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; u-boot@lists.denx.de
> >>> Subject: Re: [PATCH] Revert "T2080QDS/PCIe: Soft Reset PCIe on
> >>> T2080QDS for down-training issue"
> >>>
> >>> On 04/11/2016 02:02 AM, Zhao Qiang wrote:
> >>>> This reverts commit 5066e62847bddf6030262ade2aa3e7bcdc930037.
> >>>>
> >>>> The reverted patch will block t2080RDB iNiC, it was a workaround
> >>>> for T2080QDS down-training issue, we need to revert it and find the
> >>>> root cause for T2080QDS down-training issue.
> >>>
> >>> You have a bad wrap-back in commit message.
> >>>
> >>> Does the workaround block anything? Can you revert it after figuring
> >>> out the root cause?
> >>>
> >>
> >> Yes, it blocks t2080RDB and c29x when using them as iNIC.
> >> If revert it after figuring out the root cause, how about iNIC?
> >> And I am afraid of it is a hard way to find the root cause.
> >>
> >
> > Qiang,
> >
> > You delete the code gated by CONFIG_FSL_PCIE_RESET, and the macro for
> T208xQDS.
> > How does that affect T2080RDB or C29x?
> >
> 
> Qiang,
> 
> Do you have an update? If not, I will defer this patch.
> 

There is no any update.

-Zhao Qiang
diff mbox

Patch

diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 52792dc..1143178 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -444,21 +444,6 @@  void fsl_pci_init(struct pci_controller *hose, struct fsl_pci_info *pci_info)
 			ltssm = (in_be32(&pci->pex_csr0)
 				& PEX_CSR0_LTSSM_MASK) >> PEX_CSR0_LTSSM_SHIFT;
 			enabled = (ltssm == 0x11) ? 1 : 0;
-#ifdef CONFIG_FSL_PCIE_RESET
-			int i;
-			/* assert PCIe reset */
-			setbits_be32(&pci->pdb_stat, 0x08000000);
-			(void) in_be32(&pci->pdb_stat);
-			udelay(1000);
-			/* clear PCIe reset */
-			clrbits_be32(&pci->pdb_stat, 0x08000000);
-			asm("sync;isync");
-			for (i = 0; i < 100 && ltssm < PCI_LTSSM_L0; i++) {
-				pci_hose_read_config_word(hose, dev, PCI_LTSSM,
-							  &ltssm);
-				udelay(1000);
-			}
-#endif
 		} else {
 		/* pci_hose_read_config_word(hose, dev, PCI_LTSSM, &ltssm); */
 		/* enabled = ltssm >= PCI_LTSSM_L0; */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 5957fa8..c895818 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -559,7 +559,6 @@  unsigned long get_board_ddr_clk(void);
 #define CONFIG_PCIE2		/* PCIE controler 2 */
 #define CONFIG_PCIE3		/* PCIE controler 3 */
 #define CONFIG_PCIE4		/* PCIE controler 4 */
-#define CONFIG_FSL_PCIE_RESET
 #define CONFIG_FSL_PCI_INIT	/* Use common FSL init code */
 #define CONFIG_SYS_PCI_64BIT	/* enable 64-bit PCI resources */
 /* controller 1, direct to uli, tgtid 3, Base address 20000 */