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

Jump to bottom

imxrt-flash: non-XIP flash ops don't block XIP threads #498

Merged
merged 5 commits into from
May 24, 2024
Merged

imxrt-flash: non-XIP flash ops don't block XIP threads #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d58ae9b
imxrt-flash: remove unused code
ziemleszcz May 20, 2024
a3f50df
imxrt-flash: fix reading data from AHB
ziemleszcz May 20, 2024
16997df
imxrt-flash: introduce common flexspi poll function
ziemleszcz May 20, 2024
92fd56e
imxrt-flash: non-XIP flash ops don't block XIP threads
ziemleszcz May 20, 2024
bb0b79e
imxrt-flash: RX/TX FIFO optimization
ziemleszcz May 20, 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
2 changes: 2 additions & 0 deletions storage/imxrt-flash/flashdrv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ static int flash_defineFlexSPI(flash_context_t *ctx)
switch (ctx->address) {
case FLASH_EXT_DATA_ADDRESS:
ctx->fspi.instance = 0;
ctx->fspi.xip = FLEXSPI1_XIP;
ctx->fspi.base = (void *)FLEXSPI1_BASE;
ctx->fspi.ahbAddr = (void *)FLEXSPI1_AHB_ADDR;
ctx->fspi.slPortMask = FLEXSPI1_PORT_MASK;
Expand All @@ -295,6 +296,7 @@ static int flash_defineFlexSPI(flash_context_t *ctx)

case FLASH_INTERNAL_DATA_ADDRESS:
ctx->fspi.instance = 1;
ctx->fspi.xip = FLEXSPI2_XIP;
ctx->fspi.base = (void *)FLEXSPI2_BASE;
ctx->fspi.ahbAddr = (void *)FLEXSPI2_AHB_ADDR;
ctx->fspi.slPortMask = FLEXSPI2_PORT_MASK;
Expand Down
2 changes: 0 additions & 2 deletions storage/imxrt-flash/flashdrv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ typedef struct {
uint8_t isDirty;

uint32_t address;
uint32_t instance;
uint32_t flashID;
time_t timeout;

uint32_t prevAddr;
Expand Down
109 changes: 0 additions & 109 deletions storage/imxrt-flash/flashsrv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ typedef struct {
static struct {
flashsrv_memory_t flash_memories[FLASH_MEMORIES_NO];
uint32_t flexspi_addresses[FLASH_MEMORIES_NO];
flashsrv_partitionOps_t ops;
} flashsrv_common;


Expand Down Expand Up @@ -985,110 +984,6 @@ static inline int isXIP(void *addr)
}


static int flashsrv_getProperties(uint8_t fID, flashsrv_properties_t *p)
{
flashsrv_memory_t *mem;

int res = flashsrv_getFlashMemory(fID, &mem);
if (res == EOK) {
mutexLock(mem->lock);
p->size = mem->ctx.properties.size;
p->psize = mem->ctx.properties.page_size;
p->ssize = mem->ctx.properties.sector_size;
p->offs = 0;
mutexUnlock(mem->lock);
}
return res;
}


static int flashsrv_safeCalcCrc32(uint8_t fID, size_t offset, size_t len, uint32_t *crc32)
{
ssize_t ret;
flashsrv_memory_t *mem;

ret = flashsrv_getFlashMemory(fID, &mem);
if (ret < 0) {
return ret;
}

mutexLock(mem->lock);
ret = flashsrv_calcCrc32(fID, offset, len, crc32);
mutexUnlock(mem->lock);

return ret;
}


static ssize_t flashsrv_safeDirectWrite(uint8_t fID, size_t offset, const void *data, size_t size)
{
ssize_t ret;
flashsrv_memory_t *mem;

ret = flashsrv_getFlashMemory(fID, &mem);
if (ret < 0) {
return ret;
}

mutexLock(mem->lock);
ret = flashsrv_directWrite(fID, offset, data, size);
mutexUnlock(mem->lock);
return ret;
}


static ssize_t flashsrv_safeDirectRead(uint8_t fID, size_t offset, void *data, size_t size)
{
ssize_t ret;
flashsrv_memory_t *mem;

ret = flashsrv_getFlashMemory(fID, &mem);
if (ret < 0) {
return ret;
}

mutexLock(mem->lock);
ret = flashsrv_directRead(fID, offset, data, size);
mutexUnlock(mem->lock);
return ret;
}


static int flashsrv_safeSectorErase(uint8_t fID, size_t offs)
{
ssize_t ret;
flashsrv_memory_t *mem;

ret = flashsrv_getFlashMemory(fID, &mem);
if (ret < 0) {
return ret;
}

mutexLock(mem->lock);
ret = flashsrv_eraseSector(fID, offs);
mutexUnlock(mem->lock);
return ret;
}


__attribute__((weak)) int flashsrv_customIntInit(flashsrv_partitionOps_t *ops)
{
return EOK;
};


static int flashsrv_customInit(void)
{
flashsrv_common.ops.read = flashsrv_safeDirectRead;
flashsrv_common.ops.write = flashsrv_safeDirectWrite;
flashsrv_common.ops.eraseSector = flashsrv_safeSectorErase;
flashsrv_common.ops.getProperties = flashsrv_getProperties;
flashsrv_common.ops.calcCrc32 = flashsrv_safeCalcCrc32;

return flashsrv_customIntInit(&flashsrv_common.ops);
}


int main(void)
{
void *mem;
Expand All @@ -1110,10 +1005,6 @@ int main(void)
return EXIT_FAILURE;
}

if (flashsrv_customInit() < 0) {
LOG_ERROR("imxrt-flashsrv: custom init failed.\n");
}

printf("imxrt-flashsrv: initialized.\n");

/* flashsrv_devThread handles requests associated with the whole single flash chip */
Expand Down
Loading
Loading