[PATCH v7 09/13] board: lx2160a: serdes: enter a SD1 mode through the mode it starts from

[Vincent Jardin]

So far a mode is entered only when SD1 already is in the mode it
starts from.

The next mode, 40g4x10g, splits the second 40GE port into 4x XFI:
it starts from 2x40g.

Protocol 20 boots in 2x40g, but protocol 13 boots in 2x100g, which has
to be made 2x40g first.

Signed-off-by: Vincent Jardin <vjar...@free.fr>
Reviewed-by: Vladimir Oltean <vladimir.olt...@nxp.com>

---

(no changes since v5)

Changes in v5:
- New patch, split out of "set SD1 with a table"

 board/nxp/lx2160a/serdes_split.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/board/nxp/lx2160a/serdes_split.c b/board/nxp/lx2160a/serdes_split.c
index 0107e8636a6..41208ca79ab 100644
--- a/board/nxp/lx2160a/serdes_split.c
+++ b/board/nxp/lx2160a/serdes_split.c
@@ -614,7 +614,8 @@ static void sd1_print_pcc(unsigned long base)
               in_le32((void __iomem *)SRDS_PCCE(base)));
 }
 
-static int sd1_enter(const struct sd1_mode *mode)
+static int sd1_enter(const struct sd1_mode *mode,
+                    const struct sd1_mode *target, int depth)
 {
        unsigned long base = srds_base(FSL_SRDS_1);
        const struct sd1_mode *from = NULL;
@@ -623,17 +624,23 @@ static int sd1_enter(const struct sd1_mode *mode)
        if (mode->is_active(base))
                return 0;
 
-       if (mode->from)
-               from = sd1_mode_find(mode->from, strlen(mode->from));
-
-       if (!mode->enter || !from || !from->is_active(base)) {
+       if (!mode->enter) {
                printf("lx2160a serdes: serdes1:%s needs SD1 to be %s, it is 
not (",
-                      mode->name, from ? from->desc : mode->desc);
+                      target->name, mode->desc);
                sd1_print_pcc(base);
                printf("), refusing\n");
                return -EINVAL;
        }
 
+       if (mode->from)
+               from = sd1_mode_find(mode->from, strlen(mode->from));
+       if (!from || depth >= ARRAY_SIZE(sd1_modes))
+               return -EINVAL;
+
+       ret = sd1_enter(from, target, depth + 1);
+       if (ret)
+               return ret;
+
        ret = mode->enter(base);
        if (!mode->is_active(base)) {
                printf("lx2160a serdes: SD1 is not %s (", mode->desc);
@@ -679,7 +686,7 @@ void lx2160a_serdes_apply_hwconfig(void)
                return;
        }
 
-       sd1_enter(mode);
+       sd1_enter(mode, mode, 0);
 }
 
 #endif /* CONFIG_ARCH_LX2160A */
-- 
2.43.0