kinetis : Add timeouts to flash status checking in dap_syssec_kinetis_mdmap().

[fw/openocd] / src / target / arm_adi_v5.c

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 68af7f34ddfcf6cecf7617a1819886854a4c7969..4e36d9d20d9988182343eb81cba6d732c67bdf6b 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -644,6 +644,8 @@ int mem_ap_sel_write_buf_u32_noincr(struct adiv5_dap *swjdp, uint8_t ap,
 #define MEM_CTRL_VLLSX_DBG_ACK (1<<6)
 #define MEM_CTRL_VLLSX_STAT_ACK        (1<<7)
 
+#define MDM_ACCESS_TIMEOUT     3000 /* ms */
+
 /**
  *
  */
@@ -651,6 +653,7 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 {
        uint32_t val;
        int retval;
+       int timeout = 0;
        enum reset_types jtag_reset_config = jtag_get_reset_config();
 
        dap_ap_select(dap, 1);
@@ -662,7 +665,7 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
        dap_run(dap);
 
        if (val != 0x001C0000) {
-               LOG_DEBUG("id doesn't match %08X != 0x001C0000", val);
+               LOG_DEBUG("id doesn't match %08" PRIX32 " != 0x001C0000", val);
                dap_ap_select(dap, 0);
                return ERROR_FAIL;
        }
@@ -671,14 +674,23 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
         * it's important that the device is out of
         * reset here
         */
-       retval = dap_queue_ap_read(dap, MDM_REG_STAT, &val);
-       if (retval != ERROR_OK)
-               return retval;
-       dap_run(dap);
+       while (1) {
+               if (timeout++ > MDM_ACCESS_TIMEOUT) {
+                       LOG_DEBUG("MDMAP : flash ready timeout");
+                       return ERROR_FAIL;
+               }
+               retval = dap_queue_ap_read(dap, MDM_REG_STAT, &val);
+               if (retval != ERROR_OK)
+                       return retval;
+               dap_run(dap);
 
-       LOG_DEBUG("MDM_REG_STAT %08X", val);
+               LOG_DEBUG("MDM_REG_STAT %08" PRIX32, val);
+               if (val & MDM_STAT_FREADY)
+                       break;
+               alive_sleep(1);
+       }
 
-       if ((val & (MDM_STAT_SYSSEC|MDM_STAT_FREADY)) != (MDM_STAT_FREADY)) {
+       if ((val & MDM_STAT_SYSSEC)) {
                LOG_DEBUG("MDMAP: system is secured, masserase needed");
 
                if (!(val & MDM_STAT_FMEEN))
@@ -693,8 +705,12 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
                                dap_ap_select(dap, 0);
                                return ERROR_FAIL;
                        }
-
+                       timeout = 0;
                        while (1) {
+                               if (timeout++ > MDM_ACCESS_TIMEOUT) {
+                                       LOG_DEBUG("MDMAP : flash ready timeout");
+                                       return ERROR_FAIL;
+                               }
                                retval = dap_queue_ap_write(dap, MDM_REG_CTRL, MEM_CTRL_FMEIP);
                                if (retval != ERROR_OK)
                                        return retval;
@@ -704,13 +720,18 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
                                if (retval != ERROR_OK)
                                        return retval;
                                dap_run(dap);
-                               LOG_DEBUG("MDM_REG_STAT %08X", val);
+                               LOG_DEBUG("MDM_REG_STAT %08" PRIX32, val);
 
                                if ((val & 1))
                                        break;
+                               alive_sleep(1);
                        }
-
+                       timeout = 0;
                        while (1) {
+                               if (timeout++ > MDM_ACCESS_TIMEOUT) {
+                                       LOG_DEBUG("MDMAP : flash ready timeout");
+                                       return ERROR_FAIL;
+                               }
                                retval = dap_queue_ap_write(dap, MDM_REG_CTRL, 0);
                                if (retval != ERROR_OK)
                                        return retval;
@@ -720,16 +741,17 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
                                if (retval != ERROR_OK)
                                        return retval;
                                dap_run(dap);
-                               LOG_DEBUG("MDM_REG_STAT %08X", val);
+                               LOG_DEBUG("MDM_REG_STAT %08" PRIX32, val);
                                /* read control register and wait for ready */
                                retval = dap_queue_ap_read(dap, MDM_REG_CTRL, &val);
                                if (retval != ERROR_OK)
                                        return retval;
                                dap_run(dap);
-                               LOG_DEBUG("MDM_REG_CTRL %08X", val);
+                               LOG_DEBUG("MDM_REG_CTRL %08" PRIX32, val);
 
                                if (val == 0x00)
                                        break;
+                               alive_sleep(1);
                        }
                }
        }
@@ -765,7 +787,7 @@ int dap_syssec(struct adiv5_dap *dap)
 
                while (tap != NULL) {
                        if (tap->hasidcode && (dap_syssec_filter_data[i].idcode == tap->idcode)) {
-                               LOG_DEBUG("DAP: mdmap_init for idcode: %08x", tap->idcode);
+                               LOG_DEBUG("DAP: mdmap_init for idcode: %08" PRIx32, tap->idcode);
                                dap_syssec_filter_data[i].dap_init(dap);
                        }
                        tap = tap->next_tap;
@@ -963,7 +985,7 @@ int dap_find_ap(struct adiv5_dap *dap, enum ap_type type_to_find, uint8_t *ap_nu
                        ((id_val & 0x0FFF0000) == 0x04770000) && /* Jedec codes match */
                        ((id_val & 0xFF) == type_to_find)) {     /* type matches*/
 
-                       LOG_DEBUG("Found %s at AP index: %d (IDR=0x%08X)",
+                       LOG_DEBUG("Found %s at AP index: %d (IDR=0x%08" PRIX32 ")",
                                                (type_to_find == AP_TYPE_AHB_AP)  ? "AHB-AP"  :
                                                (type_to_find == AP_TYPE_APB_AP)  ? "APB-AP"  :
                                                (type_to_find == AP_TYPE_JTAG_AP) ? "JTAG-AP" : "Unknown",