Merge branch 'bugfix/wl_encryption_size' into 'master'

Bugfix/wl encryption size

See merge request idf/esp-idf!2037

components/wear_levelling/WL_Flash.cpp

@@ -318,13 +318,13 @@ esp_err_t WL_Flash::updateWL()
     uint32_t byte_pos = this->state.pos * this->cfg.wr_size;
     this->used_bits = 0;
     // write state to mem. We updating only affected bits
-    result |= this->flash_drv->write(this->addr_state1 + sizeof(wl_state_t) + byte_pos, &this->used_bits, 1);
+    result |= this->flash_drv->write(this->addr_state1 + sizeof(wl_state_t) + byte_pos, &this->used_bits, this->cfg.wr_size);
     if (result != ESP_OK) {
         ESP_LOGE(TAG, "%s - update position 1 result=%08x", __func__, result);
         this->state.access_count = this->state.max_count - 1; // we will update next time
         return result;
     }
-    result |= this->flash_drv->write(this->addr_state2 + sizeof(wl_state_t) + byte_pos, &this->used_bits, 1);
+    result |= this->flash_drv->write(this->addr_state2 + sizeof(wl_state_t) + byte_pos, &this->used_bits, this->cfg.wr_size);
     if (result != ESP_OK) {
         ESP_LOGE(TAG, "%s - update position 2 result=%08x", __func__, result);
         this->state.access_count = this->state.max_count - 1; // we will update next time

components/wear_levelling/private_include/WL_Config.h

@@ -20,8 +20,17 @@
 * @brief This class is used as a structure to configure wear levelling module
 *
 */
-typedef struct WL_Config_s {
-    size_t start_addr;      /*!< start address in the flash*/
+
+#if defined(_MSC_VER)
+#define ALIGNED_(x) __declspec(align(x))
+#else
+#if defined(__GNUC__)
+#define ALIGNED_(x) __attribute__ ((aligned(x)))
+#endif
+#endif
+
+typedef struct ALIGNED_(16) WL_Config_s { /*!< Size of wl_config_t structure should be divided by 16 for encryption*/
+    size_t   start_addr;    /*!< start address in the flash*/
     uint32_t full_mem_size; /*!< Amount of memory used to store data in bytes*/
     uint32_t page_size;     /*!< One page size in bytes. Page could be more then memory block. This parameter must be page_size >= N*block_size.*/
     uint32_t sector_size;   /*!< size of flash memory sector that will be erased and stored at once (erase)*/
@@ -30,7 +39,10 @@ typedef struct WL_Config_s {
     uint32_t version;       /*!< A version of current implementatioon. To erase and reallocate complete memory this ID must be different from id before.*/
     size_t   temp_buff_size;  /*!< Size of temporary allocated buffer to copy from one flash area to another. The best way, if this value will be equal to sector size.*/
     uint32_t crc;           /*!< CRC for this config*/
-
 } wl_config_t;
 
+#ifndef _MSC_VER // MSVS has different format for this define
+static_assert(sizeof(wl_config_t) % 16 == 0, "Size of wl_config_t structure should be compatible with flash encryption");
+#endif // _MSC_VER
+
 #endif // _WL_Config_H_

components/wear_levelling/test_wl_host/Flash_Emulator.cpp

@@ -18,11 +18,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-Flash_Emulator::Flash_Emulator(size_t size, size_t sector_sise)
+Flash_Emulator::Flash_Emulator(size_t size, size_t sector_sise, size_t min_size)
 {
     this->reset_count = 0x7fffffff;
     this->size = size;
     this->sector_sise = sector_sise;
+    this->min_size = min_size;
     this->buff = (uint8_t *)malloc(this->size);
     this->access_count = new uint32_t[this->size / this->sector_sise];
     memset(this->access_count, 0, this->size / this->sector_sise * sizeof(uint32_t));
@@ -81,6 +82,14 @@ esp_err_t Flash_Emulator::erase_range(size_t start_address, size_t size)
 esp_err_t Flash_Emulator::write(size_t dest_addr, const void *src, size_t size)
 {
     esp_err_t result = ESP_OK;
+    if ((size % this->min_size) != 0) {
+        result = ESP_ERR_INVALID_SIZE;
+        return result;        
+    }
+    if ((dest_addr % this->min_size) != 0) {
+        result = ESP_ERR_INVALID_SIZE;
+        return result;        
+    }
     if ((this->reset_count != 0x7fffffff) && (this->reset_count != 0)) {
         this->reset_count--;
     }

components/wear_levelling/test_wl_host/Flash_Emulator.h

@@ -25,7 +25,7 @@ class Flash_Emulator : public Flash_Access
 {
 
 public:
-    Flash_Emulator(size_t size, size_t sector_sise);
+    Flash_Emulator(size_t size, size_t sector_sise, size_t min_size);
 
     virtual size_t chip_size();
 
@@ -43,6 +43,7 @@ public:
 public:
     size_t size;
     size_t sector_sise;
+    size_t min_size;
     uint8_t *buff;
 
     uint32_t *access_count;

components/wear_levelling/test_wl_host/wl_tests_host.cpp

@@ -25,7 +25,7 @@
 #define FLASH_PAGE_SIZE         FLASH_SECTOR_SIZE*1
 #define FLASH_UPDATERATE        3
 #define FLASH_TEMP_SIZE         FLASH_SECTOR_SIZE
-#define FLASH_WR_BLOCK_SIZE     2
+#define FLASH_WR_BLOCK_SIZE     16
 
 static const char *TAG = "wl_test_host";
 Flash_Access *s_flash;
@@ -47,7 +47,7 @@ TEST_CASE("flash starts with all bytes == 0xff", "[spi_flash_emu]")
     wl->wr_size = FLASH_WR_BLOCK_SIZE;
 
     WL_Flash *wl_flash = new WL_Flash();
-    Flash_Emulator *emul = new Flash_Emulator(FLASH_ACCESS_SIZE + FLASH_START_ADDR, FLASH_SECTOR_SIZE);
+    Flash_Emulator *emul = new Flash_Emulator(FLASH_ACCESS_SIZE + FLASH_START_ADDR, FLASH_SECTOR_SIZE, FLASH_WR_BLOCK_SIZE);
     CHECK(wl_flash->config(wl, emul) == ESP_OK);
 
     test_power_down(wl_flash, emul, TEST_COUNT_MAX);

components/wear_levelling/wear_levelling.cpp

@@ -76,11 +76,6 @@ esp_err_t wl_mount(const esp_partition_t *partition, wl_handle_t *out_handle)
             break;
         }
     }
-    if (*out_handle == WL_INVALID_HANDLE) {
-        ESP_LOGE(TAG, "MAX_WL_HANDLES=%d instances already allocated", MAX_WL_HANDLES);
-        result = ESP_ERR_NO_MEM;
-        goto out;
-    }
 
     wl_ext_cfg_t cfg;
     cfg.full_mem_size = partition->size;
@@ -94,6 +89,12 @@ esp_err_t wl_mount(const esp_partition_t *partition, wl_handle_t *out_handle)
     // FAT sector size by default will be 512
     cfg.fat_sector_size = CONFIG_WL_SECTOR_SIZE;
 
+    if (*out_handle == WL_INVALID_HANDLE) {
+        ESP_LOGE(TAG, "MAX_WL_HANDLES=%d instances already allocated", MAX_WL_HANDLES);
+        result = ESP_ERR_NO_MEM;
+        goto out;
+    }
+
     // Allocate memory for a Partition object, and then initialize the object
     // using placement new operator. This way we can recover from out of
     // memory condition.