Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x1000: bootloader: skip bad blocks when loading flashed kernels

Browse source 
Bad blocks in a kernel flash partition seem to be handled by skipping
ahead to the next block; this is a common bad block management scheme
for simple software like bootloaders (and is the default method for
reading NAND partitions in u-boot).

Extend the uImage flash reader to skip bad blocks while reading.

Change-Id: I815875e83a2418e2642f736e04a3437c31b354ba
This commit is contained in:
Aidan MacDonald 2022-03-19 19:02:56 +00:00
parent 5b011c8dca
commit 4cf36dfbf3
1 changed files with 86 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
bootloader/x1000/utils.c
View file

@ -124,53 +124,111 @@ int load_uimage_file(const char* filename,
struct nand_reader_data
{
nand_drv* ndrv;
uint32_t addr;
uint32_t end_addr;
nand_page_t page;
nand_page_t end_page;
unsigned offset;
uint32_t count;
};
static int uimage_nand_reader_init(struct nand_reader_data* d, nand_drv* ndrv,
uint32_t addr, uint32_t length)
{
unsigned pg_size = ndrv->chip->page_size;
/* must start at a block address */
if(addr % (pg_size << ndrv->chip->log2_ppb))
return -1;
d->ndrv = ndrv;
d->page = addr / ndrv->chip->page_size;
d->end_page = d->page + (length + pg_size - 1) / pg_size;
d->offset = 0;
d->count = length;
if(d->end_page > ndrv->chip->nr_blocks << ndrv->chip->log2_ppb)
return -2;
return 0;
}
static ssize_t uimage_nand_reader(void* buf, size_t count, void* rctx)
{
struct nand_reader_data* d = rctx;
nand_drv* ndrv = d->ndrv;
unsigned pg_size = ndrv->chip->page_size;
size_t read_count = 0;
int rc;
if(d->addr + count > d->end_addr)
count = d->end_addr - d->addr;
/* truncate overlong reads */
if(count > d->count)
count = d->count;
int ret = nand_read_bytes(d->ndrv, d->addr, count, buf);
if(ret != NAND_SUCCESS)
return -1;
while(d->page < d->end_page && read_count < count) {
rc = nand_page_read(ndrv, d->page, ndrv->page_buf);
if(rc < 0)
return -1;
d->addr += count;
return count;
/* Check the first page of a block for the bad block marker.
* Any bad blocks are silently skipped. */
if(!(d->page & (ndrv->ppb - 1))) {
if(ndrv->page_buf[ndrv->chip->bbm_pos] != 0xff) {
if(d->offset != 0)
return -1; /* shouldn't happen but just in case... */
d->page += ndrv->ppb;
continue;
}
}
size_t copy_len = MIN(count - read_count, pg_size - d->offset);
memcpy(buf, &ndrv->page_buf[d->offset], copy_len);
/* this seems like an excessive amount of arithmetic... */
buf += copy_len;
read_count += copy_len;
d->count -= copy_len;
d->offset += copy_len;
if(d->offset >= pg_size) {
d->offset -= pg_size;
d->page++;
}
}
return read_count;
}
int load_uimage_flash(uint32_t addr, uint32_t length,
struct uimage_header* uh, size_t* sizep)
{
int handle = -1;
struct nand_reader_data n;
n.ndrv = nand_init();
n.addr = addr;
n.end_addr = addr + length;
nand_lock(n.ndrv);
if(nand_open(n.ndrv) != NAND_SUCCESS) {
nand_drv* ndrv = nand_init();
nand_lock(ndrv);
if(nand_open(ndrv) != NAND_SUCCESS) {
splashf(5*HZ, "NAND open failed");
nand_unlock(n.ndrv);
nand_unlock(ndrv);
return -1;
}
handle = uimage_load(uh, sizep, uimage_nand_reader, &n);
nand_close(n.ndrv);
nand_unlock(n.ndrv);
if(handle <= 0) {
splashf(5*HZ, "uImage load failed (%d)", handle);
return -2;
struct nand_reader_data n;
int ret = uimage_nand_reader_init(&n, ndrv, addr, length);
if(ret != 0) {
splashf(5*HZ, "Bad image params\nAddr: %08lx\nLength: %lu", addr, length);
ret = -2;
goto out;
}
return handle;
int handle = uimage_load(uh, sizep, uimage_nand_reader, &n);
if(handle <= 0) {
splashf(5*HZ, "uImage load failed (%d)", handle);
ret = -3;
goto out;
}
ret = handle;
out:
nand_close(ndrv);
nand_unlock(ndrv);
return ret;
}
int dump_flash(int fd, uint32_t addr, uint32_t length)