Merge pull request #52 from UweBonnes/master

Fixes around F4

flash/main.c

@@ -126,17 +126,23 @@ int main(int ac, char** av)
   if (o.cmd == DO_WRITE) /* write */
   {
     if ((o.addr >= sl->flash_base) &&
-	(o.addr < sl->flash_base + sl->flash_size))
+	(o.addr < sl->flash_base + sl->flash_size)) {
 	err = stlink_fwrite_flash(sl, o.filename, o.addr);
-    else if ((o.addr >= sl->sram_base) &&
+	if (err == -1)
+	{
+	    printf("stlink_fwrite_flash() == -1\n");
+	    goto on_error;
+	}
+    }
+   else if ((o.addr >= sl->sram_base) &&
 	     (o.addr < sl->sram_base + sl->sram_size))
 	err = stlink_fwrite_sram(sl, o.filename, o.addr);
-    if (err == -1)
+	if (err == -1)
-    {
+	{
-      printf("stlink_fwrite_flash() == -1\n");
+	    printf("stlink_sram_flash() == -1\n");
-      goto on_error;
+	    goto on_error;
-    }
+	}
-  }
+   }
   else if (o.cmd == DO_ERASE) 
   {
      err = stlink_erase_flash_mass(sl);
@@ -148,6 +154,12 @@ int main(int ac, char** av)
   }
   else /* read */
   {
+    if ((o.addr >= sl->flash_base) &&
+	(o.addr < sl->flash_base + sl->flash_size))
+        o.size = sl->flash_size;
+    else if ((o.addr >= sl->sram_base) &&
+	     (o.addr < sl->sram_base + sl->sram_size))
+        o.size = sl->sram_size;
     err = stlink_fread(sl, o.filename, o.addr, o.size);
     if (err == -1)
     {

src/stlink-common.c

@@ -229,13 +229,21 @@ static void __attribute__((unused)) clear_flash_cr_per(stlink_t *sl) {
 }
 
 static void set_flash_cr_mer(stlink_t *sl) {
-    const uint32_t n = 1 << FLASH_CR_MER;
+    if(sl->chip_id == STM32F4_CHIP_ID)
-    stlink_write_debug32(sl, FLASH_CR, n);
+        stlink_write_debug32(sl, FLASH_F4_CR,
+                             stlink_read_debug32(sl, FLASH_F4_CR) | (1 << FLASH_CR_MER));
+    else 
+        stlink_write_debug32(sl, FLASH_CR,
+                             stlink_read_debug32(sl, FLASH_CR) | (1 << FLASH_CR_MER));
 }
 
 static void __attribute__((unused)) clear_flash_cr_mer(stlink_t *sl) {
-    const uint32_t n = read_flash_cr(sl) & ~(1 << FLASH_CR_MER);
+    if(sl->chip_id == STM32F4_CHIP_ID)
-    stlink_write_debug32(sl, FLASH_CR, n);
+        stlink_write_debug32(sl, FLASH_F4_CR,
+                             stlink_read_debug32(sl, FLASH_F4_CR) & ~(1 << FLASH_CR_MER));
+    else 
+        stlink_write_debug32(sl, FLASH_CR,
+                             stlink_read_debug32(sl, FLASH_CR) & ~(1 << FLASH_CR_MER));
 }
 
 static void set_flash_cr_strt(stlink_t *sl) {
@@ -246,9 +254,9 @@ static void set_flash_cr_strt(stlink_t *sl) {
 		stlink_write_debug32(sl, FLASH_F4_CR, x);
 	}
 	else {
-		/* assume come on the flash_cr_per path */
+	    stlink_write_debug32(
-	    const uint32_t n = (1 << FLASH_CR_PER) | (1 << FLASH_CR_STRT);
+                sl, FLASH_CR, 
-	    stlink_write_debug32(sl, FLASH_CR, n);
+                stlink_read_debug32(sl,FLASH_CR) |(1 << FLASH_CR_STRT) );
 	}
 }
 
@@ -279,6 +287,22 @@ static void wait_flash_busy(stlink_t *sl) {
         ;
 }
 
+static void wait_flash_busy_progress(stlink_t *sl) {
+    int i = 0;
+    fprintf(stdout, "Mass erasing");
+    fflush(stdout);
+    while (is_flash_busy(sl))
+    {
+        usleep(10000);
+        i++;
+        if (i % 100 == 0) {
+            fprintf(stdout, ".");
+            fflush(stdout);
+        }
+    }
+    fprintf(stdout, "\n");
+}
+
 static inline unsigned int is_flash_eop(stlink_t *sl) {
     return read_flash_sr(sl) & (1 << FLASH_SR_EOP);
 }
@@ -396,22 +420,23 @@ void stlink_cpu_id(stlink_t *sl, cortex_m3_cpuid_t *cpuid) {
 int stlink_load_device_params(stlink_t *sl) {
     ILOG("Loading device parameters....\n");
     const chip_params_t *params = NULL;
-    
     sl->core_id = stlink_core_id(sl);
     uint32_t chip_id = stlink_chip_id(sl);
     
-    /* Fix chip_id for F4 rev A errata */
+    sl->chip_id = chip_id & 0xfff;
-    if (((chip_id & 0xFFF) == 0x411) && (sl->core_id == CORE_M4_R0)) {
+    /* Fix chip_id for F4 rev A errata , Read CPU ID, as CoreID is the same for F2/F4*/
-      chip_id = 0x413;
+    if (sl->chip_id == 0x411) {
+        uint32_t cpuid = stlink_read_debug32(sl, 0xE000ED00);
+        if((cpuid  & 0xfff0) == 0xc240)
+            sl->chip_id = 0x413;
     }
 
-    sl->chip_id = chip_id & 0xfff;
+    for(size_t i = 0; i < sizeof(devices) / sizeof(devices[0]); i++) {
-	for(size_t i = 0; i < sizeof(devices) / sizeof(devices[0]); i++) {
+        if(devices[i].chip_id == sl->chip_id) {
-		if(devices[i].chip_id == sl->chip_id) {
+            params = &devices[i];
-			params = &devices[i];
+            break;
-			break;
+        }
-		}
+    }
-	}
     if (params == NULL) {
         WLOG("unknown chip id! %#x\n", chip_id);
         return -1;
@@ -723,15 +748,21 @@ static void unmap_file(mapped_file_t * mf) {
     mf->len = 0;
 }
 
+/* Limit the block size to compare to 0x1800
+   Anything larger will stall the STLINK2
+   Maybe STLINK V1 needs smaller value!*/
 static int check_file(stlink_t* sl, mapped_file_t* mf, stm32_addr_t addr) {
     size_t off;
+    size_t n_cmp = sl->flash_pgsz;
+    if ( n_cmp > 0x1800)
+        n_cmp = 0x1800;
 
-    for (off = 0; off < mf->len; off += sl->flash_pgsz) {
+    for (off = 0; off < mf->len; off += n_cmp) {
         size_t aligned_size;
 
         /* adjust last page size */
-        size_t cmp_size = sl->flash_pgsz;
+        size_t cmp_size = n_cmp;
-        if ((off + sl->flash_pgsz) > mf->len)
+        if ((off + n_cmp) > mf->len)
             cmp_size = mf->len - off;
 
         aligned_size = cmp_size;
@@ -1053,10 +1084,7 @@ int stlink_erase_flash_page(stlink_t *sl, stm32_addr_t flashaddr)
 }
 
 int stlink_erase_flash_mass(stlink_t *sl) {
-     if (sl->chip_id == STM32_CHIPID_F4) {
+     if (sl->chip_id == STM32_CHIPID_L1_MEDIUM) {
-        DLOG("(FIXME) Mass erase of STM32F4\n");
-      }
-     else if (sl->chip_id == STM32_CHIPID_L1_MEDIUM) {
 	 /* erase each page */
 	 int i = 0, num_pages = sl->flash_size/sl->flash_pgsz;
 	 for (i = 0; i < num_pages; i++) {
@@ -1085,7 +1113,7 @@ int stlink_erase_flash_mass(stlink_t *sl) {
 	 set_flash_cr_strt(sl);
 	 
 	 /* wait for completion */
-	 wait_flash_busy(sl);
+	 wait_flash_busy_progress(sl);
 	 
 	 /* relock the flash */
 	 lock_flash(sl);