fsl: serdes: ensure accessing the initialized maps of serdes protocol

[oweals/u-boot.git] / arch / powerpc / cpu / mpc85xx / p1022_serdes.c

diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index 14d17eb51b81a51c134c8842e9175d383c3ee57f..88013d41c9cbb28d6841dc9477697471dd49b860 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -72,11 +72,19 @@ static const u8 serdes2_cfg_tbl[][SRDS2_MAX_LANES] = {
 
 int is_serdes_configured(enum srds_prtcl device)
 {
-       int ret = (1 << device) & serdes1_prtcl_map;
+       int ret;
+
+       if (!(serdes1_prtcl_map & (1 << NONE)))
+               fsl_serdes_init();
+
+       ret = (1 << device) & serdes1_prtcl_map;
 
        if (ret)
                return ret;
 
+       if (!(serdes2_prtcl_map & (1 << NONE)))
+               fsl_serdes_init();
+
        return (1 << device) & serdes2_prtcl_map;
 }
 
@@ -88,6 +96,10 @@ void fsl_serdes_init(void)
                                MPC85xx_PORDEVSR_IO_SEL_SHIFT;
        int lane;
 
+       if (serdes1_prtcl_map & (1 << NONE) &&
+           serdes2_prtcl_map & (1 << NONE))
+               return;
+
        debug("PORDEVSR[IO_SEL_SRDS] = %x\n", srds_cfg);
 
        if (srds_cfg >= ARRAY_SIZE(serdes1_cfg_tbl)) {
@@ -99,6 +111,9 @@ void fsl_serdes_init(void)
                serdes1_prtcl_map |= (1 << lane_prtcl);
        }
 
+       /* Set the first bit to indicate serdes has been initialized */
+       serdes1_prtcl_map |= (1 << NONE);
+
        if (srds_cfg >= ARRAY_SIZE(serdes2_cfg_tbl)) {
                printf("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n", srds_cfg);
                return;
@@ -108,4 +123,7 @@ void fsl_serdes_init(void)
                enum srds_prtcl lane_prtcl = serdes2_cfg_tbl[srds_cfg][lane];
                serdes2_prtcl_map |= (1 << lane_prtcl);
        }
+
+       /* Set the first bit to indicate serdes has been initialized */
+       serdes2_prtcl_map |= (1 << NONE);
 }