Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drivers/mtd_flashpage: Should fail on compilation if slot_aux is used while feature is not present #20557

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

drivers/mtd_flashpage: Should fail on compilation if slot_aux is used while feature is not present #20557

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4de1fdf
drivers/mtd_flashpage: slot_aux should fail on compilation if feature…
FlapKap Apr 8, 2024
93af94a
uncrustify
FlapKap Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions drivers/mtd_flashpage/mtd_flashpage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@
#define ENABLE_DEBUG 0
#include "debug.h"

#define MTD_FLASHPAGE_END_ADDR ((uintptr_t) CPU_FLASH_BASE + (FLASHPAGE_NUMOF * FLASHPAGE_SIZE))
#define MTD_FLASHPAGE_END_ADDR ((uintptr_t)CPU_FLASH_BASE + (FLASHPAGE_NUMOF * FLASHPAGE_SIZE))

static int _init(mtd_dev_t *dev)
{
mtd_flashpage_t *super = container_of(dev, mtd_flashpage_t, base);

(void)super;
assert(dev->pages_per_sector * dev->page_size == FLASHPAGE_SIZE);
assert(!(super->offset % dev->pages_per_sector));
Expand All @@ -66,12 +67,13 @@ static int _read_page(mtd_dev_t *dev, void *buf, uint32_t page,

/* mtd flashpage maps multiple pages to one virtual sector for unknown reason */
uint32_t fpage = page / dev->pages_per_sector;

offset += (page % dev->pages_per_sector) * dev->page_size;
uintptr_t addr = (uintptr_t)flashpage_addr(fpage);

addr += offset;

DEBUG("flashpage: read %"PRIu32" bytes from %p to %p\n", size, (void *)addr, buf);
DEBUG("flashpage: read %" PRIu32 " bytes from %p to %p\n", size, (void *)addr, buf);

#ifndef CPU_HAS_UNALIGNED_ACCESS
if (addr % sizeof(uword_t)) {
Expand All @@ -80,7 +82,7 @@ static int _read_page(mtd_dev_t *dev, void *buf, uint32_t page,
offset = addr % sizeof(uword_t);
size = MIN(size, sizeof(uword_t) - offset);

DEBUG("flashpage: read %"PRIu32" unaligned bytes\n", size);
DEBUG("flashpage: read %" PRIu32 " unaligned bytes\n", size);

memcpy(&tmp, (uint8_t *)addr - offset, sizeof(tmp));
memcpy(buf, (uint8_t *)&tmp + offset, size);
Expand All @@ -103,24 +105,25 @@ static int _write_page(mtd_dev_t *dev, const void *buf, uint32_t page, uint32_t

/* mtd flashpage maps multiple pages to one virtual sector for unknown reason */
uint32_t fpage = page / dev->pages_per_sector;

offset += (page % dev->pages_per_sector) * dev->page_size;
uintptr_t addr = (uintptr_t)flashpage_addr(fpage);

addr += offset;

DEBUG("flashpage: write %"PRIu32" bytes from %p to %p\n", size, buf, (void *)addr);
DEBUG("flashpage: write %" PRIu32 " bytes from %p to %p\n", size, buf, (void *)addr);

size = MIN(flashpage_size(fpage) - offset, size);

if ((addr % FLASHPAGE_WRITE_BLOCK_ALIGNMENT) || (size < FLASHPAGE_WRITE_BLOCK_SIZE) ||
((uintptr_t)buf % FLASHPAGE_WRITE_BLOCK_ALIGNMENT)) {
uint8_t tmp[FLASHPAGE_WRITE_BLOCK_SIZE]
__attribute__ ((aligned (FLASHPAGE_WRITE_BLOCK_ALIGNMENT)));
__attribute__ ((aligned(FLASHPAGE_WRITE_BLOCK_ALIGNMENT)));

offset = addr % FLASHPAGE_WRITE_BLOCK_ALIGNMENT;
size = MIN(size, FLASHPAGE_WRITE_BLOCK_SIZE - offset);

DEBUG("flashpage: write %"PRIu32" at %p - ""%"PRIu32"\n", size, (void *)addr, offset);
DEBUG("flashpage: write %" PRIu32 " at %p - " "%" PRIu32 "\n", size, (void *)addr, offset);

memcpy(&tmp[0], (uint8_t *)addr - offset, sizeof(tmp));
memcpy(&tmp[offset], buf, size);
Expand All @@ -147,7 +150,7 @@ static int _erase_sector(mtd_dev_t *dev, uint32_t sector, uint32_t count)
sector += (super->offset / dev->pages_per_sector);

while (count--) {
DEBUG("flashpage: erase sector %"PRIu32"\n", sector);
DEBUG("flashpage: erase sector %" PRIu32 "\n", sector);
flashpage_erase(sector++);
}

Expand All @@ -162,6 +165,9 @@ const mtd_desc_t mtd_flashpage_driver = {
};

#if CONFIG_SLOT_AUX_LEN
#ifndef MODULE_PERIPH_FLASHPAGE_AUX
#error "CONFIG_SLOT_AUX_LEN requires the periph_flashpage_aux feature to work"
#endif
mtd_flashpage_t mtd_flash_aux_slot = MTD_FLASHPAGE_AUX_INIT_VAL(CONFIG_SLOT_AUX_OFFSET,
CONFIG_SLOT_AUX_LEN);
MTD_XFA_ADD(mtd_flash_aux_slot, CONFIG_SLOT_AUX_MTD_OFFSET);
Expand Down
Loading