[PATCH 2/4] mtd: spi-nor: Factorize out the bank mask derivation
From: Miquel Raynal
Date: Thu Nov 19 2026 - 17:14:32 EST
The program/erase and read helpers each walk the bank range to test it
against used_banks, and do it again when ending the operations to clear
the bits. Create a helper to compute those masks.
No functional change.
Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
---
drivers/mtd/spi-nor/core.c | 60 ++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 34 deletions(-)
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index fdd6ff1e0aba..7394c9a17334 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -1152,6 +1152,20 @@ static void spi_nor_offset_to_banks(u64 bank_size, loff_t start, size_t len,
*last = DIV_ROUND_DOWN_ULL(start + len - 1, bank_size);
}
+static unsigned int spi_nor_banks_mask(struct spi_nor *nor, loff_t start,
+ size_t len)
+{
+ unsigned int mask = 0;
+ u8 first, last;
+ int bank;
+
+ spi_nor_offset_to_banks(nor->params->bank_size, start, len, &first, &last);
+ for (bank = first; bank <= last; bank++)
+ mask |= BIT(bank);
+
+ return mask;
+}
+
/* Generic helpers for internal locking and serialization */
static bool spi_nor_rww_start_io(struct spi_nor *nor)
{
@@ -1254,24 +1268,18 @@ void spi_nor_unlock_and_unprep(struct spi_nor *nor)
static bool spi_nor_rww_start_pe(struct spi_nor *nor, loff_t start, size_t len)
{
struct spi_nor_rww *rww = &nor->rww;
- unsigned int used_banks = 0;
- u8 first, last;
- int bank;
+ unsigned int banks;
guard(mutex)(&nor->lock);
if (rww->ongoing_io || rww->ongoing_rd || rww->ongoing_pe)
return false;
- spi_nor_offset_to_banks(nor->params->bank_size, start, len, &first, &last);
- for (bank = first; bank <= last; bank++) {
- if (rww->used_banks & BIT(bank))
- return false;
+ banks = spi_nor_banks_mask(nor, start, len);
+ if (rww->used_banks & banks)
+ return false;
- used_banks |= BIT(bank);
- }
-
- rww->used_banks |= used_banks;
+ rww->used_banks |= banks;
rww->ongoing_pe = true;
return true;
@@ -1280,15 +1288,10 @@ static bool spi_nor_rww_start_pe(struct spi_nor *nor, loff_t start, size_t len)
static void spi_nor_rww_end_pe(struct spi_nor *nor, loff_t start, size_t len)
{
struct spi_nor_rww *rww = &nor->rww;
- u8 first, last;
- int bank;
guard(mutex)(&nor->lock);
- spi_nor_offset_to_banks(nor->params->bank_size, start, len, &first, &last);
- for (bank = first; bank <= last; bank++)
- rww->used_banks &= ~BIT(bank);
-
+ rww->used_banks &= ~spi_nor_banks_mask(nor, start, len);
rww->ongoing_pe = false;
}
@@ -1330,24 +1333,18 @@ static void spi_nor_unlock_and_unprep_pe(struct spi_nor *nor, loff_t start, size
static bool spi_nor_rww_start_rd(struct spi_nor *nor, loff_t start, size_t len)
{
struct spi_nor_rww *rww = &nor->rww;
- unsigned int used_banks = 0;
- u8 first, last;
- int bank;
+ unsigned int banks;
guard(mutex)(&nor->lock);
if (rww->ongoing_io || rww->ongoing_rd)
return false;
- spi_nor_offset_to_banks(nor->params->bank_size, start, len, &first, &last);
- for (bank = first; bank <= last; bank++) {
- if (rww->used_banks & BIT(bank))
- return false;
+ banks = spi_nor_banks_mask(nor, start, len);
+ if (rww->used_banks & banks)
+ return false;
- used_banks |= BIT(bank);
- }
-
- rww->used_banks |= used_banks;
+ rww->used_banks |= banks;
rww->ongoing_io = true;
rww->ongoing_rd = true;
@@ -1357,15 +1354,10 @@ static bool spi_nor_rww_start_rd(struct spi_nor *nor, loff_t start, size_t len)
static void spi_nor_rww_end_rd(struct spi_nor *nor, loff_t start, size_t len)
{
struct spi_nor_rww *rww = &nor->rww;
- u8 first, last;
- int bank;
guard(mutex)(&nor->lock);
- spi_nor_offset_to_banks(nor->params->bank_size, start, len, &first, &last);
- for (bank = first; bank <= last; bank++)
- nor->rww.used_banks &= ~BIT(bank);
-
+ rww->used_banks &= ~spi_nor_banks_mask(nor, start, len);
rww->ongoing_io = false;
rww->ongoing_rd = false;
}
--
2.56.0