board: freescale: p1_p2_rdb_pc: Add workaround for board reset reboot loop

CPLD's system reset register on P1/P2 RDB boards is not autocleared after
flipping it. If this register is set to one in 100ms after reset starts
then CPLD triggers another CPU reset.

This means that trying to reset board via CPLD system reset register cause
reboot loop. To prevent this reboot loop, the only workaround is to try to
clear CPLD's system reset register as early as possible. U-Boot is already
doing it in its board_early_init_f() function, which seems to be enough as
register is cleared prior CPLD triggers another reset.

But board_early_init_f() is not called from SPL and therefore usage of SPL
can cause reboot loop.

To prevent reboot loop when using SPL, call board_early_init_f() function
in SPL too. For accessing CPLD memory space it is needed to have CPLD entry
in TLB.

With this change it is possible to trigger board reset via CPLD's system
reset register on P2020 RDB board.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index a71952dcf3991af44e1e948959b4ffd70d9bde0c..b7c39564325b3e9d47995be49f42a7a7d8970e41 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -97,6 +97,19 @@ void board_cpld_init(void)
        out_8(&cpld_data->status_led, CPLD_STATUS_LED);
        out_8(&cpld_data->fxo_led, CPLD_FXO_LED);
        out_8(&cpld_data->fxs_led, CPLD_FXS_LED);
+
+       /*
+        * CPLD's system reset register on P1/P2 RDB boards is not autocleared
+        * after flipping it. If this register is set to one then CPLD triggers
+        * reset of CPU in few ms.
+        *
+        * CPLD does not trigger reset of CPU for 100ms after the last reset.
+        *
+        * This means that trying to reset board via CPLD system reset register
+        * cause reboot loop. To prevent this reboot loop, the only workaround
+        * is to try to clear CPLD's system reset register as early as possible
+        * and it has to be done in 100ms since the last start of reset.
+        */
        out_8(&cpld_data->system_rst, CPLD_SYS_RST);
 }
 

diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index b60027ebd9ab9c56932d0ee0223704d3bfa9b143..eda84bf2b1fc90d2635957b11520a649d7fefd68 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -31,6 +31,12 @@ void board_init_f(ulong bootflag)
        u32 plat_ratio, bus_clk;
        ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
 
+       /*
+        * Call board_early_init_f() as early as possible as it workarounds
+        * reboot loop due to broken CPLD state machine for reset line.
+        */
+       board_early_init_f();
+
        console_init_f();
 
        /* Set pmuxcr to allow both i2c1 and i2c2 */

diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c
index 105d9e38aac4e99b85ce4e66b3d9d912506f6d8b..65cedd42a0df6ea210f50d15a80d856953e92fac 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/tlb.c
+++ b/board/freescale/p1_p2_rdb_pc/tlb.c
@@ -61,11 +61,11 @@ struct fsl_e_tlb_entry tlb_table[] = {
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 5, BOOKE_PAGESZ_1M, 1),
 #endif
+#endif /* not SPL */
 
        SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS,
                        MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                        0, 6, BOOKE_PAGESZ_1M, 1),
-#endif /* not SPL */
 
 #ifdef CONFIG_SYS_NAND_BASE
        /* *I*G - NAND */