Fixes for properly functioning network core updates.

Author: dgarske

docs/Targets.md

@@ -2202,18 +2202,33 @@ QSPI Freq=24MHz (Div Clk=3/Sck=1), Addr=24-bits, PageSz=256
 QSPI Activate
 QSPI Flash ID (ret 0): 0xC2 0x28 0x17
 Status Reg: Ret 0, 0x40 (Quad Enabled: Yes)
-QSPI Flash Read: Ret 0, Cmd 0xEB, Len 4 , 0xEDFFC -> 0x2000022C
-QSPI Flash Read: Ret 0, Cmd 0xEB, Len 4 , 0xEDFFC -> 0x2000022C
-Boot partition: 0xC000 (size 7428, version 0x1)
-QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x0 -> 0x20000128
-Update partition: 0x0 (size 7428, version 0x2)
-QSPI Flash Read: Ret 0, Cmd 0xEB, Len 4 , 0xEDFFC -> 0x2000022C
-Boot partition: 0xC000 (size 7428, version 0x1)
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x0 -> 0x2000012C
+Update partition: 0x0 (sz 7864, ver 0x2, type 0x201)
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x100000 -> 0x2000012C
+Update partition: 0x100000 (sz 5780, ver 0x2, type 0x202)
+Network Image: Ver 0x2, Size 5780
+Network Core: Holding for update
+Status: App 1 (ver 2), Net 1 (ver 1)
+QSPI Flash ID (ret 0): 0xC2 0x28 0x17
+Status Reg: Ret 0, 0x40 (Quad Enabled: Yes)
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 4 , 0xEDFFC -> 0x20000230
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 4 , 0xEDFFC -> 0x20000230
+Boot partition: 0xC000 (sz 7864, ver 0x1, type 0x201)
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x0 -> 0x2000012C
+Update partition: 0x0 (sz 7864, ver 0x2, type 0x201)
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 4 , 0xEDFFC -> 0x20000230
+Boot partition: 0xC000 (sz 7864, ver 0x1, type 0x201)
 Booting version: 0x1
-QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x100000 -> 0x20000128
-Update partition: 0x100000 (size 5492, version 0x2)
-QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x0 -> 0x20000230
-Network version: 0x2
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x0 -> 0x2000012C
+Update partition: 0x0 (sz 7864, ver 0x2, type 0x201)
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x100000 -> 0x2000012C
+Update partition: 0x100000 (sz 5780, ver 0x2, type 0x202)
+Network Image: Ver 0x2, Size 5780
+Found Network Core update: Ver 1->2, Size 6036->6036
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 256 , 0x101700 -> 0x2000002C
+Network image valid, loading into shared mem
+QSPI Flash Read: Ret 0, Cmd 0xEB, Len 6036 , 0x100000 -> 0x20010020
+Network core firmware update done
 ========================
 nRF5340 wolfBoot (app core)
 Copyright 2024 wolfSSL Inc
@@ -2228,15 +2243,25 @@ Network Core:
 
 ```
 wolfBoot HAL Init (net core)
-Boot partition: 0x100C000 (size 5492, version 0x1)
-Update partition: 0x100C000 (size 5492, version 0x1)
-Boot partition: 0x100C000 (size 5492, version 0x1)
-Booting version: 0x1
+Boot partition: 0x100C000 (sz 5780, ver 0x1, type 0x201)
+Network Image: Ver 0x1, Size 5780
+Starting update: Ver 1->2, Size 6036->6036
+Internal Flash Erase: addr 0x100C000, len 6036
+Internal Flash Erase: page 0x100C000
+Internal Flash Erase: page 0x100C800
+Internal Flash Erase: page 0x100D000
+Internal Flash Write: addr 0x100C000, len 6036
+Boot partition: 0x100C000 (sz 5780, ver 0x2, type 0x202)
+Network Image: Ver 0x2, Size 5780
+Network version (after update): 0x2
+Status: App 2 (ver 2), Net 4 (ver 2)
+Boot partition: 0x100C000 (sz 5780, ver 0x2, type 0x202)
+Booting version: 0x2
 ========================
 nRF5340 wolfBoot (net core)
 Copyright 2024 wolfSSL Inc
 GPL v3
-Version : 0x1
+Version : 0x2
 ========================
 Internal Flash Write: addr 0x1039FFC, len 4
 Internal Flash Write: addr 0x1039FFB, len 1
@@ -3050,8 +3075,8 @@ repository that can be directly flashed into the BIOS flash of the board.
 
 ## Infineon AURIX TC3xx
 
-wolfBoot supports the AURIX TC3xx family of devices, and provides a demo application targeting the TC375 AURIX LiteKit-V2.
+wolfBoot supports the AURIX TC3xx family of devices, and provides a demo application targeting the TC375 AURIX LiteKit-V2. 
 
-For detailed instructions on using wolfBoot with the AURIX TC3xx, please refer to [IDE/AURIX/README.md](../IDE/AURIX/README.md)
+For detailed instructions on using wolfBoot with the AURIX TC3xx, please refer to [IDE/AURIX/README.md](../IDE/AURIX/README.md)  
 
-wolfBoot can also integrate with [wolfHSM](https://www.wolfssl.com/products/wolfhsm/) on AURIX TC3xx devices, offloading cryptographic operations and key storage to the AURIX HSM core. For more information on using wolfBoot with wolfHSM on AURIX devices, please contact us at facts@wolfssl.com.
+wolfBoot can also integrate with [wolfHSM](https://www.wolfssl.com/products/wolfhsm/) on AURIX TC3xx devices, offloading cryptographic operations and key storage to the AURIX HSM core. For more information on using wolfBoot with wolfHSM on AURIX devices, please contact us at facts@wolfssl.com. 

hal/nrf5340.c

@@ -209,19 +209,21 @@ int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
 {
     uint32_t end = address + len - 1;
     uint32_t p;
-    uint32_t page_sz = (address < FLASH_BASE_NET) ?
-        FLASH_PAGESZ_APP :
-        FLASH_PAGESZ_NET;
 #ifdef DEBUG_FLASH
     wolfBoot_printf("Internal Flash Erase: addr 0x%x, len %d\n", address, len);
 #endif
-    for (p = address; p <= end; p += page_sz) {
+    /* mask to page start address */
+    address &= ~(FLASH_PAGE_SIZE-1);
+    for (p = address; p <= end; p += FLASH_PAGE_SIZE) {
         /* set both secure and non-secure registers */
         NVMC_CONFIG = NVMC_CONFIG_EEN;
         NVMC_CONFIGNS = NVMC_CONFIG_EEN;
         while (NVMC_READY == 0);
         *(volatile uint32_t *)p = 0xFFFFFFFF;
         while (NVMC_READY == 0);
+    #ifdef DEBUG_FLASH
+        wolfBoot_printf("Internal Flash Erase: page 0x%x\n", p);
+    #endif
     }
     return 0;
 }
@@ -319,10 +321,13 @@ static int hal_net_get_image(struct wolfBoot_image* img, ShmInfo_t* info)
     ret = wolfBoot_open_image(img, PART_BOOT);
 #endif /* TARGET_nrf5340_* */
     if (ret == 0) {
-        info->version = wolfBoot_get_blob_version(get_image_hdr(img));
-        info->size = img->fw_size;
+        uint32_t ver = wolfBoot_get_blob_version(get_image_hdr(img));
+        /* Note: network core fault writing to shared memory means application
+         *       core did not enable access at run-time yet */
+        info->version = ver;
+        info->size = IMAGE_HEADER_SIZE + img->fw_size;
         wolfBoot_printf("Network Image: Ver 0x%x, Size %d\n",
-            info->version, info->size);
+            ver, img->fw_size);
     }
     else {
         info->version = 0; /* not known */
@@ -390,18 +395,17 @@ static void hal_net_check_version(void)
         wolfBoot_printf("Starting update: Ver %d->%d, Size %d->%d\n",
             shm->net.version, shm->app.version, shm->net.size, shm->net.size);
         /* Erase network core boot flash */
-        wb_flash_erase(&img, 0, WOLFBOOT_PARTITION_SIZE);
+        hal_flash_erase((uintptr_t)img.hdr, shm->app.size);
         /* Write new firmware to internal flash */
-        wb_flash_write(&img, 0, shm->data, shm->app.size);
+        hal_flash_write((uintptr_t)img.hdr, shm->data, shm->app.size);
 
         /* Reopen image and refresh information */
-        wolfBoot_open_image(&img, PART_BOOT);
+        hal_net_get_image(&img, &shm->net);
         wolfBoot_printf("Network version (after update): 0x%x\n",
             shm->net.version);
-        hal_net_get_image(&img, &shm->net);
         hal_shm_status_set(&shm->net, SHARED_STATUS_UPDATE_DONE);
 
-        /* continue booting */
+        /* continue booting - boot process will validate image hash/signature */
     }
 #endif /* TARGET_nrf5340_* */
 exit:
@@ -420,19 +424,18 @@ void hal_net_check_update(void)
     ret = hal_net_get_image(&img, &shm->app);
     if (ret == 0 && shm->app.version > shm->net.version) {
         wolfBoot_printf("Found Network Core update: Ver %d->%d, Size %d->%d\n",
-            shm->net.version, shm->app.version, shm->net.size, shm->net.size);
+            shm->net.version, shm->app.version, shm->net.size, shm->app.size);
 
         /* validate the update is valid */
         if (wolfBoot_verify_integrity(&img) == 0 &&
             wolfBoot_verify_authenticity(&img) == 0)
         {
-            uint32_t fw_size = IMAGE_HEADER_SIZE + img.fw_size;
             wolfBoot_printf("Network image valid, loading into shared mem\n");
             /* relocate image to shared ram */
         #ifdef EXT_FLASH
-            ret = ext_flash_read(PART_NET_ADDR, shm->data, fw_size);
+            ret = ext_flash_read(PART_NET_ADDR, shm->data, shm->app.size);
         #else
-            memcpy(shm->data, img.hdr, fw_size);
+            memcpy(shm->data, img.hdr, shm->app.size);
         #endif
             if (ret >= 0) {
                 /* signal network core to do update */
@@ -441,8 +444,9 @@ void hal_net_check_update(void)
                 /* wait for update_done */
                 ret = hal_shm_status_wait(&shm->net,
                     SHARED_STATUS_UPDATE_DONE, 1000000);
-                if (ret == 0)
-                    wolfBoot_printf("Network core firmware update sent\n");
+                if (ret == 0) {
+                    wolfBoot_printf("Network core firmware update done\n");
+                }
             }
         }
         else {
@@ -474,15 +478,15 @@ void hal_init(void)
         (SPU_EXTDOMAIN_PERM_SECATTR_SECURE | SPU_EXTDOMAIN_PERM_UNLOCK);
 #endif
 
-    spi_flash_probe();
-
-    hal_net_check_version();
-
 #ifdef TEST_FLASH
     if (test_flash() != 0) {
         wolfBoot_printf("Internal flash Test Failed!\n");
     }
 #endif
+
+    spi_flash_probe();
+
+    hal_net_check_version();
 }
 
 
@@ -506,7 +510,8 @@ void hal_prepare_boot(void)
 #ifdef TEST_FLASH
 
 #ifndef TEST_ADDRESS
-    #define TEST_ADDRESS (FLASH_BASE_ADDR + (FLASH_SIZE - WOLFBOOT_SECTOR_SIZE))
+    #define TEST_SZ      (WOLFBOOT_SECTOR_SIZE * 2)
+    #define TEST_ADDRESS (FLASH_BASE_ADDR + (FLASH_SIZE - TEST_SZ))
 #endif
 
 /* #define TEST_FLASH_READONLY */
@@ -516,7 +521,7 @@ static int test_flash(void)
     int ret = 0;
     uint32_t i, len;
     uint8_t* pagePtr = (uint8_t*)TEST_ADDRESS;
-    static uint8_t pageData[WOLFBOOT_SECTOR_SIZE];
+    static uint8_t pageData[TEST_SZ];
 
     wolfBoot_printf("Internal flash test at 0x%x\n", TEST_ADDRESS);
 
@@ -528,7 +533,7 @@ static int test_flash(void)
 #ifndef TEST_FLASH_READONLY
     /* Erase sector */
     hal_flash_unlock();
-    ret = hal_flash_erase(TEST_ADDRESS, WOLFBOOT_SECTOR_SIZE);
+    ret = hal_flash_erase(TEST_ADDRESS, sizeof(pageData));
     hal_flash_lock();
     if (ret != 0) {
         wolfBoot_printf("Erase Sector failed: Ret %d\n", ret);

include/spi_drv.h

@@ -99,7 +99,7 @@ int spi_xfer(int cs, const uint8_t* tx, uint8_t* rx, uint32_t sz, int flags);
     #define QSPI_ADDR_MODE  QSPI_DATA_MODE_SPI
 #endif
 #ifndef QSPI_ADDR_SZ /* default to 24-bit address */
-    #define QSPI_ADDR_SZ           3
+    #define QSPI_ADDR_SZ    3
 #endif
 #ifndef QSPI_DATA_MODE /* data defaults to Quad mode */
     #define QSPI_DATA_MODE  QSPI_DATA_MODE_QSPI

src/image.c

@@ -885,7 +885,7 @@ int wolfBoot_open_image_address(struct wolfBoot_image *img, uint8_t *image)
     img->hdr_cache = image;
 #endif
 
-    wolfBoot_printf("%s partition: %p (sz %d, ver 0x%x, type 0x%d)\n",
+    wolfBoot_printf("%s partition: %p (sz %d, ver 0x%x, type 0x%x)\n",
         (img->part == PART_BOOT) ? "Boot" : "Update",
         img->hdr, (unsigned int)img->fw_size,
         wolfBoot_get_blob_version(image),

src/update_flash.c

@@ -526,22 +526,22 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
      * checks on the firmware update
      * before starting the swap
      */
-
     update_type = wolfBoot_get_image_type(PART_UPDATE);
 
     wolfBoot_get_update_sector_flag(0, &flag);
     /* Check the first sector to detect interrupted update */
     if (flag == SECT_FLAG_NEW) {
-        if (((update_type & 0x000F) != HDR_IMG_TYPE_APP) ||
-            ((update_type & 0xFF00) != HDR_IMG_TYPE_AUTH)) {
-            wolfBoot_printf("Invalid update type %d\n", update_type);
+        if (((update_type & HDR_IMG_TYPE_PART_MASK) != HDR_IMG_TYPE_APP) ||
+            ((update_type & HDR_IMG_TYPE_AUTH_MASK) != HDR_IMG_TYPE_AUTH)) {
+            wolfBoot_printf("Invalid update type 0x%x\n", update_type);
             return -1;
         }
         if (update.fw_size > MAX_UPDATE_SIZE - 1) {
             wolfBoot_printf("Invalid update size %u\n", update.fw_size);
             return -1;
         }
-        if (!update.hdr_ok || (wolfBoot_verify_integrity(&update) < 0)
+        if (!update.hdr_ok
+                || (wolfBoot_verify_integrity(&update) < 0)
                 || (wolfBoot_verify_authenticity(&update) < 0)) {
             wolfBoot_printf("Update integrity/verification failed!\n");
             return -1;
@@ -872,10 +872,9 @@ void RAMFUNCTION wolfBoot_start(void)
     wolfBoot_check_self_update();
 #endif
 
-    bootRet = wolfBoot_get_partition_state(PART_BOOT, &bootState);
+    bootRet =   wolfBoot_get_partition_state(PART_BOOT, &bootState);
     updateRet = wolfBoot_get_partition_state(PART_UPDATE, &updateState);
 
-
 #if !defined(DISABLE_BACKUP)
     /* resume the final erase in case the power failed before it finished */
     resumedFinalErase = wolfBoot_swap_and_final_erase(1);