diff mbox

[U-Boot] fsl: serdes: fix a deadloop issue for P4080

Message ID 1477882756-22196-1-git-send-email-Zhiqiang.Hou@nxp.com
State Accepted
Commit 5eef15ea9d297d270935510d8a635f8d8bf72439
Delegated to: York Sun
Headers show

Commit Message

Z.Q. Hou Oct. 31, 2016, 2:59 a.m. UTC 
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

This deadloop is introduced by commit:
71fe222 fsl: serdes: ensure accessing the initialized maps of serdes protocol

deadloop detail:
cpu_init_r => fsl_serdes_init => p4080_erratum_serdes_a005 =>
is_serdes_configured => fsl_serdes_init

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

York Sun Nov. 23, 2016, 12:54 a.m. UTC | #1 
On 10/30/2016 08:12 PM, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
>
> This deadloop is introduced by commit:
> 71fe222 fsl: serdes: ensure accessing the initialized maps of serdes protocol
>
> deadloop detail:
> cpu_init_r => fsl_serdes_init => p4080_erratum_serdes_a005 =>
> is_serdes_configured => fsl_serdes_init
>
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---


Applied to fsl-qoriq, awaiting upstream. Thanks.

York
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 72d5e30..b6c4341 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -607,6 +607,9 @@  void fsl_serdes_init(void)
 
 	soc_serdes_init();
 
+	/* Set the first bit to indicate serdes has been initialized */
+	serdes_prtcl_map |= (1 << NONE);
+
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
 	/*
 	 * Bank two uses the clock from bank three, so if bank two is enabled,
@@ -862,9 +865,6 @@  void fsl_serdes_init(void)
 			     SRDS_RSTCTL_SDPD);
 	}
 #endif
-
-	/* Set the first bit to indicate serdes has been initialized */
-	serdes_prtcl_map |= (1 << NONE);
 }
 
 const char *serdes_clock_to_string(u32 clock)