riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kinetis: Adapt to flashpage/flashpage_pagewise API

Browse Source
This commit is contained in:
Koen Zandberg 2020-11-09 16:44:06 +01:00
parent 9a79124fba
commit f85594eb55
No known key found for this signature in database
GPG Key ID: 0895A893E6D2985B
5 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/kinetis/Kconfig
View File

@ -21,7 +21,7 @@ config CPU_FAM_K
bool bool
select CPU_COMMON_KINETIS select CPU_COMMON_KINETIS
select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE
select HAS_PERIPH_FLASHPAGE_RAW select HAS_PERIPH_FLASHPAGE_PAGEWISE
select HAS_PERIPH_MCG select HAS_PERIPH_MCG
config CPU_FAM_L config CPU_FAM_L
@ -33,7 +33,7 @@ config CPU_FAM_W
bool bool
select CPU_COMMON_KINETIS select CPU_COMMON_KINETIS
select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE
select HAS_PERIPH_FLASHPAGE_RAW select HAS_PERIPH_FLASHPAGE_PAGEWISE
select HAS_PERIPH_MCG select HAS_PERIPH_MCG
## CPU Models ## CPU Models

2
cpu/kinetis/Makefile.features
View File

@ -21,7 +21,7 @@ include $(LAST_MAKEFILEDIR)/kinetis-info.mk
ifneq (,$(filter k w,$(CPU_FAM))) ifneq (,$(filter k w,$(CPU_FAM)))
FEATURES_PROVIDED += periph_flashpage FEATURES_PROVIDED += periph_flashpage
FEATURES_PROVIDED += periph_flashpage_raw FEATURES_PROVIDED += periph_flashpage_pagewise
endif endif
ifeq (ea,$(CPU_FAM)) ifeq (ea,$(CPU_FAM))

8
cpu/kinetis/include/cpu_conf_kinetis_k.h
View File

@ -146,12 +146,12 @@
/* The minimum block size which can be written is 8B (Phrase). However, the /* The minimum block size which can be written is 8B (Phrase). However, the
* erase block is always FLASHPAGE_SIZE. * erase block is always FLASHPAGE_SIZE.
*/ */
#define FLASHPAGE_RAW_PHRASE (8U) #define FLASHPAGE_BLOCK_PHRASE (8U)
#define FLASHPAGE_RAW_BLOCKSIZE FLASHPAGE_RAW_PHRASE #define FLASHPAGE_WRITE_BLOCK_SIZE FLASHPAGE_BLOCK_PHRASE
/* Writing should be always 8 bytes aligned */ /* Writing should be always 8 bytes aligned */
#define FLASHPAGE_RAW_ALIGNMENT FLASHPAGE_RAW_PHRASE #define FLASHPAGE_WRITE_BLOCK_ALIGNMENT FLASHPAGE_BLOCK_PHRASE
/* Section erase and programming must be 16 bytes aligned */ /* Section erase and programming must be 16 bytes aligned */
#define FLASHPAGE_RAW_SECTION_ALIGNMENT (16U) #define FLASHPAGE_BLOCK_SECTION_ALIGNMENT (16U)
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus

6
cpu/kinetis/include/cpu_conf_kinetis_w.h
View File

@ -87,11 +87,11 @@
/* The minimum block size which can be written is 4B. However, the erase /* The minimum block size which can be written is 4B. However, the erase
* block is always FLASHPAGE_SIZE. * block is always FLASHPAGE_SIZE.
*/ */
#define FLASHPAGE_RAW_BLOCKSIZE (4U) #define FLASHPAGE_WRITE_BLOCK_SIZE (4U)
/* Writing should be always 4 bytes aligned */ /* Writing should be always 4 bytes aligned */
#define FLASHPAGE_RAW_ALIGNMENT (4U) #define FLASHPAGE_WRITE_BLOCK_ALIGNMENT (4U)
/* Section erase and programming must be 8 bytes aligned */ /* Section erase and programming must be 8 bytes aligned */
#define FLASHPAGE_RAW_SECTION_ALIGNMENT (8U) #define FLASHPAGE_BLOCK_SECTION_ALIGNMENT (8U)
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus

53
cpu/kinetis/periph/flashpage.c
View File

@ -132,12 +132,12 @@ static int _check_errors(void)
static int _verify_erased(uint32_t address, size_t len) static int _verify_erased(uint32_t address, size_t len)
{ {
/* Ensures verifies are aligned */ /* Ensures verifies are aligned */
assert(!(address % FLASHPAGE_RAW_SECTION_ALIGNMENT)); assert(!(address % FLASHPAGE_BLOCK_SECTION_ALIGNMENT));
/* We verify FLASHPAGE_RAW_SECTION_ALIGNMENT Bytes at a time, we /* We verify FLASHPAGE_BLOCK_SECTION_ALIGNMENT Bytes at a time, we
round up before adjusting to FLASHPAGE_RAW_SECTION_ALIGNMENT */ round up before adjusting to FLASHPAGE_BLOCK_SECTION_ALIGNMENT */
uint32_t num = (len + (FLASHPAGE_RAW_SECTION_ALIGNMENT - 1)) / uint32_t num = (len + (FLASHPAGE_BLOCK_SECTION_ALIGNMENT - 1)) /
FLASHPAGE_RAW_SECTION_ALIGNMENT; FLASHPAGE_BLOCK_SECTION_ALIGNMENT;
/* Setup command and run */ /* Setup command and run */
FCCOBx[0] = BYTES_JOIN_TO_WORD_1_3(FTFx_VERIFY_SECTION, address); FCCOBx[0] = BYTES_JOIN_TO_WORD_1_3(FTFx_VERIFY_SECTION, address);
@ -150,7 +150,7 @@ static int _verify_erased(uint32_t address, size_t len)
static int _sector_erase(uint32_t address) static int _sector_erase(uint32_t address)
{ {
/* Ensures erases are aligned */ /* Ensures erases are aligned */
assert(!(address % FLASHPAGE_RAW_SECTION_ALIGNMENT)); assert(!(address % FLASHPAGE_BLOCK_SECTION_ALIGNMENT));
/* Setup command and run */ /* Setup command and run */
FCCOBx[0] = BYTES_JOIN_TO_WORD_1_3(FTFx_ERASE_SECTOR, address); FCCOBx[0] = BYTES_JOIN_TO_WORD_1_3(FTFx_ERASE_SECTOR, address);
@ -163,7 +163,7 @@ static int _flash_write(uint32_t address, uint32_t *data)
{ {
/* Setup command and run */ /* Setup command and run */
FCCOBx[1] = *data++; FCCOBx[1] = *data++;
if (FLASHPAGE_RAW_BLOCKSIZE == 8U) { if (FLASHPAGE_WRITE_BLOCK_SIZE == 8U) {
FCCOBx[2] = *data; FCCOBx[2] = *data;
FCCOBx[0] = BYTES_JOIN_TO_WORD_1_3(FTFx_PROGRAM_PHRASE, address); FCCOBx[0] = BYTES_JOIN_TO_WORD_1_3(FTFx_PROGRAM_PHRASE, address);
} }
@ -175,21 +175,29 @@ static int _flash_write(uint32_t address, uint32_t *data)
return _check_errors(); return _check_errors();
} }
void flashpage_write_raw(void *target_addr, const void *data, size_t len) void flashpage_erase(unsigned page)
{ {
/* Assert multiples of FLASHPAGE_RAW_BLOCKSIZE are written and no less of assert(page < (int)FLASHPAGE_NUMOF);
/* ERASE sector */
_sector_erase((uint32_t)flashpage_addr(page));
}
void flashpage_write(void *target_addr, const void *data, size_t len)
{
/* Assert multiples of FLASHPAGE_WRITE_BLOCK_SIZE are written and no less of
that length. */ that length. */
assert(!(len % FLASHPAGE_RAW_BLOCKSIZE)); assert(!(len % FLASHPAGE_WRITE_BLOCK_SIZE));
/* Ensure writes are aligned */ /* Ensure writes are aligned */
assert(!(((unsigned)target_addr % FLASHPAGE_RAW_ALIGNMENT) || assert(!(((unsigned)target_addr % FLASHPAGE_WRITE_BLOCK_ALIGNMENT) ||
((unsigned)data % FLASHPAGE_RAW_ALIGNMENT))); ((unsigned)data % FLASHPAGE_WRITE_BLOCK_ALIGNMENT)));
/* Ensure the length doesn't exceed the actual flash size */ /* Ensure the length doesn't exceed the actual flash size */
assert(((unsigned)target_addr + len) < assert(((unsigned)target_addr + len) <
(CPU_FLASH_BASE + (FLASHPAGE_SIZE * FLASHPAGE_NUMOF)) + 1); (CPU_FLASH_BASE + (FLASHPAGE_SIZE * FLASHPAGE_NUMOF)) + 1);
#ifdef FLASHPAGE_RAW_PHRASE #ifdef FLASHPAGE_BLOCK_PHRASE
const uint64_t *data_addr = data; const uint64_t *data_addr = data;
uint64_t *dst = target_addr; uint64_t *dst = target_addr;
#else #else
@ -203,24 +211,9 @@ void flashpage_write_raw(void *target_addr, const void *data, size_t len)
return; return;
} }
/* Write to flash FLASHPAGE_RAW_BLOCKSIZE bytes at a time */ /* Write to flash FLASHPAGE_WRITE_BLOCK_SIZE bytes at a time */
for (size_t i = 0; i < (len / FLASHPAGE_RAW_BLOCKSIZE); i++) { for (size_t i = 0; i < (len / FLASHPAGE_WRITE_BLOCK_SIZE); i++) {
_flash_write((uint32_t) dst++, (uint32_t *) data_addr++); _flash_write((uint32_t) dst++, (uint32_t *) data_addr++);
} }
} }
void flashpage_write(int page, const void *data)
{
assert(page < (int)FLASHPAGE_NUMOF);
uint32_t *page_addr = flashpage_addr(page);
/* ERASE sector */
_sector_erase((uint32_t)page_addr);
/* WRITE sector */
if (data != NULL) {
flashpage_write_raw(page_addr, data, FLASHPAGE_SIZE);
}
}