LailaTheElf/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix EEPROM driver for STM32L0/1 cat.1 devices (#24928)

Browse Source
This commit is contained in:
Joel Beckmeyer 2025-02-26 06:25:01 -05:00 committed by GitHub
parent 63daf94ee6
commit 63b095212b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.c
View File

@ -25,6 +25,7 @@
#define EEPROM_ADDR(offset) (EEPROM_BASE_ADDR + (offset)) #define EEPROM_ADDR(offset) (EEPROM_BASE_ADDR + (offset))
#define EEPROM_PTR(offset) ((__IO uint8_t *)EEPROM_ADDR(offset)) #define EEPROM_PTR(offset) ((__IO uint8_t *)EEPROM_ADDR(offset))
#define EEPROM_BYTE(location, offset) (*(EEPROM_PTR(((uint32_t)location) + ((uint32_t)offset)))) #define EEPROM_BYTE(location, offset) (*(EEPROM_PTR(((uint32_t)location) + ((uint32_t)offset))))
#define EEPROM_WORD(location) (*(__IO uint32_t *)EEPROM_PTR(location))
#define BUFFER_BYTE(buffer, offset) (*(((uint8_t *)buffer) + offset)) #define BUFFER_BYTE(buffer, offset) (*(((uint8_t *)buffer) + offset))
@ -62,12 +63,16 @@ void eeprom_driver_erase(void) {
STM32_L0_L1_EEPROM_Unlock(); STM32_L0_L1_EEPROM_Unlock();
for (size_t offset = 0; offset < STM32_ONBOARD_EEPROM_SIZE; offset += sizeof(uint32_t)) { for (size_t offset = 0; offset < STM32_ONBOARD_EEPROM_SIZE; offset += sizeof(uint32_t)) {
#ifdef QMK_MCU_SERIES_STM32L0XX
FLASH->PECR |= FLASH_PECR_ERASE | FLASH_PECR_DATA; FLASH->PECR |= FLASH_PECR_ERASE | FLASH_PECR_DATA;
#endif
*(__IO uint32_t *)EEPROM_ADDR(offset) = (uint32_t)0; EEPROM_WORD(offset) = (uint32_t)0;
STM32_L0_L1_EEPROM_WaitNotBusy(); STM32_L0_L1_EEPROM_WaitNotBusy();
#ifdef QMK_MCU_SERIES_STM32L0XX
FLASH->PECR &= ~(FLASH_PECR_ERASE | FLASH_PECR_DATA); FLASH->PECR &= ~(FLASH_PECR_ERASE | FLASH_PECR_DATA);
#endif
} }
STM32_L0_L1_EEPROM_Lock(); STM32_L0_L1_EEPROM_Lock();
@ -86,17 +91,39 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) {
} }
void eeprom_write_block(const void *buf, void *addr, size_t len) { void eeprom_write_block(const void *buf, void *addr, size_t len) {
STM32_L0_L1_EEPROM_Unlock(); // use word-aligned write to overcome issues with writing null bytes
uint32_t start_addr = (uint32_t)addr;
if (start_addr >= (STM32_ONBOARD_EEPROM_SIZE)) {
return;
}
uint32_t max_len = (STM32_ONBOARD_EEPROM_SIZE)-start_addr;
if (len > max_len) {
len = max_len;
}
uint32_t end_addr = start_addr + len;
for (size_t offset = 0; offset < len; ++offset) { uint32_t aligned_start = start_addr & ~0x3;
// Drop out if we've hit the limit of the EEPROM uint32_t aligned_end = (end_addr + 3) & ~0x3;
if ((((uint32_t)addr) + offset) >= STM32_ONBOARD_EEPROM_SIZE) {
break; STM32_L0_L1_EEPROM_Unlock();
for (uint32_t word_addr = aligned_start; word_addr < aligned_end; word_addr += 4) {
uint32_t existing_word = EEPROM_WORD(word_addr);
uint32_t new_word = existing_word;
// Update the relevant bytes in the word
for (int i = 0; i < 4; i++) {
uint32_t byte_addr = word_addr + i;
if (byte_addr >= start_addr && byte_addr < end_addr) {
uint8_t new_byte = BUFFER_BYTE(buf, byte_addr - start_addr);
new_word = (new_word & ~(0xFFU << (i * 8))) | ((uint32_t)new_byte << (i * 8));
}
} }
STM32_L0_L1_EEPROM_WaitNotBusy(); // Only write if the word has changed
EEPROM_BYTE(addr, offset) = BUFFER_BYTE(buf, offset); if (new_word != existing_word) {
STM32_L0_L1_EEPROM_WaitNotBusy();
EEPROM_WORD(word_addr) = new_word;
}
} }
STM32_L0_L1_EEPROM_Lock(); STM32_L0_L1_EEPROM_Lock();
} }