[wear_leveling] efl updates (#22489)
Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
parent
1a343cfaf4
commit
75d11e0421
2 changed files with 32 additions and 16 deletions
|
@ -14,11 +14,15 @@ static flash_sector_t first_sector = WEAR_LEVELING_EFL_FIRST_SECTOR;
|
|||
static flash_sector_t first_sector = UINT16_MAX;
|
||||
#endif // defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
|
||||
|
||||
#if !defined(WEAR_LEVELING_EFL_OMIT_LAST_SECTOR_COUNT)
|
||||
# define WEAR_LEVELING_EFL_OMIT_LAST_SECTOR_COUNT 0
|
||||
#endif // WEAR_LEVELING_EFL_OMIT_LAST_SECTOR_COUNT
|
||||
|
||||
static flash_sector_t sector_count = UINT16_MAX;
|
||||
static BaseFlash * flash;
|
||||
|
||||
static volatile bool is_issuing_read = false;
|
||||
static volatile bool ecc_error_occurred = false;
|
||||
static bool flash_erased_is_one;
|
||||
static volatile bool is_issuing_read = false;
|
||||
static volatile bool ecc_error_occurred = false;
|
||||
|
||||
// "Automatic" detection of the flash size -- ideally ChibiOS would have this already, but alas, it doesn't.
|
||||
static inline uint32_t detect_flash_size(void) {
|
||||
|
@ -51,10 +55,19 @@ bool backing_store_init(void) {
|
|||
uint32_t counter = 0;
|
||||
uint32_t flash_size = detect_flash_size();
|
||||
|
||||
// Check if the hardware erase is logic 1
|
||||
flash_erased_is_one = (desc->attributes & FLASH_ATTR_ERASED_IS_ONE) ? true : false;
|
||||
|
||||
if (WEAR_LEVELING_EFL_OMIT_LAST_SECTOR_COUNT >= desc->sectors_count) {
|
||||
// Last sector defined is greater than available number of sectors. Can't do anything here. Fault.
|
||||
chSysHalt("Last sector intended to be used with wear_leveling is beyond available flash descriptor range");
|
||||
}
|
||||
|
||||
#if defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
|
||||
|
||||
// Work out how many sectors we want to use, working forwards from the first sector specified
|
||||
for (flash_sector_t i = 0; i < desc->sectors_count - first_sector; ++i) {
|
||||
flash_sector_t last_sector = desc->sectors_count - WEAR_LEVELING_EFL_OMIT_LAST_SECTOR_COUNT;
|
||||
for (flash_sector_t i = 0; i < last_sector - first_sector; ++i) {
|
||||
counter += flashGetSectorSize(flash, first_sector + i);
|
||||
if (counter >= (WEAR_LEVELING_BACKING_SIZE)) {
|
||||
sector_count = i + 1;
|
||||
|
@ -70,9 +83,9 @@ bool backing_store_init(void) {
|
|||
#else // defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
|
||||
|
||||
// Work out how many sectors we want to use, working backwards from the end of the flash
|
||||
flash_sector_t last_sector = desc->sectors_count;
|
||||
for (flash_sector_t i = 0; i < desc->sectors_count; ++i) {
|
||||
first_sector = desc->sectors_count - i - 1;
|
||||
flash_sector_t last_sector = desc->sectors_count - WEAR_LEVELING_EFL_OMIT_LAST_SECTOR_COUNT;
|
||||
for (flash_sector_t i = 0; i < last_sector; ++i) {
|
||||
first_sector = last_sector - i - 1;
|
||||
if (flashGetSectorOffset(flash, first_sector) >= flash_size) {
|
||||
last_sector = first_sector;
|
||||
continue;
|
||||
|
@ -124,7 +137,9 @@ bool backing_store_write(uint32_t address, backing_store_int_t value) {
|
|||
uint32_t offset = (base_offset + address);
|
||||
bs_dprintf("Write ");
|
||||
wl_dump(offset, &value, sizeof(value));
|
||||
value = ~value;
|
||||
if (flash_erased_is_one) {
|
||||
value = ~value;
|
||||
}
|
||||
return flashProgram(flash, offset, sizeof(value), (const uint8_t *)&value) == FLASH_NO_ERROR;
|
||||
}
|
||||
|
||||
|
@ -138,7 +153,7 @@ static backing_store_int_t backing_store_safe_read_from_location(backing_store_i
|
|||
backing_store_int_t value;
|
||||
is_issuing_read = true;
|
||||
ecc_error_occurred = false;
|
||||
value = ~(*loc);
|
||||
value = flash_erased_is_one ? ~(*loc) : (*loc);
|
||||
is_issuing_read = false;
|
||||
return value;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue