* [PATCH v2 1/3] mtd: nand: extract some onfi functions to nandcore
2022-04-15 3:48 [PATCH v2 0/3] mtd: spinand: add support for detection with param page Chuanhong Guo
@ 2022-04-15 3:48 ` Chuanhong Guo
2022-04-15 3:48 ` [PATCH v2 2/3] mtd: spinand: add support for detection with param page Chuanhong Guo
2022-04-15 3:48 ` [PATCH v2 3/3] mtd: spinand: probe Winbond W25N01GV/W using " Chuanhong Guo
2 siblings, 0 replies; 8+ messages in thread
From: Chuanhong Guo @ 2022-04-15 3:48 UTC (permalink / raw)
To: linux-mtd
Cc: Chuanhong Guo, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Patrice Chotard, Boris Brezillon,
Christophe Kerello, Mark Brown, Daniel Palmer, open list
These functions will be shared between raw nand and spi nand.
Extract them into mtd/nand/onfi.c.
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
---
Change since v1: new patch
drivers/mtd/nand/Makefile | 2 +-
drivers/mtd/nand/onfi.c | 115 ++++++++++++++++++++++++++++++
drivers/mtd/nand/raw/internals.h | 1 -
drivers/mtd/nand/raw/nand_base.c | 18 -----
drivers/mtd/nand/raw/nand_jedec.c | 4 +-
drivers/mtd/nand/raw/nand_onfi.c | 70 ++----------------
include/linux/mtd/onfi.h | 8 +++
7 files changed, 130 insertions(+), 88 deletions(-)
create mode 100644 drivers/mtd/nand/onfi.c
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 19e1291ac4d5..4251be5e655d 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-nandcore-objs := core.o bbt.o
+nandcore-objs := core.o bbt.o onfi.o
obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o
obj-$(CONFIG_MTD_NAND_ECC_MEDIATEK) += ecc-mtk.o
diff --git a/drivers/mtd/nand/onfi.c b/drivers/mtd/nand/onfi.c
new file mode 100644
index 000000000000..bc8020cf70a9
--- /dev/null
+++ b/drivers/mtd/nand/onfi.c
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * ONFI helpers shared between raw nand and spi nand support
+ */
+#include <linux/mtd/onfi.h>
+
+/**
+ * onfi_bit_wise_majority() - recover data from multiple copies using bit-wise
+ * majority
+ *
+ * @srcbufs: array of pointers to multiple copies
+ * @nsrcbufs: number of copies
+ * @dstbuf: pointer to the destination buffer
+ * @bufsize: length of data to recover
+ */
+void onfi_bit_wise_majority(const void **srcbufs, unsigned int nsrcbufs,
+ void *dstbuf, unsigned int bufsize)
+{
+ int i, j, k;
+
+ for (i = 0; i < bufsize; i++) {
+ u8 val = 0;
+
+ for (j = 0; j < 8; j++) {
+ unsigned int cnt = 0;
+
+ for (k = 0; k < nsrcbufs; k++) {
+ const u8 *srcbuf = srcbufs[k];
+
+ if (srcbuf[i] & BIT(j))
+ cnt++;
+ }
+
+ if (cnt > nsrcbufs / 2)
+ val |= BIT(j);
+ }
+
+ ((u8 *)dstbuf)[i] = val;
+ }
+}
+EXPORT_SYMBOL_GPL(onfi_bit_wise_majority);
+
+/**
+ * onfi_crc16() - calculate CRC16 in ONFI parameter page
+ * @crc: value to start with
+ * @p: data buffer
+ * @len: length of the data
+ */
+u16 onfi_crc16(u16 crc, u8 const *p, size_t len)
+{
+ int i;
+
+ while (len--) {
+ crc ^= *p++ << 8;
+ for (i = 0; i < 8; i++)
+ crc = (crc << 1) ^ ((crc & 0x8000) ? 0x8005 : 0);
+ }
+
+ return crc;
+}
+EXPORT_SYMBOL_GPL(onfi_crc16);
+
+/**
+ * onfi_parse_memorg() - parse nand memory organization from onfi parameters
+ * @p: ONFI parameters
+ * @memorg: nand memory organization struct to write to
+ */
+void onfi_parse_memorg(const struct nand_onfi_params *p,
+ struct nand_memory_organization *memorg)
+{
+ memorg->pagesize = le32_to_cpu(p->byte_per_page);
+
+ /*
+ * pages_per_block and blocks_per_lun may not be a power-of-2 size
+ * (don't ask me who thought of this...). MTD assumes that these
+ * dimensions will be power-of-2, so just truncate the remaining area.
+ */
+ memorg->pages_per_eraseblock =
+ 1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
+
+ memorg->oobsize = le16_to_cpu(p->spare_bytes_per_page);
+
+ memorg->luns_per_target = p->lun_count;
+ memorg->planes_per_lun = 1 << p->interleaved_bits;
+
+ /* See erasesize comment */
+ memorg->eraseblocks_per_lun =
+ 1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
+ memorg->max_bad_eraseblocks_per_lun = le32_to_cpu(p->blocks_per_lun);
+ memorg->bits_per_cell = p->bits_per_cell;
+}
+EXPORT_SYMBOL_GPL(onfi_parse_memorg);
+
+/**
+ * onfi_sanitize_string() - Sanitize ONFI strings so we can safely print them
+ * @s: string to sanitize
+ * @len: length of the buffer
+ */
+void onfi_sanitize_string(uint8_t *s, size_t len)
+{
+ ssize_t i;
+
+ /* Null terminate */
+ s[len - 1] = 0;
+
+ /* Remove non printable chars */
+ for (i = 0; i < len - 1; i++) {
+ if (s[i] < ' ' || s[i] > 127)
+ s[i] = '?';
+ }
+
+ /* Remove trailing spaces */
+ strim(s);
+}
+EXPORT_SYMBOL_GPL(onfi_sanitize_string);
diff --git a/drivers/mtd/nand/raw/internals.h b/drivers/mtd/nand/raw/internals.h
index 7016e0f38398..e41c7d6d2c69 100644
--- a/drivers/mtd/nand/raw/internals.h
+++ b/drivers/mtd/nand/raw/internals.h
@@ -110,7 +110,6 @@ int nand_read_param_page_op(struct nand_chip *chip, u8 page, void *buf,
unsigned int len);
void nand_decode_ext_id(struct nand_chip *chip);
void panic_nand_wait(struct nand_chip *chip, unsigned long timeo);
-void sanitize_string(uint8_t *s, size_t len);
static inline bool nand_has_exec_op(struct nand_chip *chip)
{
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 6b67b7dfe7ce..b11b9042ff25 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -4715,24 +4715,6 @@ static void nand_set_defaults(struct nand_chip *chip)
chip->buf_align = 1;
}
-/* Sanitize ONFI strings so we can safely print them */
-void sanitize_string(uint8_t *s, size_t len)
-{
- ssize_t i;
-
- /* Null terminate */
- s[len - 1] = 0;
-
- /* Remove non printable chars */
- for (i = 0; i < len - 1; i++) {
- if (s[i] < ' ' || s[i] > 127)
- s[i] = '?';
- }
-
- /* Remove trailing spaces */
- strim(s);
-}
-
/*
* nand_id_has_period - Check if an ID string has a given wraparound period
* @id_data: the ID string
diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c
index 85b6d9372d80..e3fc59587da2 100644
--- a/drivers/mtd/nand/raw/nand_jedec.c
+++ b/drivers/mtd/nand/raw/nand_jedec.c
@@ -87,8 +87,8 @@ int nand_jedec_detect(struct nand_chip *chip)
goto free_jedec_param_page;
}
- sanitize_string(p->manufacturer, sizeof(p->manufacturer));
- sanitize_string(p->model, sizeof(p->model));
+ onfi_sanitize_string(p->manufacturer, sizeof(p->manufacturer));
+ onfi_sanitize_string(p->model, sizeof(p->model));
chip->parameters.model = kstrdup(p->model, GFP_KERNEL);
if (!chip->parameters.model) {
ret = -ENOMEM;
diff --git a/drivers/mtd/nand/raw/nand_onfi.c b/drivers/mtd/nand/raw/nand_onfi.c
index 7586befce7f9..1d5734942b08 100644
--- a/drivers/mtd/nand/raw/nand_onfi.c
+++ b/drivers/mtd/nand/raw/nand_onfi.c
@@ -18,18 +18,6 @@
#define ONFI_PARAM_PAGES 3
-u16 onfi_crc16(u16 crc, u8 const *p, size_t len)
-{
- int i;
- while (len--) {
- crc ^= *p++ << 8;
- for (i = 0; i < 8; i++)
- crc = (crc << 1) ^ ((crc & 0x8000) ? 0x8005 : 0);
- }
-
- return crc;
-}
-
/* Parse the Extended Parameter Page. */
static int nand_flash_detect_ext_param_page(struct nand_chip *chip,
struct nand_onfi_params *p)
@@ -107,37 +95,6 @@ static int nand_flash_detect_ext_param_page(struct nand_chip *chip,
return ret;
}
-/*
- * Recover data with bit-wise majority
- */
-static void nand_bit_wise_majority(const void **srcbufs,
- unsigned int nsrcbufs,
- void *dstbuf,
- unsigned int bufsize)
-{
- int i, j, k;
-
- for (i = 0; i < bufsize; i++) {
- u8 val = 0;
-
- for (j = 0; j < 8; j++) {
- unsigned int cnt = 0;
-
- for (k = 0; k < nsrcbufs; k++) {
- const u8 *srcbuf = srcbufs[k];
-
- if (srcbuf[i] & BIT(j))
- cnt++;
- }
-
- if (cnt > nsrcbufs / 2)
- val |= BIT(j);
- }
-
- ((u8 *)dstbuf)[i] = val;
- }
-}
-
/*
* Check if the NAND chip is ONFI compliant, returns 1 if it is, 0 otherwise.
*/
@@ -201,7 +158,7 @@ int nand_onfi_detect(struct nand_chip *chip)
srcbufs[j] = pbuf + j;
pr_warn("Could not find a valid ONFI parameter page, trying bit-wise majority to recover it\n");
- nand_bit_wise_majority(srcbufs, ONFI_PARAM_PAGES, pbuf,
+ onfi_bit_wise_majority(srcbufs, ONFI_PARAM_PAGES, pbuf,
sizeof(*pbuf));
crc = onfi_crc16(ONFI_CRC_BASE, (u8 *)pbuf, 254);
@@ -234,38 +191,19 @@ int nand_onfi_detect(struct nand_chip *chip)
goto free_onfi_param_page;
}
- sanitize_string(p->manufacturer, sizeof(p->manufacturer));
- sanitize_string(p->model, sizeof(p->model));
+ onfi_sanitize_string(p->manufacturer, sizeof(p->manufacturer));
+ onfi_sanitize_string(p->model, sizeof(p->model));
chip->parameters.model = kstrdup(p->model, GFP_KERNEL);
if (!chip->parameters.model) {
ret = -ENOMEM;
goto free_onfi_param_page;
}
- memorg->pagesize = le32_to_cpu(p->byte_per_page);
+ onfi_parse_memorg(p, memorg);
mtd->writesize = memorg->pagesize;
-
- /*
- * pages_per_block and blocks_per_lun may not be a power-of-2 size
- * (don't ask me who thought of this...). MTD assumes that these
- * dimensions will be power-of-2, so just truncate the remaining area.
- */
- memorg->pages_per_eraseblock =
- 1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
mtd->erasesize = memorg->pages_per_eraseblock * memorg->pagesize;
-
- memorg->oobsize = le16_to_cpu(p->spare_bytes_per_page);
mtd->oobsize = memorg->oobsize;
- memorg->luns_per_target = p->lun_count;
- memorg->planes_per_lun = 1 << p->interleaved_bits;
-
- /* See erasesize comment */
- memorg->eraseblocks_per_lun =
- 1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
- memorg->max_bad_eraseblocks_per_lun = le32_to_cpu(p->blocks_per_lun);
- memorg->bits_per_cell = p->bits_per_cell;
-
if (le16_to_cpu(p->features) & ONFI_FEATURE_16_BIT_BUS)
chip->options |= NAND_BUSWIDTH_16;
diff --git a/include/linux/mtd/onfi.h b/include/linux/mtd/onfi.h
index a7376f9beddf..728d9ee9dabe 100644
--- a/include/linux/mtd/onfi.h
+++ b/include/linux/mtd/onfi.h
@@ -12,6 +12,7 @@
#include <linux/types.h>
#include <linux/bitfield.h>
+#include <linux/mtd/nand.h>
/* ONFI version bits */
#define ONFI_VERSION_1_0 BIT(1)
@@ -186,4 +187,11 @@ struct onfi_params {
u8 vendor[88];
};
+void onfi_bit_wise_majority(const void **srcbufs, unsigned int nsrcbufs,
+ void *dstbuf, unsigned int bufsize);
+u16 onfi_crc16(u16 crc, u8 const *p, size_t len);
+void onfi_parse_memorg(const struct nand_onfi_params *p,
+ struct nand_memory_organization *memorg);
+void onfi_sanitize_string(uint8_t *s, size_t len);
+
#endif /* __LINUX_MTD_ONFI_H */
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/3] mtd: spinand: add support for detection with param page
2022-04-15 3:48 [PATCH v2 0/3] mtd: spinand: add support for detection with param page Chuanhong Guo
2022-04-15 3:48 ` [PATCH v2 1/3] mtd: nand: extract some onfi functions to nandcore Chuanhong Guo
@ 2022-04-15 3:48 ` Chuanhong Guo
2022-04-15 6:48 ` Boris Brezillon
2022-04-15 7:00 ` Boris Brezillon
2022-04-15 3:48 ` [PATCH v2 3/3] mtd: spinand: probe Winbond W25N01GV/W using " Chuanhong Guo
2 siblings, 2 replies; 8+ messages in thread
From: Chuanhong Guo @ 2022-04-15 3:48 UTC (permalink / raw)
To: linux-mtd
Cc: Chuanhong Guo, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Patrice Chotard, Boris Brezillon,
Christophe Kerello, Mark Brown, Daniel Palmer, open list
SPI-NAND detection using chip ID isn't always reliable.
Here are two known cases:
1. ESMT uses JEDEC ID from other vendors. This may collapse with future
chips.
2. Winbond W25N01KV uses the exact same JEDEC ID as W25N01GV while
having completely different chip parameters.
Recent SPI-NANDs have a parameter page which is stored in the same
format as raw NAND ONFI data. There are strings for chip manufacturer
and chip model. Chip ECC requirement and memory organization are
available too.
This patch adds support for detecting SPI-NANDs with the parameter page
after ID matching failed. In this detection, memory organization and
ECC requirements are taken from the parameter page, and other SPI-NAND
specific parameters are obtained by matching chip model string with
a separated table.
It's common for vendors to release a series of SPI-NANDs with the same
SPI-NAND parameters in different voltages and/or capacities. The chip
table defined in this patch supports multiple model strings in one
entry, and multiple chip models can be covered using only one entry.
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
---
The parameter page has sufficient checking to reject garbage data,
and the reading sequence seems to be the same across vendors.
So I think it isn't necessary to keep it vendor-private.
Change since v1: drop duplicated code from rawnand and use extracted
functions instead.
drivers/mtd/nand/spi/Makefile | 2 +-
drivers/mtd/nand/spi/core.c | 23 ++--
drivers/mtd/nand/spi/onfi.c | 217 ++++++++++++++++++++++++++++++++++
include/linux/mtd/spinand.h | 50 ++++++++
4 files changed, 280 insertions(+), 12 deletions(-)
create mode 100644 drivers/mtd/nand/spi/onfi.c
diff --git a/drivers/mtd/nand/spi/Makefile b/drivers/mtd/nand/spi/Makefile
index 9662b9c1d5a9..a4e057cbdaf7 100644
--- a/drivers/mtd/nand/spi/Makefile
+++ b/drivers/mtd/nand/spi/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
-spinand-objs := core.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o
+spinand-objs := core.o gigadevice.o macronix.o micron.o onfi.o paragon.o toshiba.o winbond.o
obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index ff8336870bc0..3b51ca7232d0 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -20,7 +20,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/spi-mem.h>
-static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val)
+int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val)
{
struct spi_mem_op op = SPINAND_GET_FEATURE_OP(reg,
spinand->scratchbuf);
@@ -34,7 +34,7 @@ static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val)
return 0;
}
-static int spinand_write_reg_op(struct spinand_device *spinand, u8 reg, u8 val)
+int spinand_write_reg_op(struct spinand_device *spinand, u8 reg, u8 val)
{
struct spi_mem_op op = SPINAND_SET_FEATURE_OP(reg,
spinand->scratchbuf);
@@ -339,7 +339,7 @@ static void spinand_ondie_ecc_save_status(struct nand_device *nand, u8 status)
engine_conf->status = status;
}
-static int spinand_write_enable_op(struct spinand_device *spinand)
+int spinand_write_enable_op(struct spinand_device *spinand)
{
struct spi_mem_op op = SPINAND_WR_EN_DIS_OP(true);
@@ -496,10 +496,8 @@ static int spinand_erase_op(struct spinand_device *spinand,
return spi_mem_exec_op(spinand->spimem, &op);
}
-static int spinand_wait(struct spinand_device *spinand,
- unsigned long initial_delay_us,
- unsigned long poll_delay_us,
- u8 *s)
+int spinand_wait(struct spinand_device *spinand, unsigned long initial_delay_us,
+ unsigned long poll_delay_us, u8 *s)
{
struct spi_mem_op op = SPINAND_GET_FEATURE_OP(REG_STATUS,
spinand->scratchbuf);
@@ -1006,7 +1004,7 @@ static void spinand_manufacturer_cleanup(struct spinand_device *spinand)
return spinand->manufacturer->ops->cleanup(spinand);
}
-static const struct spi_mem_op *
+const struct spi_mem_op *
spinand_select_op_variant(struct spinand_device *spinand,
const struct spinand_op_variants *variants)
{
@@ -1117,9 +1115,12 @@ static int spinand_detect(struct spinand_device *spinand)
ret = spinand_id_detect(spinand);
if (ret) {
- dev_err(dev, "unknown raw ID %*phN\n", SPINAND_MAX_ID_LEN,
- spinand->id.data);
- return ret;
+ ret = spinand_onfi_detect(spinand);
+ if (ret) {
+ dev_err(dev, "unknown raw ID %*phN\n",
+ SPINAND_MAX_ID_LEN, spinand->id.data);
+ return ret;
+ }
}
if (nand->memorg.ntargets > 1 && !spinand->select_target) {
diff --git a/drivers/mtd/nand/spi/onfi.c b/drivers/mtd/nand/spi/onfi.c
new file mode 100644
index 000000000000..6d3a7e7c4f6e
--- /dev/null
+++ b/drivers/mtd/nand/spi/onfi.c
@@ -0,0 +1,217 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Detect and match SPI-NAND info using ONFI parameter page
+ *
+ * Author:
+ * Chuanhong Guo <gch981213@gmail.com>
+ *
+ * Part of this code comes from nand_onfi.c in raw nand support.
+ *
+ */
+#include <linux/mtd/onfi.h>
+#include <linux/mtd/spinand.h>
+
+#define SPINAND_IDR_EN BIT(6)
+#define SPINAND_PARAM_PAGE 1
+#define ONFI_PARAM_PAGES 3
+
+static int spinand_onfi_read(struct spinand_device *spinand, void *buf,
+ size_t len)
+{
+ const struct spi_mem_op load_page =
+ SPINAND_PAGE_READ_OP(SPINAND_PARAM_PAGE);
+ struct spi_mem_op read_cache =
+ SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, buf, len);
+ int ret;
+ u8 cfg;
+
+ ret = spinand_read_reg_op(spinand, REG_CFG, &cfg);
+ if (ret)
+ return ret;
+
+ ret = spinand_write_enable_op(spinand);
+ if (ret)
+ return ret;
+
+ ret = spinand_write_reg_op(spinand, REG_CFG, cfg | SPINAND_IDR_EN);
+ if (ret)
+ return ret;
+
+ ret = spinand_read_reg_op(spinand, REG_CFG, &cfg);
+ if (ret)
+ return ret;
+
+ if (!(cfg & SPINAND_IDR_EN))
+ return -EINVAL;
+
+ ret = spi_mem_exec_op(spinand->spimem, &load_page);
+ if (ret)
+ goto cleanup;
+
+ ret = spinand_wait(spinand, SPINAND_READ_INITIAL_DELAY_US,
+ SPINAND_READ_POLL_DELAY_US, NULL);
+ if (ret)
+ goto cleanup;
+
+ while (len) {
+ ret = spi_mem_adjust_op_size(spinand->spimem, &read_cache);
+ if (ret)
+ goto cleanup;
+ ret = spi_mem_exec_op(spinand->spimem, &read_cache);
+ if (ret)
+ goto cleanup;
+ read_cache.addr.val += read_cache.data.nbytes;
+ read_cache.data.buf.in += read_cache.data.nbytes;
+ len -= read_cache.data.nbytes;
+ read_cache.data.nbytes = len;
+ }
+cleanup:
+ spinand_write_reg_op(spinand, REG_CFG, cfg & ~SPINAND_IDR_EN);
+ return ret;
+}
+
+static bool spinand_onfi_validate(const struct nand_onfi_params *p)
+{
+ u16 crc;
+
+ if (strncmp("ONFI", p->sig, 4))
+ return false;
+ crc = onfi_crc16(ONFI_CRC_BASE, (u8 *)p, sizeof(*p) - 2);
+ return crc == le16_to_cpu(p->crc);
+}
+
+static const struct spinand_manufacturer *spinand_onfi_manufacturers[] = {};
+
+static const struct spinand_onfi_info *
+spinand_onfi_chip_match(struct nand_onfi_params *p,
+ const struct spinand_manufacturer *m)
+{
+ size_t i, j;
+
+ for (i = 0; i < m->nchips; i++)
+ for (j = 0; m->onfi_chips[i].models[j]; j++)
+ if (!strcasecmp(m->onfi_chips[i].models[j], p->model))
+ return &m->onfi_chips[i];
+ return NULL;
+}
+
+static const struct spinand_onfi_info *
+spinand_onfi_manufacturer_match(struct spinand_device *spinand,
+ struct nand_onfi_params *p)
+{
+ const struct spinand_onfi_info *ret;
+ size_t i;
+
+ for (i = 0; i < ARRAY_SIZE(spinand_onfi_manufacturers); i++) {
+ if (strcasecmp(spinand_onfi_manufacturers[i]->name,
+ p->manufacturer))
+ continue;
+ spinand->manufacturer = spinand_onfi_manufacturers[i];
+ ret = spinand_onfi_chip_match(p, spinand_onfi_manufacturers[i]);
+ if (ret)
+ return ret;
+ }
+ return NULL;
+}
+
+/**
+ * spinand_onfi_detect() - match SPI-NAND using ONFI parameter page
+ * @spinand: spinand private structure
+ *
+ * Return:
+ * 0: Success
+ * -EINVAL: failed to read a valid parameter page
+ * -EOPNOTSUPP: chip isn't supported
+ */
+int spinand_onfi_detect(struct spinand_device *spinand)
+{
+ struct nand_onfi_params *p = NULL, *pbuf;
+ size_t params_len = sizeof(*pbuf) * ONFI_PARAM_PAGES;
+ struct nand_device *nand = spinand_to_nand(spinand);
+ struct nand_memory_organization *memorg = nanddev_get_memorg(nand);
+ const struct spi_mem_op *op;
+ const struct spinand_onfi_info *info;
+ int i, ret;
+
+ pbuf = kzalloc(params_len, GFP_KERNEL);
+ if (!pbuf)
+ return -ENOMEM;
+
+ ret = spinand_onfi_read(spinand, pbuf, params_len);
+ if (ret)
+ goto cleanup;
+
+ for (i = 0; i < ONFI_PARAM_PAGES; i++) {
+ if (spinand_onfi_validate(&pbuf[i])) {
+ p = &pbuf[i];
+ break;
+ }
+ }
+
+ if (!p) {
+ const void *srcbufs[ONFI_PARAM_PAGES];
+ unsigned int j;
+
+ for (j = 0; j < ONFI_PARAM_PAGES; j++)
+ srcbufs[j] = pbuf + j;
+ onfi_bit_wise_majority(srcbufs, ONFI_PARAM_PAGES, pbuf,
+ sizeof(*pbuf));
+ if (spinand_onfi_validate(pbuf))
+ p = pbuf;
+ }
+
+ if (!p) {
+ ret = -EINVAL;
+ goto cleanup;
+ }
+
+ onfi_sanitize_string(p->manufacturer, sizeof(p->manufacturer));
+ onfi_sanitize_string(p->model, sizeof(p->model));
+
+ info = spinand_onfi_manufacturer_match(spinand, p);
+ if (!info) {
+ dev_err(&spinand->spimem->spi->dev, "unknown chip: %s %s",
+ p->manufacturer, p->model);
+ ret = -EOPNOTSUPP;
+ goto cleanup;
+ }
+
+ onfi_parse_memorg(p, memorg);
+ memorg->ntargets = 1;
+
+ if (p->ecc_bits != 0xff) {
+ struct nand_ecc_props requirements = {
+ .strength = p->ecc_bits,
+ .step_size = p->data_bytes_per_ppage,
+ };
+
+ nanddev_set_ecc_requirements(nand, &requirements);
+ } else {
+ ret = -EINVAL;
+ }
+
+ /* setup spi-nand specific ops */
+ spinand->eccinfo = info->eccinfo;
+ spinand->flags = info->flags;
+ spinand->id.len = 0;
+ spinand->select_target = info->select_target;
+
+ op = spinand_select_op_variant(spinand, info->op_variants.read_cache);
+ if (!op)
+ return -EOPNOTSUPP;
+
+ spinand->op_templates.read_cache = op;
+
+ op = spinand_select_op_variant(spinand, info->op_variants.write_cache);
+ if (!op)
+ return -EOPNOTSUPP;
+
+ spinand->op_templates.write_cache = op;
+
+ op = spinand_select_op_variant(spinand, info->op_variants.update_cache);
+ spinand->op_templates.update_cache = op;
+
+cleanup:
+ kfree(pbuf);
+ return ret;
+}
diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h
index 3aa28240a77f..dc218082d773 100644
--- a/include/linux/mtd/spinand.h
+++ b/include/linux/mtd/spinand.h
@@ -255,6 +255,7 @@ struct spinand_manufacturer {
u8 id;
char *name;
const struct spinand_info *chips;
+ const struct spinand_onfi_info *onfi_chips;
const size_t nchips;
const struct spinand_manufacturer_ops *ops;
};
@@ -386,6 +387,46 @@ struct spinand_info {
__VA_ARGS__ \
}
+/**
+ * struct spinand_onfi_info - Structure used to describe SPI NAND with ONFI
+ * parameter page
+ * @models: Model name array. Null terminated.
+ * @flags: OR-ing of the SPINAND_XXX flags
+ * @eccinfo: on-die ECC info
+ * @op_variants: operations variants
+ * @op_variants.read_cache: variants of the read-cache operation
+ * @op_variants.write_cache: variants of the write-cache operation
+ * @op_variants.update_cache: variants of the update-cache operation
+ * @select_target: function used to select a target/die. Required only for
+ * multi-die chips
+ *
+ * Each SPI NAND manufacturer driver should have a spinand_onfi_info table
+ * describing all the chips supported by the driver.
+ */
+struct spinand_onfi_info {
+ const char **const models;
+ u32 flags;
+ struct spinand_ecc_info eccinfo;
+ struct {
+ const struct spinand_op_variants *read_cache;
+ const struct spinand_op_variants *write_cache;
+ const struct spinand_op_variants *update_cache;
+ } op_variants;
+ int (*select_target)(struct spinand_device *spinand,
+ unsigned int target);
+};
+
+#define SPINAND_ONFI_MODELS(...) \
+ .models = (const char *[]){ __VA_ARGS__, NULL }
+
+#define SPINAND_ONFI_INFO(__models, __op_variants, __flags, ...) \
+ { \
+ __models, \
+ .op_variants = __op_variants, \
+ .flags = __flags, \
+ __VA_ARGS__ \
+ }
+
struct spinand_dirmap {
struct spi_mem_dirmap_desc *wdesc;
struct spi_mem_dirmap_desc *rdesc;
@@ -511,7 +552,16 @@ int spinand_match_and_init(struct spinand_device *spinand,
unsigned int table_size,
enum spinand_readid_method rdid_method);
+int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val);
+int spinand_write_reg_op(struct spinand_device *spinand, u8 reg, u8 val);
+int spinand_write_enable_op(struct spinand_device *spinand);
int spinand_upd_cfg(struct spinand_device *spinand, u8 mask, u8 val);
+int spinand_onfi_detect(struct spinand_device *spinand);
+const struct spi_mem_op *
+spinand_select_op_variant(struct spinand_device *spinand,
+ const struct spinand_op_variants *variants);
int spinand_select_target(struct spinand_device *spinand, unsigned int target);
+int spinand_wait(struct spinand_device *spinand, unsigned long initial_delay_us,
+ unsigned long poll_delay_us, u8 *s);
#endif /* __LINUX_MTD_SPINAND_H */
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 2/3] mtd: spinand: add support for detection with param page
2022-04-15 3:48 ` [PATCH v2 2/3] mtd: spinand: add support for detection with param page Chuanhong Guo
@ 2022-04-15 6:48 ` Boris Brezillon
2022-04-15 7:00 ` Boris Brezillon
1 sibling, 0 replies; 8+ messages in thread
From: Boris Brezillon @ 2022-04-15 6:48 UTC (permalink / raw)
To: Chuanhong Guo
Cc: linux-mtd, Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Patrice Chotard, Christophe Kerello, Mark Brown, Daniel Palmer,
open list
On Fri, 15 Apr 2022 11:48:43 +0800
Chuanhong Guo <gch981213@gmail.com> wrote:
> +#define SPINAND_IDR_EN BIT(6)
Looks like you're redefining CFG_OTP_ENABLE, why not use that
definition directly?
> +#define SPINAND_PARAM_PAGE 1
> +#define ONFI_PARAM_PAGES 3
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] mtd: spinand: add support for detection with param page
2022-04-15 3:48 ` [PATCH v2 2/3] mtd: spinand: add support for detection with param page Chuanhong Guo
2022-04-15 6:48 ` Boris Brezillon
@ 2022-04-15 7:00 ` Boris Brezillon
2022-04-15 7:28 ` Chuanhong Guo
1 sibling, 1 reply; 8+ messages in thread
From: Boris Brezillon @ 2022-04-15 7:00 UTC (permalink / raw)
To: Chuanhong Guo
Cc: linux-mtd, Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Patrice Chotard, Christophe Kerello, Mark Brown, Daniel Palmer,
open list
On Fri, 15 Apr 2022 11:48:43 +0800
Chuanhong Guo <gch981213@gmail.com> wrote:
> +
> +static const struct spinand_manufacturer *spinand_onfi_manufacturers[] = {};
Do we really need a separate manufacturer array? Looks like we could
re-use the one we have in core.c and do the matching against it (we
just need an extra NULL sentinel to detect the end of this array).
> +
> +static const struct spinand_onfi_info *
> +spinand_onfi_chip_match(struct nand_onfi_params *p,
> + const struct spinand_manufacturer *m)
> +{
> + size_t i, j;
> +
> + for (i = 0; i < m->nchips; i++)
> + for (j = 0; m->onfi_chips[i].models[j]; j++)
> + if (!strcasecmp(m->onfi_chips[i].models[j], p->model))
> + return &m->onfi_chips[i];
> + return NULL;
> +}
> +/**
> + * struct spinand_onfi_info - Structure used to describe SPI NAND with ONFI
> + * parameter page
> + * @models: Model name array. Null terminated.
> + * @flags: OR-ing of the SPINAND_XXX flags
> + * @eccinfo: on-die ECC info
> + * @op_variants: operations variants
> + * @op_variants.read_cache: variants of the read-cache operation
> + * @op_variants.write_cache: variants of the write-cache operation
> + * @op_variants.update_cache: variants of the update-cache operation
> + * @select_target: function used to select a target/die. Required only for
> + * multi-die chips
> + *
> + * Each SPI NAND manufacturer driver should have a spinand_onfi_info table
> + * describing all the chips supported by the driver.
> + */
> +struct spinand_onfi_info {
> + const char **const models;
> + u32 flags;
> + struct spinand_ecc_info eccinfo;
> + struct {
> + const struct spinand_op_variants *read_cache;
> + const struct spinand_op_variants *write_cache;
> + const struct spinand_op_variants *update_cache;
> + } op_variants;
> + int (*select_target)(struct spinand_device *spinand,
> + unsigned int target);
> +};
Can't we just extend spinand_info instead of defining a new struct.
AFAICT, the only difference is that model is replaced by a model array,
and devid is dropped, and I think we can rework the existing ID-based
matching logic to return ->models[0] instead of ->model.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2 2/3] mtd: spinand: add support for detection with param page
2022-04-15 7:00 ` Boris Brezillon
@ 2022-04-15 7:28 ` Chuanhong Guo
0 siblings, 0 replies; 8+ messages in thread
From: Chuanhong Guo @ 2022-04-15 7:28 UTC (permalink / raw)
To: Boris Brezillon
Cc: linux-mtd, Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Patrice Chotard, Christophe Kerello, Mark Brown, Daniel Palmer,
open list
Hi!
On Fri, Apr 15, 2022 at 3:01 PM Boris Brezillon
<boris.brezillon@collabora.com> wrote:
> +#define SPINAND_IDR_EN BIT(6)
Looks like you're redefining CFG_OTP_ENABLE, why not use that
definition directly?
Oh. I didn't know that was available. I'll use it.
(IDR_EN comes from a toshiba datasheet if I remember correctly.)
>
> On Fri, 15 Apr 2022 11:48:43 +0800
> Chuanhong Guo <gch981213@gmail.com> wrote:
>
> > +
> > +static const struct spinand_manufacturer *spinand_onfi_manufacturers[] = {};
>
> Do we really need a separate manufacturer array? Looks like we could
> re-use the one we have in core.c and do the matching against it (we
> just need an extra NULL sentinel to detect the end of this array).
I'll do it.
I'll also add a onfi_nchips to spinand_manufacturer to share the same
manufacturer entry between two types of ID list.
>
> > +
> > +static const struct spinand_onfi_info *
> > +spinand_onfi_chip_match(struct nand_onfi_params *p,
> > + const struct spinand_manufacturer *m)
> > +{
> > + size_t i, j;
> > +
> > + for (i = 0; i < m->nchips; i++)
> > + for (j = 0; m->onfi_chips[i].models[j]; j++)
> > + if (!strcasecmp(m->onfi_chips[i].models[j], p->model))
> > + return &m->onfi_chips[i];
> > + return NULL;
> > +}
>
> > +/**
> > + * struct spinand_onfi_info - Structure used to describe SPI NAND with ONFI
> > + * parameter page
> > + * @models: Model name array. Null terminated.
> > + * @flags: OR-ing of the SPINAND_XXX flags
> > + * @eccinfo: on-die ECC info
> > + * @op_variants: operations variants
> > + * @op_variants.read_cache: variants of the read-cache operation
> > + * @op_variants.write_cache: variants of the write-cache operation
> > + * @op_variants.update_cache: variants of the update-cache operation
> > + * @select_target: function used to select a target/die. Required only for
> > + * multi-die chips
> > + *
> > + * Each SPI NAND manufacturer driver should have a spinand_onfi_info table
> > + * describing all the chips supported by the driver.
> > + */
> > +struct spinand_onfi_info {
> > + const char **const models;
> > + u32 flags;
> > + struct spinand_ecc_info eccinfo;
> > + struct {
> > + const struct spinand_op_variants *read_cache;
> > + const struct spinand_op_variants *write_cache;
> > + const struct spinand_op_variants *update_cache;
> > + } op_variants;
> > + int (*select_target)(struct spinand_device *spinand,
> > + unsigned int target);
> > +};
>
> Can't we just extend spinand_info instead of defining a new struct.
Yeah, that's better. I'll do it.
> AFAICT, the only difference is that model is replaced by a model array,
> and devid is dropped, and I think we can rework the existing ID-based
> matching logic to return ->models[0] instead of ->model.
In fact we don't even use this model string anywhere at the moment.
--
Regards,
Chuanhong Guo
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] mtd: spinand: probe Winbond W25N01GV/W using param page
2022-04-15 3:48 [PATCH v2 0/3] mtd: spinand: add support for detection with param page Chuanhong Guo
2022-04-15 3:48 ` [PATCH v2 1/3] mtd: nand: extract some onfi functions to nandcore Chuanhong Guo
2022-04-15 3:48 ` [PATCH v2 2/3] mtd: spinand: add support for detection with param page Chuanhong Guo
@ 2022-04-15 3:48 ` Chuanhong Guo
2022-04-16 10:10 ` Chuanhong Guo
2 siblings, 1 reply; 8+ messages in thread
From: Chuanhong Guo @ 2022-04-15 3:48 UTC (permalink / raw)
To: linux-mtd
Cc: Chuanhong Guo, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Patrice Chotard, Boris Brezillon,
Christophe Kerello, Mark Brown, Daniel Palmer, open list
The JEDEC ID of EFAA21 is assigned to both W25N01G and W25N01K.
Probing the chip with JEDEC ID isn't reliable anymore. Use parameter
page instead.
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
---
Change since v1: none
drivers/mtd/nand/spi/onfi.c | 4 +++-
drivers/mtd/nand/spi/winbond.c | 25 ++++++++++++++++---------
include/linux/mtd/spinand.h | 3 +++
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/drivers/mtd/nand/spi/onfi.c b/drivers/mtd/nand/spi/onfi.c
index 6d3a7e7c4f6e..45447112a96d 100644
--- a/drivers/mtd/nand/spi/onfi.c
+++ b/drivers/mtd/nand/spi/onfi.c
@@ -80,7 +80,9 @@ static bool spinand_onfi_validate(const struct nand_onfi_params *p)
return crc == le16_to_cpu(p->crc);
}
-static const struct spinand_manufacturer *spinand_onfi_manufacturers[] = {};
+static const struct spinand_manufacturer *spinand_onfi_manufacturers[] = {
+ &winbond_onfi_spinand_manufacturer,
+};
static const struct spinand_onfi_info *
spinand_onfi_chip_match(struct nand_onfi_params *p,
diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index 76684428354e..601316c80b3e 100644
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -85,15 +85,15 @@ static const struct spinand_info winbond_spinand_table[] = {
0,
SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL),
SPINAND_SELECT_TARGET(w25m02gv_select_target)),
- SPINAND_INFO("W25N01GV",
- SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa),
- NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
- NAND_ECCREQ(1, 512),
- SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
- &write_cache_variants,
- &update_cache_variants),
- 0,
- SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),
+};
+
+static const struct spinand_onfi_info winbond_spinand_onfi_table[] = {
+ SPINAND_ONFI_INFO(SPINAND_ONFI_MODELS("W25N01GV", "W25N01GW"),
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
+ &write_cache_variants,
+ &update_cache_variants),
+ 0,
+ SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),
};
static int winbond_spinand_init(struct spinand_device *spinand)
@@ -125,3 +125,10 @@ const struct spinand_manufacturer winbond_spinand_manufacturer = {
.nchips = ARRAY_SIZE(winbond_spinand_table),
.ops = &winbond_spinand_manuf_ops,
};
+
+const struct spinand_manufacturer winbond_onfi_spinand_manufacturer = {
+ .name = "Winbond",
+ .onfi_chips = winbond_spinand_onfi_table,
+ .nchips = ARRAY_SIZE(winbond_spinand_onfi_table),
+ .ops = &winbond_spinand_manuf_ops,
+};
diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h
index dc218082d773..610320b03773 100644
--- a/include/linux/mtd/spinand.h
+++ b/include/linux/mtd/spinand.h
@@ -268,6 +268,9 @@ extern const struct spinand_manufacturer paragon_spinand_manufacturer;
extern const struct spinand_manufacturer toshiba_spinand_manufacturer;
extern const struct spinand_manufacturer winbond_spinand_manufacturer;
+/* SPI NAND manufacturers with ONFI parameter page support */
+extern const struct spinand_manufacturer winbond_onfi_spinand_manufacturer;
+
/**
* struct spinand_op_variants - SPI NAND operation variants
* @ops: the list of variants for a given operation
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 3/3] mtd: spinand: probe Winbond W25N01GV/W using param page
2022-04-15 3:48 ` [PATCH v2 3/3] mtd: spinand: probe Winbond W25N01GV/W using " Chuanhong Guo
@ 2022-04-16 10:10 ` Chuanhong Guo
0 siblings, 0 replies; 8+ messages in thread
From: Chuanhong Guo @ 2022-04-16 10:10 UTC (permalink / raw)
To: Boris Brezillon, Miquel Raynal
Cc: Richard Weinberger, Vignesh Raghavendra, Patrice Chotard,
Christophe Kerello, Mark Brown, Daniel Palmer, linux-mtd,
open list
Hi!
On Fri, Apr 15, 2022 at 11:49 AM Chuanhong Guo <gch981213@gmail.com> wrote:
>
> The JEDEC ID of EFAA21 is assigned to both W25N01G and W25N01K.
> Probing the chip with JEDEC ID isn't reliable anymore. Use parameter
> page instead.
I just found an old W25N01GV with no valid parameter page.
I need to rethink how to deal with this crap then. This patchset is
abandoned.
--
Regards,
Chuanhong Guo
^ permalink raw reply [flat|nested] 8+ messages in thread