drivers: rkflash: Add RK_SFTL configuration

Avoid adding redundant FTL code to SPI Nand MTD case.

make ARCH=arm rv1126_defconfig test, size -t drivers/rkflash/built-in.a
the former size:
CONFIG_RK_SFC_NAND=y
CONFIG_RK_SFC_NAND_MTD=y
CONFIG_RK_SFC_NOR=y
CONFIG_RK_SFC_NOR_MTD=y
text    data     bss     dec     hex filename
83237    2757   23716  109710   1ac8e (TOTALS)

after adjust:
31677    2705    3624   38006    9476 (TOTALS)

For Nor only:
CONFIG_RK_SFC_NOR=y
CONFIG_RK_SFC_NOR_MTD=y
19350    1237    2568   23155    5a73 (TOTALS)

Change-Id: I46186393de26512566cc62ceb1490ef35a70be1d
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
This commit is contained in:
Jon Lin
2021-08-20 11:14:42 +08:00
committed by Tao Huang
parent 69a034d297
commit 7072fb7bc5
5 changed files with 43 additions and 15 deletions

View File

@ -17,6 +17,15 @@ if RK_FLASH
comment "Rockchip Flash Devices"
config RK_SFTL
tristate "Rockchip Slc Nand FTL support"
default y
depends on (RK_NAND || (RK_SFC_NAND && RK_SFC_NAND_MTD !=y))
help
This enables support for Slc Nand FTL.
Say Y when you have a board with Slc Nand Flash register as block device.
config RK_NANDC_NAND
tristate "Rockchip NANDC Slc Nand Devices support"
default n

View File

@ -1,11 +1,13 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_RK_NANDC_NAND) += rkflash_blk.o rkflash_debug.o rksftl.o rknandc_base.o nand_boot.o flash.o nandc.o
obj-$(CONFIG_RK_SFC_NAND) += rkflash_blk.o rkflash_debug.o rksftl.o rksfc_base.o sfc_nand_boot.o sfc_nand.o sfc.o
obj-$(CONFIG_RK_NANDC_NAND) += rkflash_blk.o rkflash_debug.o rknandc_base.o nand_boot.o flash.o nandc.o
obj-$(CONFIG_RK_SFC_NAND) += rkflash_blk.o rkflash_debug.o rksfc_base.o sfc_nand_boot.o sfc_nand.o sfc.o
obj-$(CONFIG_RK_SFC_NAND_MTD) += sfc_nand_mtd.o sfc_nand_mtd_bbt.o
obj-$(CONFIG_RK_SFC_NOR) += rkflash_blk.o rkflash_debug.o rksfc_base.o sfc_nor_boot.o sfc_nor.o sfc.o
obj-$(CONFIG_RK_SFC_NOR_MTD) += sfc_nor_mtd.o
obj-$(CONFIG_RK_SFTL) += rksftl.o
ifdef CONFIG_THUMB2_KERNEL
rksftl-$(CONFIG_THUMB2_KERNEL) += rk_sftl_arm_v7_thumb.o
else

View File

@ -152,7 +152,7 @@ static int rkflash_blk_proc_show(struct seq_file *m, void *v)
{
char *ftl_buf = kzalloc(4096, GFP_KERNEL);
#if IS_ENABLED(CONFIG_RK_NANDC_NAND) || IS_ENABLED(CONFIG_RK_SFC_NAND)
#if IS_ENABLED(CONFIG_RK_SFTL)
int real_size = 0;
real_size = rknand_proc_ftlread(4096, ftl_buf);
@ -694,7 +694,7 @@ int rkflash_dev_init(void __iomem *reg_addr,
break;
#endif
case FLASH_TYPE_NANDC_NAND:
#if defined(CONFIG_RK_SFC_NAND) || defined(CONFIG_RK_NANDC_NAND)
#if defined(CONFIG_RK_SFTL)
rk_sftl_vendor_dev_ops_register(rkflash_dev_vendor_read,
rkflash_dev_vendor_write);
ret = rk_sftl_vendor_storage_init();

View File

@ -954,6 +954,7 @@ int sfc_nand_read_id(u8 *data)
return ret;
}
#if defined(CONFIG_RK_SFTL)
/*
* Read the 1st page's 1st byte of a phy_blk
* If not FF, it's bad blk
@ -1008,6 +1009,7 @@ void sfc_nand_ftl_ops_init(void)
g_nand_ops.read_page = sfc_nand_read_page;
g_nand_ops.bch_sel = NULL;
}
#endif
static int sfc_nand_enable_QE(void)
{

View File

@ -17,9 +17,11 @@ static int snand_init(void __iomem *reg_addr)
ret = sfc_nand_init();
if (ret == 0) {
sfnand_dev = sfc_nand_get_private_dev();
#ifndef CONFIG_RK_SFC_NAND_MTD
#if defined(CONFIG_RK_SFTL)
sfc_nand_ftl_ops_init();
ret = sftl_init();
#elif !defined(CONFIG_RK_SFC_NAND_MTD)
#error "When CONFIG_RK_SFC_NAND_MTD is not used, CONFIG_RK_SFTL is required!"
#endif
}
@ -28,44 +30,57 @@ static int snand_init(void __iomem *reg_addr)
static unsigned int snand_get_capacity(void)
{
if (IS_ENABLED(CONFIG_RK_SFTL))
return sftl_get_density();
return 0;
}
static int snand_write(u32 sec, u32 n_sec, void *p_data)
{
if (IS_ENABLED(CONFIG_RK_SFTL))
return sftl_write(sec, n_sec, p_data);
return 0;
}
static int snand_read(u32 sec, u32 n_sec, void *p_data)
{
if (IS_ENABLED(CONFIG_RK_SFTL))
return sftl_read(sec, n_sec, p_data);
return 0;
}
static int snand_vendor_read(u32 sec, u32 n_sec, void *p_data)
{
if (IS_ENABLED(CONFIG_RK_SFTL))
return sftl_vendor_read(sec, n_sec, p_data);
return 0;
}
static int snand_vendor_write(u32 sec, u32 n_sec, void *p_data)
{
if (IS_ENABLED(CONFIG_RK_SFTL))
return sftl_vendor_write(sec, n_sec, p_data);
return 0;
}
static int snand_gc(void)
{
if (IS_ENABLED(CONFIG_RK_SFTL))
return sftl_gc();
return 0;
}
static int snand_discard(u32 sec, u32 n_sec)
{
if (IS_ENABLED(CONFIG_RK_SFTL))
return sftl_discard(sec, n_sec);
return 0;
}
static void snand_deinit(void)
{
#ifndef CONFIG_RK_SFC_NAND_MTD
if (IS_ENABLED(CONFIG_RK_SFTL))
sftl_deinit();
#endif
sfc_nand_deinit();
}