WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed cosmetics after code reviews

pull/276/head
Daniele Lacamera 2023-01-27 08:35:08 +01:00
parent 42822cd1d8
commit d4cd79e678
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/libwolfboot.c
View File

@ -133,6 +133,12 @@ static const uint32_t wolfboot_magic_trail = WOLFBOOT_MAGIC_TRAIL;
* *
*/ */
#ifndef FLAGS_INVERT
#define FLAG_CMP(a,b) ((a < b)? 0 : 1)
#else
#define FLAG_CMP(a,b) ((a > b)? 0 : 1)
#endif
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
static uint8_t NVM_CACHE[NVM_CACHE_SIZE] __attribute__((aligned(16))); static uint8_t NVM_CACHE[NVM_CACHE_SIZE] __attribute__((aligned(16)));
@ -140,10 +146,11 @@ static int nvm_cached_sector = 0;
static int nvm_select_fresh_sector(int part) static int nvm_select_fresh_sector(int part)
{ {
int sel;
uint32_t off; uint32_t off;
uint32_t base; uint32_t base;
int sel;
uint32_t addr_align; uint32_t addr_align;
if (part == PART_BOOT) if (part == PART_BOOT)
base = PART_BOOT_ENDFLAGS; base = PART_BOOT_ENDFLAGS;
else else
@ -157,46 +164,37 @@ static int nvm_select_fresh_sector(int part)
uint8_t byte_0 = *(((uint8_t *)base) - off); uint8_t byte_0 = *(((uint8_t *)base) - off);
uint8_t byte_1 = *(((uint8_t *)base) - (WOLFBOOT_SECTOR_SIZE + off)); uint8_t byte_1 = *(((uint8_t *)base) - (WOLFBOOT_SECTOR_SIZE + off));
if (byte_0 == FLASH_BYTE_ERASED && byte_1 != FLASH_BYTE_ERASED) if (byte_0 == FLASH_BYTE_ERASED && byte_1 != FLASH_BYTE_ERASED) {
{
sel = 1; sel = 1;
break; break;
} }
else if (byte_0 != FLASH_BYTE_ERASED && byte_1 == FLASH_BYTE_ERASED) else if (byte_0 != FLASH_BYTE_ERASED && byte_1 == FLASH_BYTE_ERASED) {
{
sel = 0; sel = 0;
break; break;
} }
else if ((byte_0 == FLASH_BYTE_ERASED) && (byte_1 == FLASH_BYTE_ERASED)) else if ((byte_0 == FLASH_BYTE_ERASED) &&
{ (byte_1 == FLASH_BYTE_ERASED)) {
/* Examine previous position one byte ahead */ /* Examine previous position one byte ahead */
byte_0 = *(((uint8_t *)base) + 1 - off); byte_0 = *(((uint8_t *)base) + 1 - off);
byte_1 = *(((uint8_t *)base) + 1 - (WOLFBOOT_SECTOR_SIZE + off)); byte_1 = *(((uint8_t *)base) + 1 - (WOLFBOOT_SECTOR_SIZE + off));
#ifndef FLAGS_INVERT sel = FLAG_CMP(byte_0, byte_1);
if (byte_0 < byte_1)
sel = 0;
else
sel = 1;
#else
if (byte_0 > byte_1)
sel = 0;
else
sel = 1;
#endif
break; break;
} }
} }
/* Erase the non-selected partition */ /* Erase the non-selected partition */
addr_align = (uint32_t)(base - ((!!!sel) * WOLFBOOT_SECTOR_SIZE)) & (~(NVM_CACHE_SIZE - 1)); addr_align = (uint32_t)(base - ((!sel) * WOLFBOOT_SECTOR_SIZE))
if (*((uint32_t*)(addr_align + WOLFBOOT_SECTOR_SIZE - 4)) != FLASH_WORD_ERASED) & (~(NVM_CACHE_SIZE - 1));
if (*((uint32_t*)(addr_align + WOLFBOOT_SECTOR_SIZE - sizeof(uint32_t)))
!= FLASH_WORD_ERASED) {
hal_flash_erase(addr_align, WOLFBOOT_SECTOR_SIZE); hal_flash_erase(addr_align, WOLFBOOT_SECTOR_SIZE);
}
return sel; return sel;
} }
static int RAMFUNCTION trailer_write(uint8_t part, uint32_t addr, uint8_t val) { static int RAMFUNCTION trailer_write(uint8_t part, uint32_t addr, uint8_t val) {
size_t addr_align = (size_t)(addr & (~(NVM_CACHE_SIZE - 1))); size_t addr_align = (size_t)(addr & (~(NVM_CACHE_SIZE - 1)));
uint32_t addr_off = addr & (NVM_CACHE_SIZE - 1);
size_t addr_read, addr_write; size_t addr_read, addr_write;
uint32_t addr_off = addr & (NVM_CACHE_SIZE - 1);
int ret = 0; int ret = 0;
nvm_cached_sector = nvm_select_fresh_sector(part); nvm_cached_sector = nvm_select_fresh_sector(part);
@ -204,9 +202,8 @@ static int RAMFUNCTION trailer_write(uint8_t part, uint32_t addr, uint8_t val) {
XMEMCPY(NVM_CACHE, (void*)addr_read, NVM_CACHE_SIZE); XMEMCPY(NVM_CACHE, (void*)addr_read, NVM_CACHE_SIZE);
NVM_CACHE[addr_off] = val; NVM_CACHE[addr_off] = val;
/* Calculate write address */ /* Calculate write address */
addr_write = addr_align - ((!!!nvm_cached_sector) * NVM_CACHE_SIZE); addr_write = addr_align - ((!nvm_cached_sector) * NVM_CACHE_SIZE);
/* Ensure that the destination was erased, or force erase */ /* Ensure that the destination was erased, or force erase */
if (*((uint32_t *)(addr_write + NVM_CACHE_SIZE - sizeof(uint32_t))) if (*((uint32_t *)(addr_write + NVM_CACHE_SIZE - sizeof(uint32_t)))
@ -227,7 +224,7 @@ static int RAMFUNCTION trailer_write(uint8_t part, uint32_t addr, uint8_t val) {
/* Once a copy has been written, erase the older sector */ /* Once a copy has been written, erase the older sector */
ret = hal_flash_erase(addr_read, NVM_CACHE_SIZE); ret = hal_flash_erase(addr_read, NVM_CACHE_SIZE);
nvm_cached_sector = !!!nvm_cached_sector; nvm_cached_sector = !nvm_cached_sector;
return ret; return ret;
} }
@ -235,15 +232,15 @@ static int RAMFUNCTION partition_magic_write(uint8_t part, uint32_t addr)
{ {
uint32_t off = addr % NVM_CACHE_SIZE; uint32_t off = addr % NVM_CACHE_SIZE;
size_t base = (size_t)addr - off; size_t base = (size_t)addr - off;
int ret;
size_t addr_read, addr_write; size_t addr_read, addr_write;
int ret;
nvm_cached_sector = nvm_select_fresh_sector(part); nvm_cached_sector = nvm_select_fresh_sector(part);
addr_read = base - (nvm_cached_sector * NVM_CACHE_SIZE); addr_read = base - (nvm_cached_sector * NVM_CACHE_SIZE);
addr_write = base - (!!!nvm_cached_sector * NVM_CACHE_SIZE); addr_write = base - (!nvm_cached_sector * NVM_CACHE_SIZE);
XMEMCPY(NVM_CACHE, (void*)base, NVM_CACHE_SIZE); XMEMCPY(NVM_CACHE, (void*)base, NVM_CACHE_SIZE);
XMEMCPY(NVM_CACHE + off, &wolfboot_magic_trail, sizeof(uint32_t)); XMEMCPY(NVM_CACHE + off, &wolfboot_magic_trail, sizeof(uint32_t));
ret = hal_flash_write(addr_write, NVM_CACHE, WOLFBOOT_SECTOR_SIZE); ret = hal_flash_write(addr_write, NVM_CACHE, WOLFBOOT_SECTOR_SIZE);
nvm_cached_sector = !!!nvm_cached_sector; nvm_cached_sector = !nvm_cached_sector;
ret = hal_flash_erase(addr_read, WOLFBOOT_SECTOR_SIZE); ret = hal_flash_erase(addr_read, WOLFBOOT_SECTOR_SIZE);
return ret; return ret;
} }
@ -351,9 +348,10 @@ static uint8_t* RAMFUNCTION get_trailer_at(uint8_t part, uint32_t at)
#ifdef NVM_FLASH_WRITEONCE #ifdef NVM_FLASH_WRITEONCE
sel_sec = nvm_select_fresh_sector(part); sel_sec = nvm_select_fresh_sector(part);
#endif #endif
if (part == PART_BOOT) if (part == PART_BOOT) {
return (void *)(PART_BOOT_ENDFLAGS - return (void *)(PART_BOOT_ENDFLAGS -
(WOLFBOOT_SECTOR_SIZE * sel_sec + (sizeof(uint32_t) + at))); (WOLFBOOT_SECTOR_SIZE * sel_sec + (sizeof(uint32_t) + at)));
}
else if (part == PART_UPDATE) { else if (part == PART_UPDATE) {
return (void *)(PART_UPDATE_ENDFLAGS - return (void *)(PART_UPDATE_ENDFLAGS -
(WOLFBOOT_SECTOR_SIZE * sel_sec + (sizeof(uint32_t) + at))); (WOLFBOOT_SECTOR_SIZE * sel_sec + (sizeof(uint32_t) + at)));

1
test-app/app_nrf52.c
View File

@ -44,7 +44,6 @@
#define UART0_BAUDRATE *((volatile uint32_t *)(UART0_BASE + 0x524)) #define UART0_BAUDRATE *((volatile uint32_t *)(UART0_BASE + 0x524))
__attribute__((section(".rodata")))
static const char extradata[1024 * 16] = "hi!"; static const char extradata[1024 * 16] = "hi!";
static void gpiotoggle(uint32_t pin) static void gpiotoggle(uint32_t pin)