mtd: spinand: Add support for setting plane select bits

Add two flags for inserting the Plane Select bit into the column
address during the write_to_cache and the read_from_cache operation.

Add the SPINAND_HAS_PROG_PLANE_SELECT_BIT flag for serial NAND flash
that require inserting the Plane Select bit into the column address
during the write_to_cache operation.

Add the SPINAND_HAS_READ_PLANE_SELECT_BIT flag for serial NAND flash
that require inserting the Plane Select bit into the column address
during the read_from_cache operation.

Signed-off-by: Cheng Ming Lin <chengminglin@mxic.com.tw>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240909092643.2434479-2-linchengming884@gmail.com

diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index b5c6d755ade1dea0dd10a6d87244d0a9aa5291e8..4d76f9f71a0e9eae1415b9c160de67b699200bac 100644 (file)
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -408,6 +408,9 @@ static int spinand_read_from_cache_op(struct spinand_device *spinand,
        else
                rdesc = spinand->dirmaps[req->pos.plane].rdesc_ecc;
 
+       if (spinand->flags & SPINAND_HAS_READ_PLANE_SELECT_BIT)
+               column |= req->pos.plane << fls(nanddev_page_size(nand));
+
        while (nbytes) {
                ret = spi_mem_dirmap_read(rdesc, column, nbytes, buf);
                if (ret < 0)
@@ -489,6 +492,9 @@ static int spinand_write_to_cache_op(struct spinand_device *spinand,
        else
                wdesc = spinand->dirmaps[req->pos.plane].wdesc_ecc;
 
+       if (spinand->flags & SPINAND_HAS_PROG_PLANE_SELECT_BIT)
+               column |= req->pos.plane << fls(nanddev_page_size(nand));
+
        while (nbytes) {
                ret = spi_mem_dirmap_write(wdesc, column, nbytes, buf);
                if (ret < 0)

diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h
index 8dbf67ca710a31f113a1cf2ff84c0b160cd3db94..702e5fb13dae73de5e77ddc71964dd46ff756253 100644 (file)
--- a/include/linux/mtd/spinand.h
+++ b/include/linux/mtd/spinand.h
@@ -312,6 +312,8 @@ struct spinand_ecc_info {
 
 #define SPINAND_HAS_QE_BIT             BIT(0)
 #define SPINAND_HAS_CR_FEAT_BIT                BIT(1)
+#define SPINAND_HAS_PROG_PLANE_SELECT_BIT              BIT(2)
+#define SPINAND_HAS_READ_PLANE_SELECT_BIT              BIT(3)
 
 /**
  * struct spinand_ondie_ecc_conf - private SPI-NAND on-die ECC engine structure