Move functions to RAM for flash operation

Author: miyazakh

IDE/Renesas/e2studio/RX72N/app_RenesasRX01/.cproject

@@ -44,5 +44,10 @@
 			<type>1</type>
 			<locationURI>PARENT-5-PROJECT_LOC/hal/renesas-rx.c</locationURI>
 		</link>
+		<link>
+			<name>src/string.c</name>
+			<type>1</type>
+			<locationURI>PARENT-5-PROJECT_LOC/src/string.c</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>

IDE/Renesas/e2studio/RX72N/app_RenesasRX01/.project

@@ -27,7 +27,8 @@
 #include <string.h>
 #include "hal.h"
 #include "wolfboot/wolfboot.h"
-
+#include "image.h"
+#include "r_smc_entry.h"
 static const char* state2str(uint8_t s)
 {
     switch(s) {
@@ -39,6 +40,17 @@ static const char* state2str(uint8_t s)
     }
 }
 
+static const char* upFlag2str(uint8_t s)
+{
+    switch(s) {
+        case SECT_FLAG_NEW: return "New";
+        case SECT_FLAG_SWAPPING: return "Swapping";
+        case SECT_FLAG_BACKUP: return "Backup";
+        case SECT_FLAG_UPDATED: return "Updated";
+        default: return "Unknown";
+    }
+}
+
 static void printPart(uint8_t *part)
 {
 #ifdef WOLFBOOT_DEBUG_PARTION
@@ -47,16 +59,21 @@ static void printPart(uint8_t *part)
 #endif
     uint8_t  *magic;
     uint8_t  state;
+    uint8_t  upflag;
     uint32_t ver;
 
     magic = part;
     printf("Magic:    %c%c%c%c\n", magic[0], magic[1], magic[2], magic[3]);
     ver = wolfBoot_get_blob_version(part);
     printf("Version:  %02x\n", ver);
-    state = *(part + WOLFBOOT_PARTITION_SIZE - sizeof(uint32_t) - 1);
+    wolfBoot_get_partition_state(0, &state);
     printf("Status:   %02x (%s)\n", state,state2str(state));
     magic = part + WOLFBOOT_PARTITION_SIZE - sizeof(uint32_t);
+    if (magic[0] != 0x42)
+    	magic = part + WOLFBOOT_PARTITION_SIZE - WOLFBOOT_SECTOR_SIZE - sizeof(uint32_t);
     printf("Trailer Mgc: %c%c%c%c\n", magic[0], magic[1], magic[2], magic[3]);
+    wolfBoot_get_update_sector_flag(0, &upflag);
+    printf("Update flag: %02x (%s)\n", upflag, upFlag2str(upflag));
 
 #ifdef WOLFBOOT_DEBUG_PARTION
     v = (uint32_t *)part;
@@ -68,7 +85,18 @@ static void printPart(uint8_t *part)
 #endif
 
 }
-
+#ifdef WOLFBOOT_DEBUG_PARTION
+static void verify_flash_write(uint32_t addr, int len)
+{
+    uint8_t *p = (uint8_t *)addr;
+    int i;
+    printf("verify addr=0x%08x: ", addr);
+    for (i = 0; i < len && i < 8; i++) {
+        printf("%02x ", p[i]);
+    }
+    printf("\n");
+}
+#endif
 
 static void printPartitions(void)
 {

IDE/Renesas/e2studio/RX72N/app_RenesasRX01/app_RenesasRX01.scfg

@@ -278,5 +278,10 @@
 #else
 #   define WOLFSSL_SMALL_STACK
 #endif
-
+#define PRINTF_ENABLED
+#define NVM_FLASH_WRITEONCE
+#ifdef XMEMCPY
+ #undef XMEMCPY
+ #define XMEMCPY ram_memcpy
+#endif
 #endif /* !H_USER_SETTINGS_ */

IDE/Renesas/e2studio/RX72N/app_RenesasRX01/src/app_RenesasRX01.c

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
 <com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
+  <sections name="SI">
     <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
   </sections>
-  <sections name="SI"/>
   <sections name="B_1"/>
   <sections name="R_1"/>
   <sections name="B_2"/>
@@ -13,9 +12,12 @@
   <sections name="B_8"/>
   <sections name="R_8"/>
   <sections name="RPFRAM"/>
-  <sections name="RPFRAM2"/>
+  <sections name="C_FIRMWARE_UPDATE_CONTROL_BLOCK">
+    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
+  </sections>
+  <sections name="C_FIRMWARE_UPDATE_CONTROL_BLOCK_MIRROR"/>
   <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4290839040"/>
+    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4290772992"/>
   </sections>
   <sections name="C_1"/>
   <sections name="C_2"/>
@@ -27,7 +29,6 @@
   <sections name="L"/>
   <sections name="P"/>
   <sections name="PFRAM"/>
-  <sections name="PFRAM2"/>
   <sections name="EXCEPTVECT">
     <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
   </sections>

IDE/Renesas/e2studio/RX72N/include/user_settings.h

@@ -485,8 +485,23 @@ void hal_prepare_boot(void)
 
 }
 
+#ifdef __CCRX__
+/* copy RAM functions from ROM to RAM */
+static void copyfuncs(void)
+{
+	unsigned char *dst, *src;
+	src = __sectop("PFRAM");
+	dst = __sectop("RPFRAM");
+	while(src < __secend("PFRAM")) {
+		*dst++ = *src++;
+	}
+}
+#endif
 int hal_flash_init(void)
 {
+#ifdef __CCRX__
+	copyfuncs();
+#endif
     /* Flash Write Enable */
     FLASH_FWEPROR = FLASH_FWEPROR_FLWE;
 
@@ -506,23 +521,41 @@ int hal_flash_init(void)
 /* write up to 128 bytes at a time */
 #define FLASH_FACI_CODE_BLOCK_SZ \
     (FLASH_FACI_CMD_PROGRAM_CODE_LENGTH * FLASH_FACI_CMD_PROGRAM_DATA_LENGTH)
+#define FLASH_OK              0
+#define FLASH_ERR_ALIGN      -1
+#define FLASH_ERR_PRG        -2
+#define FLASH_ERR_ILGL       -3
+#define FLASH_ERR_ERS        -4
+#ifdef __CCRX__
+#pragma section FRAM
+#define MEMCPY ram_memcpy
+#else
+#define MEMCPY memcpy
+#endif
 int RAMFUNCTION hal_flash_write(uint32_t addr, const uint8_t *data, int len)
 {
-    int ret, i, chunk;
-    uint8_t codeblock[FLASH_FACI_CODE_BLOCK_SZ];
+    int i;
+    uint8_t codeblock[FLASH_FACI_CODE_BLOCK_SZ] = {0};
     uint16_t* data16 = (uint16_t*)data;
+    uint32_t block_base;
+    uint32_t offset;
+    int      write_size;
 
     while (len > 0) {
-        /* handle partial remainder */
-        if (len < FLASH_FACI_CODE_BLOCK_SZ) {
-            uint8_t *src = (uint8_t*)addr;
-            int remain = FLASH_FACI_CODE_BLOCK_SZ - len;
-            memcpy(codeblock, data16, len);
-            memcpy(codeblock + len, src + len, remain);
-            data16 = (uint16_t*)codeblock;
-        }
+    	/* Align address to 128-byte boundary */
+    	block_base = addr & ~(FLASH_FACI_CODE_BLOCK_SZ - 1);
+    	offset = addr - block_base;
+
+    	MEMCPY(codeblock, (uint8_t*)block_base, FLASH_FACI_CODE_BLOCK_SZ);
+    	write_size = FLASH_FACI_CODE_BLOCK_SZ - offset;
+    	if (write_size > len)
+    		write_size = len;
 
-        FLASH_FSADDR = addr;
+    	MEMCPY(&codeblock[offset], data, write_size);
+    	data16 = (uint16_t*)codeblock;
+
+
+        FLASH_FSADDR = block_base;
         /* flash program command */
         FLASH_FACI_CMD8 = FLASH_FACI_CMD_PROGRAM;
         /* number of 16-bit blocks: for code blocks is always 0x40 (64) */
@@ -539,9 +572,18 @@ int RAMFUNCTION hal_flash_write(uint32_t addr, const uint8_t *data, int len)
 
         /* Wait for FCU operation to complete */
         while ((FLASH_FSTATR & FLASH_FSTATR_FRDY) == 0);
-
-        len -= FLASH_FACI_CODE_BLOCK_SZ;
-        addr += FLASH_FACI_CODE_BLOCK_SZ;
+        if (FLASH_FSTATR & FLASH_FSTATR_ILGLERR) {
+        	return FLASH_ERR_ILGL;
+        }
+        if (FLASH_FSTATR & FLASH_FSTATR_PRGERR) {
+        	return FLASH_ERR_PRG;
+        }
+        if (FLASH_FSTATR & FLASH_FSTATR_ERSERR) {
+        	return FLASH_ERR_PRG;
+        }
+        len -= write_size;
+        addr += write_size;
+        data += write_size;
     }
     return 0;
 }
@@ -639,7 +681,9 @@ void RAMFUNCTION hal_flash_lock(void)
         FLASH_FENTRYR_CODE_READ | FLASH_FENTRYR_DATA_READ);
     return;
 }
-
+#ifdef __CCRX__
+#pragma section
+#endif
 #if !defined(WOLFBOOT_NO_PARTITIONS) && !defined(TARGET_library)
 void* hal_get_primary_address(void)
 {

IDE/Renesas/e2studio/RX72N/resouce/section_info_SWuse.esi

@@ -55,6 +55,16 @@ static void longJump(const uint32_t *app_offset)
     jmp   r1;
 }
 #endif
+static void verify_flash_write(uint32_t addr, int len)
+{
+    uint8_t *p = (uint8_t *)addr;
+    int i;
+    printf("verify addr=0x%08x: ", addr);
+    for (i = 0; i < len && i < 8; i++) {
+        printf("%02x ", p[i]);
+    }
+    printf("\n");
+}
 
 /* Calls the application entry point */
 void do_boot(const uint32_t *app_offset)
@@ -84,6 +94,7 @@ void do_boot(const uint32_t *app_offset)
 #if defined(__RX__)
     /* Do unconditional jump (r1 = app_offset) */
     #if defined(__CCRX__)
+    	printf("app_offset 0x%p\n", app_offset);
         longJump(app_offset);
     #else
         app_entry = (void(*))(*app_offset);

IDE/Renesas/e2studio/RX72N/wolfBoot/.cproject

@@ -218,7 +218,9 @@ void WEAKFUNCTION hal_cache_invalidate(void)
 {
     /* if cache flushing is required implement in hal */
 }
-
+#ifdef __CCRX__
+#pragma section FRAM
+#endif
 static int RAMFUNCTION nvm_select_fresh_sector(int part)
 {
     int sel;
@@ -377,7 +379,9 @@ static int RAMFUNCTION partition_magic_write(uint8_t part, uintptr_t addr)
     ret = hal_flash_erase(addr_read, WOLFBOOT_SECTOR_SIZE);
     return ret;
 }
-
+#ifdef __CCRX__
+#pragma section
+#endif
 #else
 #   define trailer_write(part,addr, val) hal_flash_write(addr, (void *)&val, 1)
 #   define partition_magic_write(part,addr) hal_flash_write(addr, \
@@ -395,6 +399,9 @@ void     RAMFUNCTION set_trailer_at(uint8_t part, uint32_t at, uint8_t val);
 void     RAMFUNCTION set_partition_magic(uint8_t part);
 
 #elif !defined(WOLFBOOT_FIXED_PARTITIONS)
+#ifdef __CCRX__
+#pragma section FRAM
+#endif
 static uint8_t* RAMFUNCTION get_trailer_at(uint8_t part, uint32_t at)
 {
     (void)part;
@@ -413,9 +420,13 @@ static void RAMFUNCTION set_partition_magic(uint8_t part)
     (void)part;
     return;
 }
-
+#ifdef __CCRX__
+#pragma section
+#endif
 #else
-
+#ifdef __CCRX__
+#pragma section FRAM
+#endif
 /**
  * @brief Get the trailer at a specific address
  *
@@ -550,12 +561,18 @@ static void RAMFUNCTION set_partition_magic(uint8_t part)
         }
     }
 }
+#ifdef __CCRX__
+#pragma section
+#endif
 #endif
 #endif /* !MOCK_PARTITION_TRAILER */
 
 
 
 #ifdef WOLFBOOT_FIXED_PARTITIONS
+#ifdef __CCRX__
+#pragma section FRAM
+#endif
 /**
  * @brief Get the magic trailer of a partition.
  *
@@ -843,6 +860,9 @@ void RAMFUNCTION wolfBoot_success(void)
     wolfBoot_erase_encrypt_key();
 #endif
 }
+#ifdef __CCRX__
+#pragma section
+#endif
 #endif /* WOLFBOOT_FIXED_PARTITIONS */
 
 /**