shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

drivers: rkflash: Add sleep for spinand

Browse Source 
Program/Erase/Read Speed
– Page Program time : 450us typical
– BLOCK ERASE time : 4ms typical
– PAGE READ time : 120us maximum (without ECC)

Change-Id: I0c5bc9827788938df028e525e331c0db8d041676
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
This commit is contained in:
Jon Lin
2023-07-26 15:05:53 +08:00
committed by Tao Huang
parent 939dcaa594
commit 490787f8b7
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/rkflash/sfc.c
View File

@@ -12,6 +12,7 @@
#define SFC_MAX_IOSIZE_VER4 (0xFFFFFFFF)
static void __iomem *g_sfc_reg;
static u32 sfc_version;
static void sfc_reset(void)
{
@@ -75,6 +76,7 @@ int sfc_init(void __iomem *reg_addr)
if (sfc_get_version() >= SFC_VER_4)
writel(1, g_sfc_reg + SFC_LEN_CTRL);
sfc_version = sfc_get_version();
return SFC_OK;
}
@@ -116,7 +118,7 @@ int sfc_request(struct rk_sfc_op *op, u32 addr, void *data, u32 size)
op->sfctrl.d32 |= 0x2;
cmd.b.datasize = size;
if (sfc_get_version() >= SFC_VER_4)
if (sfc_version >= SFC_VER_4)
writel(size, g_sfc_reg + SFC_LEN_EXT);
else
cmd.b.datasize = size;
@@ -238,6 +240,8 @@ int sfc_request(struct rk_sfc_op *op, u32 addr, void *data, u32 size)
break;
}
if (!bytes)
break;
sfc_delay(1);
if (timeout++ > 10000) {

20
drivers/rkflash/sfc_nand.c
View File

@@ -311,7 +311,7 @@ static int sfc_nand_write_feature(u32 addr, u8 status)
return ret;
}
static int sfc_nand_wait_busy(u8 *data, int timeout)
static int sfc_nand_wait_busy_sleep(u8 *data, int timeout, int sleep_us)
{
int ret;
int i;
@@ -319,7 +319,9 @@ static int sfc_nand_wait_busy(u8 *data, int timeout)
*data = 0;
for (i = 0; i < timeout; i++) {
for (i = 0; i < timeout; i += sleep_us) {
usleep_range(sleep_us, sleep_us + 50);
ret = sfc_nand_read_feature(0xC0, &status);
if (ret != SFC_OK)
@@ -329,8 +331,6 @@ static int sfc_nand_wait_busy(u8 *data, int timeout)
if (!(status & (1 << 0)))
return SFC_OK;
sfc_delay(1);
}
return SFC_NAND_WAIT_TIME_OUT;
@@ -794,7 +794,7 @@ u32 sfc_nand_erase_block(u8 cs, u32 addr)
if (ret != SFC_OK)
return ret;
ret = sfc_nand_wait_busy(&status, 1000 * 1000);
ret = sfc_nand_wait_busy_sleep(&status, 1000 * 1000, 1000);
if (status & (1 << 2))
return SFC_NAND_PROG_ERASE_ERROR;
@@ -851,6 +851,7 @@ u32 sfc_nand_prog_page_raw(u8 cs, u32 addr, u32 *p_page_buf)
op.sfctrl.d32 = 0;
op.sfctrl.b.datalines = sfc_nand_dev.prog_lines;
op.sfctrl.b.addrbits = 16;
op.sfctrl.b.enbledma = 0;
plane = p_nand_info->plane_per_die == 2 ? ((addr >> 6) & 0x1) << 12 : 0;
sfc_request(&op, plane, p_page_buf, page_size);
@@ -880,7 +881,8 @@ u32 sfc_nand_prog_page_raw(u8 cs, u32 addr, u32 *p_page_buf)
if (ret != SFC_OK)
return ret;
ret = sfc_nand_wait_busy(&status, 1000 * 1000);
ret = sfc_nand_wait_busy_sleep(&status, 1000 * 1000, 200);
if (status & (1 << 3))
return SFC_NAND_PROG_ERASE_ERROR;
@@ -931,7 +933,10 @@ u32 sfc_nand_read(u32 row, u32 *p_page_buf, u32 column, u32 len)
sfc_get_version() < SFC_VER_3)
sfc_nand_rw_preset();
sfc_nand_wait_busy(&status, 1000 * 1000);
sfc_nand_wait_busy_sleep(&status, 1000 * 1000, 50);
if (sfc_nand_dev.manufacturer == 0x01 && status)
sfc_nand_wait_busy_sleep(&status, 1000 * 1000, 50);
ecc_result = p_nand_info->ecc_status();
op.sfcmd.d32 = 0;
@@ -942,6 +947,7 @@ u32 sfc_nand_read(u32 row, u32 *p_page_buf, u32 column, u32 len)
op.sfctrl.d32 = 0;
op.sfctrl.b.datalines = sfc_nand_dev.read_lines;
op.sfctrl.b.addrbits = 16;
op.sfctrl.b.enbledma = 0;
plane = p_nand_info->plane_per_die == 2 ? ((row >> 6) & 0x1) << 12 : 0;
ret = sfc_request(&op, plane | column, p_page_buf, len);