From 63b60130f6ba27943aaeb308379ebed5b9de4c4c Mon Sep 17 00:00:00 2001 From: Jon Lin Date: Thu, 21 Dec 2023 15:16:29 +0800 Subject: [PATCH] mtd: spinand: unim: Support new devices UM19A1HISW, UM19A0HCSW, UM19A0LCSW, UM19A1LISW Change-Id: I52542258714cc6fe9d337c69a12f5921be4eae4f Signed-off-by: Jon Lin --- drivers/mtd/nand/spi/core.c | 1 + drivers/mtd/nand/spi/unim.c | 130 +++++++++++++++++++++++++++++++++++- include/linux/mtd/spinand.h | 1 + 3 files changed, 130 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index f783f2c9c42f..f0ba92a09ae5 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -873,6 +873,7 @@ static const struct spinand_manufacturer *spinand_manufacturers[] = { &skyhigh_spinand_manufacturer, &toshiba_spinand_manufacturer, &unim_spinand_manufacturer, + &unim_zl_spinand_manufacturer, &winbond_spinand_manufacturer, &xincun_spinand_manufacturer, &xtx_spinand_manufacturer, diff --git a/drivers/mtd/nand/spi/unim.c b/drivers/mtd/nand/spi/unim.c index ee78420123eb..123ee701db24 100644 --- a/drivers/mtd/nand/spi/unim.c +++ b/drivers/mtd/nand/spi/unim.c @@ -10,7 +10,8 @@ #include #include -#define SPINAND_MFR_UNIM 0xA1 +#define SPINAND_MFR_UNIM_ZL 0xA1 +#define SPINAND_MFR_UNIM 0xB0 static SPINAND_OP_VARIANTS(read_cache_variants, SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), @@ -57,6 +58,59 @@ static const struct mtd_ooblayout_ops tx25g01_ooblayout = { .free = tx25g01_ooblayout_free, }; + +static int um19a0xisw_ooblayout_ecc(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + return -ERANGE; +} + +static int um19a0xisw_ooblayout_free(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + if (section) + return -ERANGE; + + region->offset = 2; + region->length = 62; + + return 0; +} + +static const struct mtd_ooblayout_ops um19a0xisw_ooblayout = { + .ecc = um19a0xisw_ooblayout_ecc, + .free = um19a0xisw_ooblayout_free, +}; + +static int um19a1xisw_ooblayout_ecc(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + if (section) + return -ERANGE; + + region->offset = 64; + region->length = 64; + + return 0; +} + +static int um19a1xisw_ooblayout_free(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + if (section) + return -ERANGE; + + region->offset = 2; + region->length = 62; + + return 0; +} + +static const struct mtd_ooblayout_ops um19a1xisw_ooblayout = { + .ecc = um19a1xisw_ooblayout_ecc, + .free = um19a1xisw_ooblayout_free, +}; + /* * ecc bits: 0xC0[4,6] * [0b000], No bit errors were detected; @@ -80,7 +134,32 @@ static int tx25g01_ecc_get_status(struct spinand_device *spinand, return -EBADMSG; } -static const struct spinand_info unim_spinand_table[] = { +/* + * ecc bits: 0xC0[4,6] + * [0b000], No bit errors were detected; + * [0b001] and [0b011], 1~6 Bit errors were detected and corrected. Not + * reach Flipping Bits; + * [0b101], Bit error count equals the bit flip + * detection threshold + * [0b010], Multiple bit errors were detected and + * not corrected. + * others, Reserved. + */ +static int um19axxisw_ecc_ecc_get_status(struct spinand_device *spinand, + u8 status) +{ + struct nand_device *nand = spinand_to_nand(spinand); + u8 eccsr = (status & GENMASK(6, 4)) >> 4; + + if (eccsr <= 1 || eccsr == 3) + return eccsr; + else if (eccsr == 5) + return nanddev_get_ecc_requirements(nand)->strength; + else + return -EBADMSG; +} + +static const struct spinand_info unim_zl_spinand_table[] = { SPINAND_INFO("TX25G01", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF1), NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), @@ -92,9 +171,56 @@ static const struct spinand_info unim_spinand_table[] = { SPINAND_ECCINFO(&tx25g01_ooblayout, tx25g01_ecc_get_status)), }; +static const struct spinand_info unim_spinand_table[] = { + SPINAND_INFO("UM19A1HISW", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x24), + NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&um19a1xisw_ooblayout, um19axxisw_ecc_ecc_get_status)), + SPINAND_INFO("UM19A0HCSW", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x14), + NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&um19a0xisw_ooblayout, um19axxisw_ecc_ecc_get_status)), + SPINAND_INFO("UM19A0LCSW", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x15), + NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&um19a0xisw_ooblayout, um19axxisw_ecc_ecc_get_status)), + SPINAND_INFO("UM19A1LISW", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x25), + NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&um19a1xisw_ooblayout, um19axxisw_ecc_ecc_get_status)), +}; + static const struct spinand_manufacturer_ops unim_spinand_manuf_ops = { }; +const struct spinand_manufacturer unim_zl_spinand_manufacturer = { + .id = SPINAND_MFR_UNIM_ZL, + .name = "UNIM_ZL", + .chips = unim_zl_spinand_table, + .nchips = ARRAY_SIZE(unim_zl_spinand_table), + .ops = &unim_spinand_manuf_ops, +}; + const struct spinand_manufacturer unim_spinand_manufacturer = { .id = SPINAND_MFR_UNIM, .name = "UNIM", diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index 04dabc460897..011caa6855ce 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -256,6 +256,7 @@ extern const struct spinand_manufacturer toshiba_spinand_manufacturer; extern const struct spinand_manufacturer silicongo_spinand_manufacturer; extern const struct spinand_manufacturer skyhigh_spinand_manufacturer; extern const struct spinand_manufacturer unim_spinand_manufacturer; +extern const struct spinand_manufacturer unim_zl_spinand_manufacturer; extern const struct spinand_manufacturer winbond_spinand_manufacturer; extern const struct spinand_manufacturer xincun_spinand_manufacturer; extern const struct spinand_manufacturer xtx_spinand_manufacturer;