From: Michael Walle <mwalle@kernel.org>
To: Tudor Ambarus <tudor.ambarus@linaro.org>,
Pratyush Yadav <pratyush@kernel.org>,
Michael Walle <michael@walle.cc>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org,
Michael Walle <mwalle@kernel.org>
Subject: [PATCH 13/41] mtd: spi-nor: move the .id and .id_len into an own structure
Date: Mon, 07 Aug 2023 15:21:07 +0200 [thread overview]
Message-ID: <20230807-mtd-flash-info-db-rework-v1-13-3d3d5bef4ba4@kernel.org> (raw)
In-Reply-To: <20230807-mtd-flash-info-db-rework-v1-0-3d3d5bef4ba4@kernel.org>
Create a new structure to hold a flash ID and its length. The goal is to
have a new macro SNOR_ID() which can have a flexible id length. This way
we can get rid of all the individual INFOx() macros.
Signed-off-by: Michael Walle <mwalle@kernel.org>
---
drivers/mtd/spi-nor/core.c | 6 +++---
drivers/mtd/spi-nor/core.h | 33 ++++++++++++++++++++++++---------
drivers/mtd/spi-nor/micron-st.c | 4 ++--
drivers/mtd/spi-nor/spansion.c | 4 ++--
drivers/mtd/spi-nor/sysfs.c | 6 +++---
drivers/mtd/spi-nor/winbond.c | 1 -
6 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 41612b9f1098..1319fcb97e16 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2027,8 +2027,8 @@ static const struct flash_info *spi_nor_match_id(struct spi_nor *nor,
for (i = 0; i < ARRAY_SIZE(manufacturers); i++) {
for (j = 0; j < manufacturers[i]->nparts; j++) {
part = &manufacturers[i]->parts[j];
- if (part->id_len &&
- !memcmp(part->id, id, part->id_len)) {
+ if (part->id &&
+ !memcmp(part->id->bytes, id, part->id->len)) {
nor->manufacturer = manufacturers[i];
return part;
}
@@ -3369,7 +3369,7 @@ static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
* If caller has specified name of flash model that can normally be
* detected using JEDEC, let's verify it.
*/
- if (name && info->id_len) {
+ if (name && info->id) {
const struct flash_info *jinfo;
jinfo = spi_nor_detect(nor);
diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index eec14733c233..57272bb51eff 100644
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -446,12 +446,22 @@ struct spi_nor_fixups {
int (*late_init)(struct spi_nor *nor);
};
+/**
+ * struct spi_nor_id - SPI NOR flash ID.
+ *
+ * @bytes: the flash's ID bytes. The first three bytes are the JEDIC ID.
+ * @len: the number of bytes of ID.
+ */
+struct spi_nor_id {
+ const u8 *bytes;
+ u8 len;
+};
+
/**
* struct flash_info - SPI NOR flash_info entry.
+ * @id: pointer to struct spi_nor_id or NULL, which means "no ID" (mostly
+ * older chips).
* @name: the name of the flash.
- * @id: the flash's ID bytes. The first three bytes are the
- * JEDIC ID. JEDEC ID zero means "no ID" (mostly older chips).
- * @id_len: the number of bytes of ID.
* @size: the size of the flash in bytes.
* @sector_size: (optional) the size listed here is what works with
* SPINOR_OP_SE, which isn't necessarily called a "sector" by
@@ -510,8 +520,7 @@ struct spi_nor_fixups {
*/
struct flash_info {
char *name;
- u8 id[SPI_NOR_MAX_ID_LEN];
- u8 id_len;
+ const struct spi_nor_id *id;
size_t size;
unsigned sector_size;
u16 page_size;
@@ -554,12 +563,18 @@ struct flash_info {
#define SPI_NOR_ID_3ITEMS(_id) ((_id) >> 16) & 0xff, SPI_NOR_ID_2ITEMS(_id)
#define SPI_NOR_ID(_jedec_id, _ext_id) \
- .id = { SPI_NOR_ID_3ITEMS(_jedec_id), SPI_NOR_ID_2ITEMS(_ext_id) }, \
- .id_len = !(_jedec_id) ? 0 : (3 + ((_ext_id) ? 2 : 0))
+ .id = &(const struct spi_nor_id){ \
+ .bytes = (const u8[]){ SPI_NOR_ID_3ITEMS(_jedec_id), \
+ SPI_NOR_ID_2ITEMS(_ext_id) }, \
+ .len = !(_jedec_id) ? 0 : (3 + ((_ext_id) ? 2 : 0)), \
+ }
#define SPI_NOR_ID6(_jedec_id, _ext_id) \
- .id = { SPI_NOR_ID_3ITEMS(_jedec_id), SPI_NOR_ID_3ITEMS(_ext_id) }, \
- .id_len = 6
+ .id = &(const struct spi_nor_id){ \
+ .bytes = (const u8[]){ SPI_NOR_ID_3ITEMS(_jedec_id), \
+ SPI_NOR_ID_3ITEMS(_ext_id) }, \
+ .len = 6, \
+ }
#define SPI_NOR_GEOMETRY(_sector_size, _n_sectors, _n_banks) \
.size = (_sector_size) * (_n_sectors), \
diff --git a/drivers/mtd/spi-nor/micron-st.c b/drivers/mtd/spi-nor/micron-st.c
index 5406a3af2ce0..229c951efcce 100644
--- a/drivers/mtd/spi-nor/micron-st.c
+++ b/drivers/mtd/spi-nor/micron-st.c
@@ -78,7 +78,7 @@ static int micron_st_nor_octal_dtr_en(struct spi_nor *nor)
return ret;
}
- if (memcmp(buf, nor->info->id, nor->info->id_len))
+ if (memcmp(buf, nor->info->id->bytes, nor->info->id->len))
return -EINVAL;
return 0;
@@ -114,7 +114,7 @@ static int micron_st_nor_octal_dtr_dis(struct spi_nor *nor)
return ret;
}
- if (memcmp(buf, nor->info->id, nor->info->id_len))
+ if (memcmp(buf, nor->info->id->bytes, nor->info->id->len))
return -EINVAL;
return 0;
diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c
index e6468569f178..d7012ab3de2c 100644
--- a/drivers/mtd/spi-nor/spansion.c
+++ b/drivers/mtd/spi-nor/spansion.c
@@ -228,7 +228,7 @@ static int cypress_nor_octal_dtr_en(struct spi_nor *nor)
return ret;
}
- if (memcmp(buf, nor->info->id, nor->info->id_len))
+ if (memcmp(buf, nor->info->id->bytes, nor->info->id->len))
return -EINVAL;
return 0;
@@ -272,7 +272,7 @@ static int cypress_nor_octal_dtr_dis(struct spi_nor *nor)
return ret;
}
- if (memcmp(buf, nor->info->id, nor->info->id_len))
+ if (memcmp(buf, nor->info->id->bytes, nor->info->id->len))
return -EINVAL;
return 0;
diff --git a/drivers/mtd/spi-nor/sysfs.c b/drivers/mtd/spi-nor/sysfs.c
index c09bb832b3b9..2dfdc555a69f 100644
--- a/drivers/mtd/spi-nor/sysfs.c
+++ b/drivers/mtd/spi-nor/sysfs.c
@@ -35,8 +35,8 @@ static ssize_t jedec_id_show(struct device *dev,
struct spi_device *spi = to_spi_device(dev);
struct spi_mem *spimem = spi_get_drvdata(spi);
struct spi_nor *nor = spi_mem_get_drvdata(spimem);
- const u8 *id = nor->info->id_len ? nor->info->id : nor->id;
- u8 id_len = nor->info->id_len ?: SPI_NOR_MAX_ID_LEN;
+ const u8 *id = nor->info->id ? nor->info->id->bytes : nor->id;
+ u8 id_len = nor->info->id ? nor->info->id->len : SPI_NOR_MAX_ID_LEN;
return sysfs_emit(buf, "%*phN\n", id_len, id);
}
@@ -78,7 +78,7 @@ static umode_t spi_nor_sysfs_is_visible(struct kobject *kobj,
if (attr == &dev_attr_manufacturer.attr && !nor->manufacturer)
return 0;
- if (attr == &dev_attr_jedec_id.attr && !nor->info->id_len && !nor->id)
+ if (attr == &dev_attr_jedec_id.attr && !nor->info->id && !nor->id)
return 0;
return 0444;
diff --git a/drivers/mtd/spi-nor/winbond.c b/drivers/mtd/spi-nor/winbond.c
index c21fed842762..7873cc394f07 100644
--- a/drivers/mtd/spi-nor/winbond.c
+++ b/drivers/mtd/spi-nor/winbond.c
@@ -121,7 +121,6 @@ static const struct flash_info winbond_nor_parts[] = {
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16)
NO_SFDP_FLAGS(SECT_4K) },
{ "w25q128", INFO(0xef4018, 0, 0, 0)
- PARSE_SFDP
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
{ "w25q256", INFO(0xef4019, 0, 64 * 1024, 512)
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
--
2.39.2
next prev parent reply other threads:[~2023-08-07 13:23 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 13:20 [PATCH 00/41] mtd: spi-nor: clean the flash_info database up Michael Walle
2023-08-07 13:20 ` [PATCH 01/41] mtd: spi-nor: remove catalyst 'flashes' Michael Walle
2023-08-08 7:21 ` kernel test robot
2023-08-08 18:34 ` kernel test robot
2023-08-07 13:20 ` [PATCH 02/41] mtd: spi-nor: remove Fujitsu MB85RS1MT support Michael Walle
2023-08-08 9:04 ` kernel test robot
2023-08-07 13:20 ` [PATCH 03/41] mtd: spi-nor: xilinx: use SPI_NOR_ID() in S3AN_INFO() Michael Walle
2023-08-07 13:20 ` [PATCH 04/41] mtd: spi-nor: xilinx: remove addr_nbytes from S3AN_INFO() Michael Walle
2023-08-07 13:20 ` [PATCH 05/41] mtd: spi-nor: convert .n_sectors to .size Michael Walle
2023-08-07 13:21 ` [PATCH 06/41] mtd: spi-nor: default page_size to 256 bytes Michael Walle
2023-08-07 13:47 ` Miquel Raynal
2023-08-07 14:29 ` Michael Walle
2023-08-07 14:33 ` Miquel Raynal
2023-08-07 13:21 ` [PATCH 07/41] mtd: spi-nor: store .n_banks in struct spi_nor_flash_parameter Michael Walle
2023-08-07 13:49 ` Miquel Raynal
2023-08-07 13:21 ` [PATCH 08/41] mtd: spi-nor: default .n_banks to 1 Michael Walle
2023-08-07 13:51 ` Miquel Raynal
2023-08-07 13:21 ` [PATCH 09/41] mtd: spi-nor: push 4k SE handling into spi_nor_select_uniform_erase() Michael Walle
2023-08-07 13:21 ` [PATCH 10/41] mtd: spi-nor: make sector_size optional Michael Walle
2023-08-07 13:21 ` [PATCH 11/41] mtd: spi-nor: drop .parse_sfdp Michael Walle
2023-08-07 13:21 ` [PATCH 12/41] mtd: spi-nor: introduce (temporary) INFO0() Michael Walle
2023-08-07 13:21 ` Michael Walle [this message]
2023-08-07 13:21 ` [PATCH 14/41] mtd: spi-nor: rename .otp_org to .otp and make it a pointer Michael Walle
2023-08-07 13:21 ` [PATCH 15/41] mtd: spi-nor: add SNOR_ID() and SNOR_OTP() Michael Walle
2023-08-07 13:21 ` [PATCH 16/41] mtd: spi-nor: remove or move flash_info comments Michael Walle
2023-08-07 13:21 ` [PATCH 17/41] mtd: spi-nor: atmel: convert flash_info to new format Michael Walle
2023-08-07 13:21 ` [PATCH 18/41] mtd: spi-nor: eon: " Michael Walle
2023-08-07 13:21 ` [PATCH 19/41] mtd: spi-nor: esmt: " Michael Walle
2023-08-07 13:21 ` [PATCH 20/41] mtd: spi-nor: everspin: " Michael Walle
2023-08-07 13:21 ` [PATCH 21/41] mtd: spi-nor: gigadevice: " Michael Walle
2023-08-07 13:21 ` [PATCH 22/41] mtd: spi-nor: intel: " Michael Walle
2023-08-07 13:21 ` [PATCH 23/41] mtd: spi-nor: issi: " Michael Walle
2023-08-07 13:21 ` [PATCH 24/41] mtd: spi-nor: macronix: " Michael Walle
2023-08-07 13:21 ` [PATCH 25/41] mtd: spi-nor: micron-st: " Michael Walle
2023-08-07 13:21 ` [PATCH 26/41] mtd: spi-nor: spansion: " Michael Walle
2023-08-07 13:21 ` [PATCH 27/41] mtd: spi-nor: sst: " Michael Walle
2023-08-07 13:21 ` [PATCH 28/41] mtd: spi-nor: winbond: " Michael Walle
2023-08-07 13:21 ` [PATCH 29/41] mtd: spi-nor: xilinx: use new macros in S3AN_INFO() Michael Walle
2023-08-07 13:21 ` [PATCH 30/41] mtd: spi-nor: xmc: convert flash_info to new format Michael Walle
2023-08-07 13:21 ` [PATCH 31/41] mtd: spi-nor: atmel: sort flash_info database Michael Walle
2023-08-07 13:21 ` [PATCH 32/41] mtd: spi-nor: eon: " Michael Walle
2023-08-07 13:21 ` [PATCH 33/41] mtd: spi-nor: gigadevice: " Michael Walle
2023-08-07 13:21 ` [PATCH 34/41] mtd: spi-nor: issi: " Michael Walle
2023-08-07 13:21 ` [PATCH 35/41] mtd: spi-nor: macronix: " Michael Walle
2023-08-07 13:21 ` [PATCH 36/41] mtd: spi-nor: micron-st: " Michael Walle
2023-08-07 13:21 ` [PATCH 37/41] mtd: spi-nor: spansion: " Michael Walle
2023-08-07 13:21 ` [PATCH 38/41] mtd: spi-nor: sst: " Michael Walle
2023-08-07 13:21 ` [PATCH 39/41] mtd: spi-nor: winbond: sort flash_info entries Michael Walle
2023-08-07 13:21 ` [PATCH 40/41] mtd: spi-nor: atmel: drop duplicate entry Michael Walle
2023-08-07 13:21 ` [PATCH 41/41] mtd: spi-nor: core: get rid of the INFOx() macros Michael Walle
2023-08-08 9:21 ` [PATCH 00/41] mtd: spi-nor: clean the flash_info database up Tudor Ambarus
2023-08-08 9:25 ` Michael Walle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230807-mtd-flash-info-db-rework-v1-13-3d3d5bef4ba4@kernel.org \
--to=mwalle@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=michael@walle.cc \
--cc=miquel.raynal@bootlin.com \
--cc=pratyush@kernel.org \
--cc=richard@nod.at \
--cc=tudor.ambarus@linaro.org \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®