Skip to content

imx6ull-flash driver fixes #316

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

Draft
Maxez wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

imx6ull-flash driver fixes #316

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
210c852
imx6ull-flash: check mmap() result in flashdrv_dmanew(), return NULL …
Nov 10, 2022
750d776
imx6ull-flash: add memory barrier before running DMA, mark variables …
Nov 10, 2022
73b5aab
imx6ull-flash: remove unused function flashdrv_rundma()
Nov 10, 2022
5e20c25
imx6ull-flash: add mmap() checks in flashdrv
Nov 10, 2022
74e5231
imx6ull-flash: fix BCH layout registers modifications in flashdrv_wri…
Nov 10, 2022
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: 1 addition & 1 deletion storage/imx6ull-flash/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Analogue to flashdrv_write, but ignores metadata.
Analogue to flashdrv_read, but ignores metadata.


extern void flashdrv_init(void);
extern int flashdrv_init(void);

Library and NAND controler initialization.

2 changes: 1 addition & 1 deletion storage/imx6ull-flash/flashdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ int flashdev_init(storage_t *strg)
}

strg->dev->ctx->dma = flashdrv_dmanew();
if (strg->dev->ctx->dma == MAP_FAILED) {
if (strg->dev->ctx->dma == NULL) {
free(strg->dev->ctx);
free(strg->dev);
return -ENOMEM;
Expand Down
103 changes: 73 additions & 30 deletions storage/imx6ull-flash/flashdrv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ struct {
handle_t intbch, intdma, intgpmi;
unsigned rawmetasz; /* user metadata + ECC16 metadata bytes */

int result, bch_status, bch_done;
volatile int result, bch_status, bch_done;

uint8_t *uncached_buf;
flashdrv_info_t info;
Expand Down Expand Up @@ -263,6 +263,9 @@ static void dma_sequence(dma_t *prev, dma_t *next)

static void dma_run(dma_t *dma, int channel)
{
/* Synchronize memory before running DMA */
__asm__ volatile("dsb");

*(flashdrv_common.dma + apbh_ch0_nxtcmdar + channel * apbh_next_channel) = (uint32_t)va2pa(dma);
*(flashdrv_common.dma + apbh_ch0_sema + channel * apbh_next_channel) = 1;
}
Expand Down Expand Up @@ -445,7 +448,13 @@ static void flashdrv_setDevClock(int dev, int state)

flashdrv_dma_t *flashdrv_dmanew(void)
{
flashdrv_dma_t *dma = mmap(NULL, _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_UNCACHED, OID_NULL, 0);
flashdrv_dma_t *dma;

dma = mmap(NULL, _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_UNCACHED, OID_CONTIGUOUS, 0);
if (dma == MAP_FAILED) {
return NULL;
}

dma->last = NULL;
dma->first = NULL;

Expand Down Expand Up @@ -705,6 +714,7 @@ int flashdrv_write(flashdrv_dma_t *dma, uint32_t paddr, void *data, char *aux)
int chip = 0, channel = 0, sz;
char addr[5] = { 0 };
int skipMeta = 0, err;
uint32_t tmp;
memcpy(addr + 2, &paddr, 3);

if (data == NULL) {
Expand Down Expand Up @@ -732,18 +742,24 @@ int flashdrv_write(flashdrv_dma_t *dma, uint32_t paddr, void *data, char *aux)

if (data == NULL) {
/* Trick BCH controller into thinking that the whole page consists of just the metadata block */
*(flashdrv_common.bch + bch_flash0layout0) &= ~(0xff << 24);

*(flashdrv_common.bch + bch_flash0layout1) &= ~(0xffff << 16);
*(flashdrv_common.bch + bch_flash0layout1) |= flashdrv_common.rawmetasz << 16;
tmp = *(flashdrv_common.bch + bch_flash0layout0);
tmp &= ~(0xffu << 24);
*(flashdrv_common.bch + bch_flash0layout0) = tmp;

tmp = *(flashdrv_common.bch + bch_flash0layout1);
tmp &= ~(0xffffu << 16);
tmp |= flashdrv_common.rawmetasz << 16;
*(flashdrv_common.bch + bch_flash0layout1) = tmp;
}
else if (skipMeta) {
/* Perform partial page programming (don't change metadata and its ECC) */
memset(aux, 0xff, flashdrv_common.rawmetasz);

/* Treat metadata and its ECC as raw byte area without ECC */
*(flashdrv_common.bch + bch_flash0layout0) &= ~(0x1fff << 11);
*(flashdrv_common.bch + bch_flash0layout0) |= flashdrv_common.rawmetasz << 16;
tmp = *(flashdrv_common.bch + bch_flash0layout0);
tmp &= ~(0x1fff << 11);
tmp |= flashdrv_common.rawmetasz << 16;
*(flashdrv_common.bch + bch_flash0layout0) = tmp;
}

flashdrv_common.result = 1;
Expand All @@ -757,14 +773,20 @@ int flashdrv_write(flashdrv_dma_t *dma, uint32_t paddr, void *data, char *aux)
err = flashdrv_common.result;

if (data == NULL) {
*(flashdrv_common.bch + bch_flash0layout0) |= 8 << 24;

*(flashdrv_common.bch + bch_flash0layout1) &= ~(0xffff << 16);
*(flashdrv_common.bch + bch_flash0layout1) |= (flashdrv_common.info.writesz + flashdrv_common.info.metasz) << 16;
tmp = *(flashdrv_common.bch + bch_flash0layout0);
tmp |= (8 << 24);
*(flashdrv_common.bch + bch_flash0layout0) = tmp;

tmp = *(flashdrv_common.bch + bch_flash0layout1);
tmp &= ~(0xffffu << 16);
tmp |= (flashdrv_common.info.writesz + flashdrv_common.info.metasz) << 16;
*(flashdrv_common.bch + bch_flash0layout1) = tmp;
}
else if (skipMeta) {
*(flashdrv_common.bch + bch_flash0layout0) &= ~(0x1fff << 11);
*(flashdrv_common.bch + bch_flash0layout0) |= 16 << 16 | 8 << 11;
tmp = *(flashdrv_common.bch + bch_flash0layout0);
tmp &= ~(0x1fff << 11);
tmp |= (16 << 16) | (8 << 11);
*(flashdrv_common.bch + bch_flash0layout0) = tmp;
}

mutexUnlock(flashdrv_common.mutex);
Expand Down Expand Up @@ -991,16 +1013,6 @@ int flashdrv_markbad(flashdrv_dma_t *dma, uint32_t paddr)
}


void flashdrv_rundma(flashdrv_dma_t *dma)
{
int channel = 0;

mutexLock(flashdrv_common.mutex);
dma_run((dma_t *)dma->first, channel);
mutexUnlock(flashdrv_common.mutex);
}


static void setup_flash_info(void)
{
flash_id_t *flash_id = (flash_id_t *)flashdrv_common.uncached_buf;
Expand Down Expand Up @@ -1044,13 +1056,42 @@ static void setup_flash_info(void)
}


void flashdrv_init(void)
int flashdrv_init(void)
{
flashdrv_common.dma = mmap(NULL, 2 * _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_DEVICE, OID_PHYSMEM, 0x1804000);
flashdrv_common.gpmi = mmap(NULL, 2 * _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_DEVICE, OID_PHYSMEM, 0x1806000);
flashdrv_common.bch = mmap(NULL, 4 * _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_DEVICE, OID_PHYSMEM, 0x1808000);
flashdrv_common.mux = mmap(NULL, 4 * _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_DEVICE, OID_PHYSMEM, 0x20e0000);
flashdrv_common.uncached_buf = mmap(NULL, 2 * _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_UNCACHED, OID_CONTIGUOUS, 0);
flashdrv_common.dma = mmap(NULL, _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_DEVICE, OID_PHYSMEM, 0x1804000);
if (flashdrv_common.dma == MAP_FAILED) {
return -ENOMEM;
}

flashdrv_common.gpmi = mmap(NULL, _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_DEVICE, OID_PHYSMEM, 0x1806000);
if (flashdrv_common.gpmi == MAP_FAILED) {
munmap((void *)flashdrv_common.dma, _PAGE_SIZE);
return -ENOMEM;
}

flashdrv_common.bch = mmap(NULL, _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_DEVICE, OID_PHYSMEM, 0x1808000);
if (flashdrv_common.bch == MAP_FAILED) {
munmap((void *)flashdrv_common.gpmi, _PAGE_SIZE);
munmap((void *)flashdrv_common.dma, _PAGE_SIZE);
return -ENOMEM;
}

flashdrv_common.mux = mmap(NULL, _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_DEVICE, OID_PHYSMEM, 0x20e0000);
if (flashdrv_common.mux == MAP_FAILED) {
munmap((void *)flashdrv_common.bch, _PAGE_SIZE);
munmap((void *)flashdrv_common.gpmi, _PAGE_SIZE);
munmap((void *)flashdrv_common.dma, _PAGE_SIZE);
return -ENOMEM;
}

flashdrv_common.uncached_buf = mmap(NULL, _PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_UNCACHED, OID_CONTIGUOUS, 0);
if (flashdrv_common.uncached_buf == MAP_FAILED) {
munmap((void *)flashdrv_common.mux, _PAGE_SIZE);
munmap((void *)flashdrv_common.bch, _PAGE_SIZE);
munmap((void *)flashdrv_common.gpmi, _PAGE_SIZE);
munmap((void *)flashdrv_common.dma, _PAGE_SIZE);
return -ENOMEM;
}

/* 16 bytes of user metadada + ECC16 * bits per parity level (13) / 8 = 26 bytes for ECC */
flashdrv_common.rawmetasz = 16 + 26;
Expand Down Expand Up @@ -1122,6 +1163,8 @@ void flashdrv_init(void)
*(flashdrv_common.bch + bch_flash0layout1) = (flashdrv_common.info.writesz + flashdrv_common.info.metasz) << 16 | 7 << 11 | 0 << 10 | 128;

interrupt(32 + 15, bch_irqHandler, NULL, flashdrv_common.bch_cond, &flashdrv_common.intbch);

return EOK;
}


Expand Down
6 changes: 5 additions & 1 deletion storage/imx6ull-flash/flashsrv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,11 @@ static int flashsrv_nandInit(void)
storage_t *strg;

/* Initialize nand flash driver */
flashdrv_init();
err = flashdrv_init();
if (err < 0) {
LOG_ERROR("failed to initialize driver, err: %d", err);
return err;
}

strg = calloc(1, sizeof(storage_t));
if (strg == NULL) {
Expand Down
Loading