Merge pull request #55 from wolfSSL/sector_size_fixes

Sector size fixes

Author: dgarske

arch.mk

@@ -153,7 +153,7 @@ endif
 
 ifeq ($(TARGET),psoc6)
     CORTEX_M0=1
-    PKA_EXTRA_OBJS+= $(CYPRESS_PDL)/drivers/source/cy_flash.o \
+    OBJS+= $(CYPRESS_PDL)/drivers/source/cy_flash.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_ipc_pipe.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_ipc_sema.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_ipc_drv.o \

config/examples/cypsoc6.config

@@ -21,10 +21,10 @@ SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
 IMAGE_HEADER_SIZE?=256
-PKA?=1
+PKA?=0
 WOLFTPM?=0
 WOLFBOOT_PARTITION_SIZE?=0x80000
-WOLFBOOT_SECTOR_SIZE?=4096
+WOLFBOOT_SECTOR_SIZE?=512
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x10080000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x10100000
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=10010000

hal/psoc6.c

@@ -34,7 +34,7 @@
 
 #include "psoc6_02_config.h"
 
-#define ROW_SIZE (0x1000)
+#define ROW_SIZE (WOLFBOOT_SECTOR_SIZE)
 #define FLASH_BASE_ADDRESS (0x10000000)
 #define CPU_FREQ (100000000)
 
@@ -89,8 +89,14 @@ static void hal_set_pll(void)
     }
 }
 
+
+
 void hal_init(void)
 {
+#define VTOR (*(volatile uint32_t *)(0xE000ED08))
+    VTOR = FLASH_BASE_ADDRESS;
+#undef VTOR
+
     Cy_PDL_Init(CY_DEVICE_CFG);
     Cy_Flash_Init();
     hal_set_pll();
@@ -109,6 +115,7 @@ void hal_prepare_boot(void)
 int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
 {
     const uint8_t *src = data;
+    int ret;
     if (len < ROW_SIZE)
         return -1;
     if ((((uint32_t)data) & FLASH_BASE_ADDRESS) == FLASH_BASE_ADDRESS) {
@@ -119,7 +126,9 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
         src = psoc6_write_buffer;
     }
     while (len) {
-        Cy_Flash_ProgramRow(address, (const uint32_t *) src);
+        ret = Cy_Flash_ProgramRow(address, (const uint32_t *) src);
+        if (ret)
+            return ret;
         len -= ROW_SIZE;
         if ((len > 0) && (len < ROW_SIZE))
             return -1;
@@ -137,14 +146,16 @@ void RAMFUNCTION hal_flash_lock(void)
 
 int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
 {
-    int start = -1, end = -1;
     uint32_t end_address;
+    int ret;
     uint32_t p = (uint32_t)address;
     if (len == 0)
         return -1;
     end_address = address + len;
     while ((end_address - p) >= ROW_SIZE) {
-        Cy_Flash_EraseRow(p);
+        ret = Cy_Flash_EraseRow(p);
+        if (ret)
+            return ret;
         p += ROW_SIZE;
     }
     return 0;

include/image.h

@@ -66,9 +66,9 @@ int wolfBoot_open_image(struct wolfBoot_image *img, uint8_t part);
 int wolfBoot_verify_integrity(struct wolfBoot_image *img);
 int wolfBoot_verify_authenticity(struct wolfBoot_image *img);
 int wolfBoot_set_partition_state(uint8_t part, uint8_t newst);
-int wolfBoot_set_sector_flag(uint8_t part, uint8_t sector, uint8_t newflag);
+int wolfBoot_set_sector_flag(uint8_t part, uint16_t sector, uint8_t newflag);
 int wolfBoot_get_partition_state(uint8_t part, uint8_t *st);
-int wolfBoot_get_sector_flag(uint8_t part, uint8_t sector, uint8_t *flag);
+int wolfBoot_get_sector_flag(uint8_t part, uint16_t sector, uint8_t *flag);
 
 uint8_t* wolfBoot_peek_image(struct wolfBoot_image *img, uint32_t offset, uint32_t* sz);
 

src/libwolfboot.c

@@ -31,6 +31,7 @@
 #endif
 
 uint32_t ext_cache;
+static const uint32_t wolfboot_magic_trail = WOLFBOOT_MAGIC_TRAIL;
 
 #ifndef TRAILER_SKIP
 #   define TRAILER_SKIP 0
@@ -56,8 +57,23 @@ int RAMFUNCTION hal_trailer_write(uint32_t addr, uint8_t val) {
     ret = hal_flash_write(addr_align, NVM_CACHE, WOLFBOOT_SECTOR_SIZE);
     return ret;
 }
+
+int RAMFUNCTION hal_set_partition_magic(uint32_t addr)
+{
+    uint32_t off = addr % NVM_CACHE_SIZE;
+    uint32_t base = addr - off;
+    int ret;
+    memcpy(NVM_CACHE, (void *)base, NVM_CACHE_SIZE);
+    ret = hal_flash_erase(base, WOLFBOOT_SECTOR_SIZE);
+    if (ret != 0)
+        return ret;
+    memcpy(NVM_CACHE + off, &wolfboot_magic_trail, sizeof(uint32_t));
+    ret = hal_flash_write(base, NVM_CACHE, WOLFBOOT_SECTOR_SIZE);
+    return ret;
+}
 #else
 #   define hal_trailer_write(addr, val) hal_flash_write(addr, (void *)&val, 1)
+#   define hal_set_partition_magic(addr) hal_flash_write(addr, (void*)&wolfboot_magic_trail, sizeof(uint32_t));
 #endif
 
 #if defined EXT_FLASH
@@ -103,19 +119,18 @@ static void RAMFUNCTION set_trailer_at(uint8_t part, uint32_t at, uint8_t val)
 
 static void RAMFUNCTION set_partition_magic(uint8_t part)
 {
-    uint32_t wolfboot_magic_trail = WOLFBOOT_MAGIC_TRAIL;
     if (part == PART_BOOT) {
         if (PARTN_IS_EXT(PART_BOOT)) {
             ext_flash_write(PART_BOOT_ENDFLAGS - sizeof(uint32_t), (void *)&wolfboot_magic_trail, sizeof(uint32_t));
         } else {
-            hal_flash_write(PART_BOOT_ENDFLAGS - sizeof(uint32_t), (void *)&wolfboot_magic_trail, sizeof(uint32_t));
+            hal_set_partition_magic(PART_BOOT_ENDFLAGS - sizeof(uint32_t));
         }
     }
     else if (part == PART_UPDATE) {
         if (PARTN_IS_EXT(PART_UPDATE)) {
             ext_flash_write(PART_UPDATE_ENDFLAGS - sizeof(uint32_t), (void *)&wolfboot_magic_trail, sizeof(uint32_t));
         } else {
-            hal_flash_write(PART_UPDATE_ENDFLAGS - sizeof(uint32_t), (void *)&wolfboot_magic_trail, sizeof(uint32_t));
+            hal_set_partition_magic(PART_UPDATE_ENDFLAGS - sizeof(uint32_t));
         }
     }
 }
@@ -143,12 +158,11 @@ static void RAMFUNCTION set_trailer_at(uint8_t part, uint32_t at, uint8_t val)
 
 static void RAMFUNCTION set_partition_magic(uint8_t part)
 {
-    uint32_t wolfboot_magic_trail = WOLFBOOT_MAGIC_TRAIL;
     if (part == PART_BOOT) {
-        hal_flash_write(PART_BOOT_ENDFLAGS - sizeof(uint32_t), (void *)&wolfboot_magic_trail, sizeof(uint32_t));
+        hal_set_partition_magic(PART_BOOT_ENDFLAGS - sizeof(uint32_t));
     }
     else if (part == PART_UPDATE) {
-        hal_flash_write(PART_UPDATE_ENDFLAGS - sizeof(uint32_t), (void *)&wolfboot_magic_trail, sizeof(uint32_t));
+        hal_set_partition_magic(PART_UPDATE_ENDFLAGS - sizeof(uint32_t));
     }
 }
 #endif /* EXT_FLASH */
@@ -193,12 +207,11 @@ int RAMFUNCTION wolfBoot_set_partition_state(uint8_t part, uint8_t newst)
     return 0;
 }
 
-int RAMFUNCTION wolfBoot_set_sector_flag(uint8_t part, uint8_t sector, uint8_t newflag)
+int RAMFUNCTION wolfBoot_set_sector_flag(uint8_t part, uint16_t sector, uint8_t newflag)
 {
     uint32_t *magic;
     uint8_t *flags;
     uint8_t fl_value;
-    const uint32_t wolfboot_magic_trail = WOLFBOOT_MAGIC_TRAIL;
     uint8_t pos = sector >> 1;
     magic = get_partition_magic(part);
     if (*magic != wolfboot_magic_trail)
@@ -225,7 +238,7 @@ int RAMFUNCTION wolfBoot_get_partition_state(uint8_t part, uint8_t *st)
     return 0;
 }
 
-int wolfBoot_get_sector_flag(uint8_t part, uint8_t sector, uint8_t *flag)
+int wolfBoot_get_sector_flag(uint8_t part, uint16_t sector, uint8_t *flag)
 {
     uint32_t *magic;
     uint8_t *flags;