Fixed missing long_call attribute, hal erase/write

Fix definition of secure/non-secure flash areas

+ other minor fixes

Author: danielinux

arch.mk

@@ -243,6 +243,10 @@ ifeq ($(ARCH),ARM)
       LSCRIPT_IN=hal/$(TARGET)-ns.ld
     endif
     SPI_TARGET=stm32
+    ifneq ($(DEBUG),0)
+        CFLAGS+=-DPKCS11_SMALL
+    endif
+
   endif
 
   ifeq ($(TARGET),rp2350)

hal/stm32_tz.c

@@ -294,7 +294,7 @@ void hal_tz_sau_init(void)
     sau_init_region(1, WOLFBOOT_PARTITION_BOOT_ADDRESS, FLASH_BANK2_BASE - 1, 0);
 
     /* Secure: application flash area (second bank) */
-    sau_init_region(2, WOLFBOOT_PARTITION_UPDATE_ADDRESS, FLASH_TOP -1, 0);
+    sau_init_region(2, WOLFBOOT_PARTITION_UPDATE_ADDRESS, FLASH_TOP, 0);
 
     /* Secure RAM regions in SRAM1/SRAM2 */
     sau_init_region(3, 0x30000000, 0x3004FFFF, 1);

hal/stm32h5.c

@@ -25,24 +25,23 @@
 
 #include "hal.h"
 #include "hal/stm32h5.h"
+#include "hal/armv8m_tz.h"
 
 #define PLL_SRC_HSE 1
 
 #if TZ_SECURE()
+
+/* This function assumes that the boot and the update
+ * partitions are at the same address in the two banks,
+ * regardless wheather DUALBANK_SWAP is active or not.
+ */
 static int is_flash_nonsecure(uint32_t address)
 {
     uint32_t in_bank_offset = address & 0x000FFFFF;
-#ifdef DUALBANK_SWAP
     if (in_bank_offset >= (WOLFBOOT_PARTITION_BOOT_ADDRESS - FLASHMEM_ADDRESS_SPACE))
         return 1;
     else
         return 0;
-#else
-    if (address >= WOLFBOOT_PARTITION_BOOT_ADDRESS)
-        return 1;
-    else
-        return 0;
-#endif
 }
 #endif
 
@@ -101,11 +100,9 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
     dst = (uint32_t *)address;
 
 #if (TZ_SECURE())
+    dst = (uint32_t *)(address | FLASH_SECURE_MMAP_BASE);
     if (is_flash_nonsecure(address)) {
         hal_tz_claim_nonsecure_area(address, len);
-    } else if (((uint32_t)dst & 0x0F000000) == 0x08000000) {
-        /* Convert into secure address space */
-        dst = (uint32_t *)((address & (~FLASHMEM_ADDRESS_SPACE)) | FLASH_SECURE_MMAP_BASE);
     }
 #endif
     while (i < len) {
@@ -124,6 +121,7 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
             FLASH_SR |= FLASH_SR_EOP;
         FLASH_CR &= ~FLASH_CR_PG;
         i+=8;
+        DSB();
     }
 #if (TZ_SECURE())
     if (is_flash_nonsecure(address)) {
@@ -201,7 +199,6 @@ int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
             base = FLASH_BANK2_BASE;
             bnksel = 1;
         }
-
 #if TZ_SECURE()
         /* When in secure mode, skip erasing non-secure pages: will be erased upon claim */
         if (is_flash_nonsecure(address)) {

hal/stm32h5.ld

@@ -1,10 +1,10 @@
 MEMORY
 {
-    FLASH (rx) :    ORIGIN = @WOLFBOOT_ORIGIN@, LENGTH = @BOOTLOADER_PARTITION_SIZE@ - 0x20000
-    RAM (rwx) :     ORIGIN = 0x30000000, LENGTH = 0x30000
+    FLASH (rx) :    ORIGIN = @WOLFBOOT_ORIGIN@, LENGTH = @BOOTLOADER_PARTITION_SIZE@ - 0x1C000
+    RAM (rwx) :     ORIGIN = 0x30000000, LENGTH = 0x20000
     RAM_KV (rw):    ORIGIN = 0x30020000, LENGTH = 0x10000
     RAM_HEAP (rw):  ORIGIN = 0x30030000, LENGTH = 0x10000 /* 64KB Heap for wolfcrypt/PKCS11 */
-    FLASH_KEYVAULT(rw): ORIGIN = @WOLFBOOT_ORIGIN@ + 0x20000, LENGTH = 0x18000
+    FLASH_KEYVAULT(rw): ORIGIN = @WOLFBOOT_ORIGIN@ + 0x24000, LENGTH = 0x14000
     FLASH_NSC(rx): ORIGIN = @WOLFBOOT_ORIGIN@ + 0x38000, LENGTH = 0x8000
 }
 
@@ -14,8 +14,8 @@ SECTIONS
     {
         _start_text = .;
         KEEP(*(.isr_vector))
-        *(.text*)
-        *(.rodata*)
+       *(.text*)
+       *(.rodata*)
         . = ALIGN(8);
         _end_text = .;
     } > FLASH

options.mk

@@ -769,6 +769,9 @@ ifeq ($(RAM_CODE),1)
        LSCRIPT_IN=hal/$(TARGET)_chacha_ram.ld
     endif
   endif
+  ifeq ($(ARCH),ARM)
+    CFLAGS+=-mlong-calls
+  endif
 endif
 
 # Support external encryption cache

src/image.c

@@ -1204,7 +1204,7 @@ static void key_sha3_384(uint8_t key_slot, uint8_t *hash)
  * @param val The 32-bit integer value in little-endian byte order.
  * @return The 32-bit integer value in native byte order.
  */
-static inline uint32_t im2n(uint32_t val)
+static inline uint32_t RAMFUNCTION im2n(uint32_t val)
 {
 #ifdef BIG_ENDIAN_ORDER
     val = (((val & 0x000000FF) << 24) |
@@ -1223,7 +1223,7 @@ static inline uint32_t im2n(uint32_t val)
  * @param image The pointer to the image header.
  * @return The size of the image in bytes.
  */
-uint32_t wolfBoot_image_size(uint8_t *image)
+uint32_t RAMFUNCTION wolfBoot_image_size(uint8_t *image)
 {
     uint32_t *size = (uint32_t *)(image + sizeof (uint32_t));
     return im2n(*size);
@@ -1239,7 +1239,7 @@ uint32_t wolfBoot_image_size(uint8_t *image)
  * @param image The pointer to the image address.
  * @return 0 on success, -1 on error.
  */
-int wolfBoot_open_image_address(struct wolfBoot_image *img, uint8_t *image)
+int RAMFUNCTION wolfBoot_open_image_address(struct wolfBoot_image *img, uint8_t *image)
 {
     uint32_t *magic = (uint32_t *)(image);
     if (*magic != WOLFBOOT_MAGIC) {
@@ -1315,7 +1315,7 @@ int wolfBoot_get_dts_size(void *dts_addr)
  * @param part The partition ID (PART_BOOT, PART_UPDATE, PART_SWAP, etc.).
  * @return 0 on success, -1 on error.
  */
-int wolfBoot_open_image(struct wolfBoot_image *img, uint8_t part)
+int RAMFUNCTION wolfBoot_open_image(struct wolfBoot_image *img, uint8_t part)
 {
 #ifdef MMU
     int ret;

src/string.c

@@ -78,7 +78,7 @@ int isalpha(int c)
 
 #if !defined(__CCRX__) /* Renesas CCRX */
 #if !defined(__IAR_SYSTEMS_ICC__) && !defined(TARGET_X86_64_EFI)
-void *memset(void *s, int c, size_t n)
+void RAMFUNCTION *memset(void *s, int c, size_t n)
 {
     unsigned char *d = (unsigned char *)s;
 

src/update_flash.c

@@ -102,7 +102,7 @@ static void RAMFUNCTION wolfBoot_self_update(struct wolfBoot_image *src)
     arch_reboot();
 }
 
-void wolfBoot_check_self_update(void)
+void RAMFUNCTION wolfBoot_check_self_update(void)
 {
     uint8_t st;
     struct wolfBoot_image update;
@@ -237,7 +237,7 @@ static int RAMFUNCTION wolfBoot_copy_sector(struct wolfBoot_image *src,
  * new swap
  * @return 0 on success, negative value if no swap needed or on error
  */
-static int wolfBoot_swap_and_final_erase(int resume)
+static int RAMFUNCTION wolfBoot_swap_and_final_erase(int resume)
 {
     struct wolfBoot_image boot[1];
     struct wolfBoot_image update[1];
@@ -349,7 +349,7 @@ static int wolfBoot_swap_and_final_erase(int resume)
     #   define DELTA_BLOCK_SIZE 1024
     #endif
 
-static int wolfBoot_delta_update(struct wolfBoot_image *boot,
+static int RAMFUNCITON wolfBoot_delta_update(struct wolfBoot_image *boot,
     struct wolfBoot_image *update, struct wolfBoot_image *swap, int inverse,
     int resume)
 {
@@ -572,7 +572,7 @@ static int wolfBoot_delta_update(struct wolfBoot_image *boot,
     #define MAX_UPDATE_SIZE (size_t)((WOLFBOOT_PARTITION_SIZE - (2 *WOLFBOOT_SECTOR_SIZE)))
 #endif
 
-static int wolfBoot_get_total_size(struct wolfBoot_image* boot,
+static int RAMFUNCTION wolfBoot_get_total_size(struct wolfBoot_image* boot,
     struct wolfBoot_image* update)
 {
     uint32_t total_size = 0;

test-app/Makefile

@@ -184,15 +184,16 @@ ifeq ($(TARGET),stm32h5)
     APP_OBJS+=wcs/wolfcrypt_secure.o
     ifeq ($(WOLFCRYPT_TZ),1)
       APP_OBJS+=../lib/wolfssl/wolfcrypt/src/logging.o
-      APP_OBJS+=../lib/wolfssl/wolfcrypt/benchmark/benchmark.o
       APP_OBJS+=../lib/wolfssl/wolfcrypt/test/test.o
+      APP_OBJS+=../lib/wolfssl/wolfcrypt/benchmark/benchmark.o
     endif
   else
     LSCRIPT_TEMPLATE=ARM-stm32h5.ld
   endif
   CFLAGS+=-DAPP_HAS_SYSTICK
-  CFLAGS+=-DRAMFUNCTION='__attribute__((used,section(".ramcode")))'
+  CFLAGS+=-DRAMFUNCTION='__attribute__((used,section(".ramcode"),long_call))'
   CFLAGS+=-mcpu=cortex-m33 -ffunction-sections -fdata-sections -fno-common
+  CFLAGS+=-mlong-calls
   LDFLAGS+=-mcpu=cortex-m33
   LDFLAGS+=-Wl,-gc-sections -Wl,-Map=image.map
   CFLAGS+=-I..

test-app/wcs/user_settings.h

@@ -141,5 +141,7 @@ extern int tolower(int c);
 #define WOLFSSL_SP_NO_DYN_STACK
 
 
+struct timespec;
+int clock_gettime (unsigned long clock_id, struct timespec *tp);
 
 #endif /* !H_USER_SETTINGS_ */