feat(spi_nand_flash): add support for Micron MT29F2G chips

Author: igrr

spi_nand_flash/src/dhara_glue.c

@@ -68,8 +68,10 @@ int dhara_nand_is_bad(const struct dhara_nand *n, dhara_block_t b)
 
     ESP_GOTO_ON_ERROR(read_page_and_wait(dev, first_block_page, NULL), fail, TAG, "");
 
+    uint16_t column_addr = dev->page_size;
+    column_addr += 4096 * (b % 2);
     // Read the first 2 bytes on the OOB of the first page in the block. This should be 0xFFFF for a good block
-    ESP_GOTO_ON_ERROR(spi_nand_read(dev->config.device_handle, (uint8_t *) &bad_block_indicator, dev->page_size, 2),
+    ESP_GOTO_ON_ERROR(spi_nand_read(dev->config.device_handle, (uint8_t *) &bad_block_indicator, column_addr, 2),
                       fail, TAG, "");
 
     ESP_LOGD(TAG, "is_bad, block=%"PRIu32", page=%"PRIu32",indicator = %04x", b, first_block_page, bad_block_indicator);
@@ -138,13 +140,15 @@ int dhara_nand_prog(const struct dhara_nand *n, dhara_page_t p, const uint8_t *d
     esp_err_t ret;
     uint8_t status;
     uint16_t used_marker = 0;
+    uint32_t column_addr = 0;
+    column_addr += 4096 * ((p / (1 << dev->dhara_nand.log2_ppb)) % 2);
 
     ESP_GOTO_ON_ERROR(read_page_and_wait(dev, p, NULL), fail, TAG, "");
     ESP_GOTO_ON_ERROR(spi_nand_write_enable(dev->config.device_handle), fail, TAG, "");
-    ESP_GOTO_ON_ERROR(spi_nand_program_load(dev->config.device_handle, data, 0, dev->page_size),
+    ESP_GOTO_ON_ERROR(spi_nand_program_load(dev->config.device_handle, data, column_addr, dev->page_size),
                       fail, TAG, "");
     ESP_GOTO_ON_ERROR(spi_nand_program_load(dev->config.device_handle, (uint8_t *)&used_marker,
-                                            dev->page_size + 2, 2),
+                                            column_addr + dev->page_size + 2, 2),
                       fail, TAG, "");
     ESP_GOTO_ON_ERROR(program_execute_and_wait(dev, p, &status), fail, TAG, "");
 
@@ -167,8 +171,11 @@ int dhara_nand_is_free(const struct dhara_nand *n, dhara_page_t p)
     uint16_t used_marker;
 
     ESP_GOTO_ON_ERROR(read_page_and_wait(dev, p, NULL), fail, TAG, "");
+    uint16_t column_addr = dev->page_size + 2;
+    column_addr += 4096 * ((p / (1 << dev->dhara_nand.log2_ppb)) % 2);
+
     ESP_GOTO_ON_ERROR(spi_nand_read(dev->config.device_handle, (uint8_t *)&used_marker,
-                                    dev->page_size + 2, 2),
+                                    column_addr, 2),
                       fail, TAG, "");
 
     ESP_LOGD(TAG, "is free, page=%"PRIu32", used_marker=%04x,", p, used_marker);
@@ -200,7 +207,10 @@ int dhara_nand_read(const struct dhara_nand *n, dhara_page_t p, size_t offset, s
         return -1;
     }
 
-    ESP_GOTO_ON_ERROR(spi_nand_read(dev->config.device_handle, data, offset, length), fail, TAG, "");
+    uint16_t column_addr = offset;
+    column_addr += 4096 * ((p / (1 << dev->dhara_nand.log2_ppb)) % 2);
+
+    ESP_GOTO_ON_ERROR(spi_nand_read(dev->config.device_handle, data, column_addr, length), fail, TAG, "");
 
     return 0;
 fail:

spi_nand_flash/src/nand.c

@@ -148,6 +148,11 @@ static esp_err_t spi_nand_micron_init(spi_nand_flash_device_t *dev)
         dev->dhara_nand.log2_ppb = 6;        // 64 pages per block
         dev->dhara_nand.log2_page_size = 12; // 4096 bytes per page
         break;
+    case MICRON_DI_24:
+        dev->dhara_nand.num_blocks = 2048;
+        dev->dhara_nand.log2_ppb = 6;        // 64 pages per block
+        dev->dhara_nand.log2_page_size = 11; // 2048 bytes per page
+        break;
     default:
         return ESP_ERR_INVALID_RESPONSE;
     }
@@ -276,7 +281,7 @@ esp_err_t spi_nand_erase_chip(spi_nand_flash_device_t *handle)
 
 esp_err_t spi_nand_flash_read_sector(spi_nand_flash_device_t *handle, uint8_t *buffer, dhara_sector_t sector_id)
 {
-    dhara_error_t err;
+    dhara_error_t err = 0;
     esp_err_t ret = ESP_OK;
 
     xSemaphoreTake(handle->mutex, portMAX_DELAY);
@@ -296,7 +301,7 @@ esp_err_t spi_nand_flash_read_sector(spi_nand_flash_device_t *handle, uint8_t *b
 
 esp_err_t spi_nand_flash_write_sector(spi_nand_flash_device_t *handle, const uint8_t *buffer, dhara_sector_t sector_id)
 {
-    dhara_error_t err;
+    dhara_error_t err = 0;
     esp_err_t ret = ESP_OK;
 
     xSemaphoreTake(handle->mutex, portMAX_DELAY);
@@ -311,7 +316,7 @@ esp_err_t spi_nand_flash_write_sector(spi_nand_flash_device_t *handle, const uin
 
 esp_err_t spi_nand_flash_sync(spi_nand_flash_device_t *handle)
 {
-    dhara_error_t err;
+    dhara_error_t err = 0;
     esp_err_t ret = ESP_OK;
 
     xSemaphoreTake(handle->mutex, portMAX_DELAY);

spi_nand_flash/src/nand_flash_devices.h

@@ -42,3 +42,4 @@
 #define WINBOND_DI_BC21               0xBC21
 
 #define MICRON_DI_34                  0x34
+#define MICRON_DI_24                  0x24   // MT29F2G