Skip bad blocks on erase

Author: bbogush

firmware/Makefile

@@ -52,7 +52,7 @@ USB_SRCS=hw_config.c stm32_it.c usb_prop.c usb_desc.c usb_istr.c usb_pwr.c \
 
 
 SRCS=main.c system_stm32f10x.c syscalls.c fsmc_nand.c chip_db.c led.c uart.c \
-  jtag.c cdc.c nand_programmer.c $(USB_SRCS)
+  jtag.c cdc.c nand_programmer.c nand_bad_block.c $(USB_SRCS)
 
 OBJS=$(addprefix $(OBJ_DIR),$(SRCS:.c=.o)) \
   $(addprefix $(OBJ_DIR),$(STARTUP:.s=.o))

firmware/nand_bad_block.c

@@ -0,0 +1,40 @@
+/*  Copyright (C) 2017 Bogdan Bogush <[email protected]>
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ */
+
+#include "nand_bad_block.h"
+#include <string.h>
+
+#define NAND_BAD_BLOCK_TABLE_SIZE 20
+
+static uint32_t nand_bad_block_table_count;
+static uint32_t nand_bad_block_table[NAND_BAD_BLOCK_TABLE_SIZE];
+
+void nand_bad_block_table_init()
+{
+    memset(nand_bad_block_table, 0, NAND_BAD_BLOCK_TABLE_SIZE);
+    nand_bad_block_table_count = 0;
+}
+
+int nand_bad_block_table_add(uint32_t addr)
+{
+    if (nand_bad_block_table_count == NAND_BAD_BLOCK_TABLE_SIZE)
+        return -1;
+
+    nand_bad_block_table[nand_bad_block_table_count++] = addr;
+    return 0;
+}
+
+bool nand_bad_block_table_lookup(uint32_t addr)
+{
+    uint32_t i;
+
+    for (i = 0; i < nand_bad_block_table_count; i++)
+    {
+        if (nand_bad_block_table[i] == addr)
+            return true;
+    }
+
+    return false;
+}

firmware/nand_bad_block.h

@@ -0,0 +1,16 @@
+/*  Copyright (C) 2017 Bogdan Bogush <[email protected]>
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ */
+
+#ifndef _NAND_BAD_BLOCK_H_
+#define _NAND_BAD_BLOCK_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+void nand_bad_block_table_init();
+int nand_bad_block_table_add(uint32_t addr);
+bool nand_bad_block_table_lookup(uint32_t addr);
+
+#endif

firmware/nand_programmer.c

@@ -4,6 +4,7 @@
  */
 
 #include "nand_programmer.h"
+#include "nand_bad_block.h"
 #include "fsmc_nand.h"
 #include "chip_db.h"
 #include "led.h"
@@ -49,6 +50,7 @@ enum
     NP_ERR_BUF_OVERFLOW   = -110,
     NP_ERR_LEN_NOT_ALIGN  = -111,
     NP_ERR_LEN_EXCEEDED   = -112,
+    NP_ERR_LEN_INVALID    = -113,
 };
 
 typedef struct __attribute__((__packed__))
@@ -268,6 +270,7 @@ static int np_nand_erase(np_prog_t *prog, uint32_t page)
 
 static int _np_cmd_nand_erase(np_prog_t *prog)
 {
+    int is_bad;
     uint32_t addr, page, pages_in_block, len;
     np_erase_cmd_t *erase_cmd = (np_erase_cmd_t *)prog->rx_buf;
 
@@ -283,6 +286,12 @@ static int _np_cmd_nand_erase(np_prog_t *prog)
         return NP_ERR_ADDR_NOT_ALIGN;
     }
 
+    if (!len)
+    {
+        ERROR_PRINT("Length is 0\r\n");
+        return NP_ERR_LEN_INVALID;
+    }
+
     if (len & (prog->chip_info->block_size - 1))
     {
         ERROR_PRINT("Length 0x%lx is not aligned to block size 0x%lx\r\n",
@@ -302,13 +311,28 @@ static int _np_cmd_nand_erase(np_prog_t *prog)
 
     while (len)
     {
-        if (np_nand_erase(prog, page))
-            return NP_ERR_NAND_ERASE;
+        if (addr >= prog->chip_info->size)
+        {
+            ERROR_PRINT("Erase address 0x%lx is more then chip size 0x%lx\r\n",
+                addr, prog->chip_info->size);
+            return NP_ERR_ADDR_EXCEEDED;
+        }
 
-        if (len >= prog->chip_info->block_size)
-            len -= prog->chip_info->block_size;
+        if ((is_bad = nand_bad_block_table_lookup(addr)))
+        {
+            DEBUG_PRINT("Skipped bad block at 0x%lx\r\n", addr);
+            if (np_send_bad_block_info(addr))
+                return -1;
+        }
 
+        if (!is_bad && np_nand_erase(prog, page))
+            return NP_ERR_NAND_ERASE;
+
+        addr += prog->chip_info->block_size;
         page += pages_in_block;
+        /* On partial erase do not count bad blocks */
+        if (!is_bad || (is_bad && erase_cmd->len == prog->chip_info->size))
+            len -= prog->chip_info->block_size;
     }
 
     return np_send_ok_status();
@@ -676,6 +700,7 @@ static int np_cmd_nand_select(np_prog_t *prog)
     if (!chip_select(select_cmd->chip_num))
     {
         nand_init();
+        nand_bad_block_table_init();
         prog->chip_info = chip_info_selected_get();
     }
     else
@@ -717,6 +742,8 @@ static int np_read_bad_block_info_from_page(np_prog_t *prog, uint32_t block,
         *is_bad = true;
         if (np_send_bad_block_info(addr))
             return -1;
+        if (nand_bad_block_table_add(addr))
+            return -1;
     }
     else
         *is_bad = false;