board: stm32mp1: add timeout for I/O compensation ready

[oweals/u-boot.git] / board / st / stm32mp1 / stm32mp1.c

diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 6873165a0f82ff0c65e97cb6214e7841f889a756..dcbfcc1bcb3d3124de6ec803219f516f1822f2d3 100644 (file)
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -32,6 +32,7 @@
 #include <asm/arch/sys_proto.h>
 #include <jffs2/load_kernel.h>
 #include <linux/err.h>
+#include <linux/iopoll.h>
 #include <power/regulator.h>
 #include <usb/dwc2_udc.h>
 
@@ -463,10 +464,10 @@ static void sysconf_init(void)
        struct udevice *pwr_dev;
        struct udevice *pwr_reg;
        struct udevice *dev;
-       int ret;
        u32 otp = 0;
 #endif
-       u32 bootr;
+       int ret;
+       u32 bootr, val;
 
        syscfg = (u8 *)syscon_get_first_range(STM32MP_SYSCON_SYSCFG);
 
@@ -543,8 +544,15 @@ static void sysconf_init(void)
         */
        writel(SYSCFG_CMPENSETR_MPU_EN, syscfg + SYSCFG_CMPENSETR);
 
-       while (!(readl(syscfg + SYSCFG_CMPCR) & SYSCFG_CMPCR_READY))
-               ;
+       /* poll until ready (1s timeout) */
+       ret = readl_poll_timeout(syscfg + SYSCFG_CMPCR, val,
+                                val & SYSCFG_CMPCR_READY,
+                                1000000);
+       if (ret) {
+               pr_err("SYSCFG: I/O compensation failed, timeout.\n");
+               led_error_blink(10);
+       }
+
        clrbits_le32(syscfg + SYSCFG_CMPCR, SYSCFG_CMPCR_SW_CTRL);
 #endif
 }