mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 10/41] mtd: spi-nor: make sector_size optional
Date: Mon, 07 Aug 2023 15:21:04 +0200	[thread overview]
Message-ID: <20230807-mtd-flash-info-db-rework-v1-10-3d3d5bef4ba4@kernel.org> (raw)
In-Reply-To: <20230807-mtd-flash-info-db-rework-v1-0-3d3d5bef4ba4@kernel.org>

Most of the (old, non-SFDP) flashes use a sector size of 64k. Make that
a default value so it can be optional in the flash_info database.

Signed-off-by: Michael Walle <mwalle@kernel.org>
---
 drivers/mtd/spi-nor/core.c | 6 ++++--
 drivers/mtd/spi-nor/core.h | 8 +++++---
 drivers/mtd/spi-nor/swp.c  | 6 +++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 5c6a0edafae2..cf0e25b4f9a9 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2755,7 +2755,8 @@ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor)
 {
 	struct spi_nor_flash_parameter *params = nor->params;
 	struct spi_nor_erase_map *map = &params->erase_map;
-	const u8 no_sfdp_flags = nor->info->no_sfdp_flags;
+	const struct flash_info *info = nor->info;
+	const u8 no_sfdp_flags = info->no_sfdp_flags;
 	u8 i, erase_mask;
 
 	if (no_sfdp_flags & SPI_NOR_DUAL_READ) {
@@ -2809,7 +2810,8 @@ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor)
 		i++;
 	}
 	erase_mask |= BIT(i);
-	spi_nor_set_erase_type(&map->erase_type[i], nor->info->sector_size,
+	spi_nor_set_erase_type(&map->erase_type[i],
+			       info->sector_size ?: SPI_NOR_DEFAULT_SECTOR_SIZE,
 			       SPINOR_OP_SE);
 	spi_nor_init_uniform_erase_map(map, erase_mask, params->size);
 }
diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index c90445e186c0..734aedd4d62c 100644
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -16,6 +16,7 @@
  */
 #define SPI_NOR_DEFAULT_PAGE_SIZE 256
 #define SPI_NOR_DEFAULT_N_BANKS 1
+#define SPI_NOR_DEFAULT_SECTOR_SIZE SZ_64K
 
 /* Standard SPI NOR flash operations. */
 #define SPI_NOR_READID_OP(naddr, ndummy, buf, len)			\
@@ -452,8 +453,9 @@ struct spi_nor_fixups {
  *                  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:    the size listed here is what works with SPINOR_OP_SE, which
- *                  isn't necessarily called a "sector" by the vendor.
+ * @sector_size:    (optional) the size listed here is what works with
+ *                  SPINOR_OP_SE, which isn't necessarily called a "sector" by
+ *                  the vendor. Defaults to 64k.
  * @n_banks:        (optional) the number of banks. Defaults to 1.
  * @page_size:      (optional) the flash's page size. Defaults to 256.
  * @addr_nbytes:    number of address bytes to send.
@@ -565,7 +567,7 @@ struct flash_info {
 
 #define SPI_NOR_GEOMETRY(_sector_size, _n_sectors, _n_banks)		\
 	.size = (_sector_size) * (_n_sectors),				\
-	.sector_size = (_sector_size),					\
+	.sector_size = (_sector_size == SZ_64K) ? 0 : (_sector_size),	\
 	.n_banks = (_n_banks)
 
 /* Used when the "_ext_id" is two bytes at most */
diff --git a/drivers/mtd/spi-nor/swp.c b/drivers/mtd/spi-nor/swp.c
index 40bf52867095..585813310ee1 100644
--- a/drivers/mtd/spi-nor/swp.c
+++ b/drivers/mtd/spi-nor/swp.c
@@ -34,7 +34,11 @@ static u8 spi_nor_get_sr_tb_mask(struct spi_nor *nor)
 static u64 spi_nor_get_min_prot_length_sr(struct spi_nor *nor)
 {
 	unsigned int bp_slots, bp_slots_needed;
-	unsigned int sector_size = nor->info->sector_size;
+	/*
+	 * sector_size will eventually be replaced with the max erase size of
+	 * the flash. For now, we need to have that ugly default.
+	 */
+	unsigned int sector_size = nor->info->sector_size ?: SPI_NOR_DEFAULT_SECTOR_SIZE;
 	u64 n_sectors = div_u64(nor->params->size, sector_size);
 	u8 mask = spi_nor_get_sr_bp_mask(nor);
 

-- 
2.39.2


  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 ` Michael Walle [this message]
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 ` [PATCH 13/41] mtd: spi-nor: move the .id and .id_len into an own structure Michael Walle
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-10-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®