len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-10-10 08:03:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rk27xx: overlap NAND read transfers with the slot copies

Browse source 
Every sector of a read was transferred from the chip into a controller
slot and then copied out of it, the next transfer starting only after
the copy. Start it before: it goes into the next slot, not the one
being copied.

On the Samsung YP-CP3, same test: reads at 8.25 MB/s, the original
firmware's speed, every read verified, also after a power cycle.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Change-Id: I53f77ea3c00bb449d772357e39602cca9c5cdba3
This commit is contained in:
Marcin Bukat 2026-10-01 22:25:53 +02:00
parent 8dcf743951
commit 21d5dacdb8
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
firmware/target/arm/rk27xx/flash-rk27xx.c
View file

@ -259,19 +259,26 @@ static void latch_page(uint32_t row, uint32_t mode)
BCHCTL = BCH_RST | mode;
}
/* Transfer the next sector of the latched page through slot `slot` & 3.
* Returns the BCH status. */
static uint32_t read_next_sector(uint32_t slot, uint8_t *data, uint8_t *meta)
/* Start the transfer of the next sector of the latched page into slot
* `slot` & 3. */
static void kick_read(uint32_t slot)
{
uint32_t st;
uint32_t buf = slot & 3;
FLCTL = FL_KICK_READ | ((slot & 3) << 3);
}
FLCTL = FL_KICK_READ | (buf << 3);
/* Wait for the last kicked transfer. Returns its BCH status. */
static uint32_t wait_read(void)
{
while (!(FLCTL & FL_RDY))
{
}
return BCHST;
}
st = BCHST;
/* Copy a transferred sector out of slot `slot` & 3. */
static void copy_slot(uint32_t slot, uint8_t *data, uint8_t *meta)
{
uint32_t buf = slot & 3;
if (data)
{
@ -283,7 +290,6 @@ static uint32_t read_next_sector(uint32_t slot, uint8_t *data, uint8_t *meta)
memcpy(meta, (const void *)((uintptr_t)&SPARE_BUF + (buf << 4)),
FLASH_META_SIZE);
}
return st;
}
/* Read sectors [first, first + n) of raw page `row`. Returns 1 if any was
@ -295,6 +301,7 @@ static int read_raw_run(uint32_t row, uint32_t first, uint32_t n,
int uncorrectable = 0;
latch_page(row, mode);
kick_read(0);
for (j = 0; j < first + n; j++)
{
@ -304,7 +311,15 @@ static int read_raw_run(uint32_t row, uint32_t first, uint32_t n,
: NULL;
uint8_t *m = (wanted && meta) ? meta + (size_t)k * FLASH_META_SIZE
: NULL;
uint32_t st = read_next_sector(j, d, m);
uint32_t st = wait_read();
/* the next sector transfers, into the next slot, while this one is
* copied out */
if (j + 1 < first + n)
{
kick_read(j + 1);
}
copy_slot(j, d, m);
if (wanted)
{