Skip to contentSkip to conversation

spi-nor-core: Fix small sector erase with SFDP

PATCH New Vignesh Raghavendra 2 participants 4 messages Sep 26, 2019 – Oct 22, 2019 Memory technology devices (MTD)

lore
Share & tools
lore

Vignesh Raghavendra

author maintainer
#0 lore raw

cover spi-nor-core: Fix small sector erase with SFDP

First patch improves error reporting on erase/write failures Second patch makes sure small sector is used even when SFDP is enabled and CONFIG_SPI_FLASH_USE_4K_SECTORS is set.

Jagan,

Could you please consider these patches for next -rc?

Vignesh Raghavendra (2):
mtd: spi-nor-core: Use dev_err for reporting erase/write failures
mtd: spi-nor-core: Replace MTD_SPI_NOR_USE_4K_SECTORS with
SPI_FLASH_USE_4K_SECTORS

 drivers/mtd/spi/spi-nor-core.c | 8 ++++----
 drivers/mtd/spi/spi-nor-ids.c  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
2.23.0
author maintainer
#1 lore raw

PATCH 1/2 mtd: spi-nor-core: Use dev_err for reporting erase/write failures

Use dev_err() when reporting reason for erase/write failures so that users can be made aware of the reason for failure.

---
 drivers/mtd/spi/spi-nor-core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/spi/spi-nor-core.c +3 -3
index 1acff745d1a2..22915c23edff 100644
@@ -380,12 +380,12 @@ static int spi_nor_fsr_ready(struct spi_nor *nor)
 
 	if (fsr & (FSR_E_ERR | FSR_P_ERR)) {
 		if (fsr & FSR_E_ERR)
-			dev_dbg(nor->dev, "Erase operation failed.\n");
+			dev_err(nor->dev, "Erase operation failed.\n");
 		else
-			dev_dbg(nor->dev, "Program operation failed.\n");
+			dev_err(nor->dev, "Program operation failed.\n");
 
 		if (fsr & FSR_PT_ERR)
-			dev_dbg(nor->dev,
+			dev_err(nor->dev,
 				"Attempted to modify a protected sector.\n");
 
 		nor->write_reg(nor, SPINOR_OP_CLFSR, NULL, 0);
Signature · 1 line
2.23.0
author maintainer
#2 lore raw

PATCH 2/2 mtd: spi-nor-core: Replace MTD_SPI_NOR_USE_4K_SECTORS with SPI_FLASH_USE_4K_SECTORS

In reply to Vignesh Raghavendra

U-Boot uses CONFIG_SPI_FLASH_USE_4K_SECTORS to enable 4K small sector support. Use that instead of MTD_SPI_NOR_USE_4K_SECTORS.

---
 drivers/mtd/spi/spi-nor-core.c | 2 +-
 drivers/mtd/spi/spi-nor-ids.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/spi/spi-nor-core.c +1 -1
index 22915c23edff..8412e5e8515f 100644
@@ -1745,7 +1745,7 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
 
 		erasesize = 1U << erasesize;
 		opcode = (half >> 8) & 0xff;
-#ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
+#ifdef CONFIG_SPI_FLASH_USE_4K_SECTORS
 		if (erasesize == SZ_4K) {
 			nor->erase_opcode = opcode;
 			mtd->erasesize = erasesize;
drivers/mtd/spi/spi-nor-ids.c +1 -1
index ba154709f880..2e0aebbc44aa 100644
@@ -58,7 +58,7 @@
  * All newly added entries should describe *hardware* and should use SECT_4K
  * (or SECT_4K_PMC) if hardware supports erasing 4 KiB sectors. For usage
  * scenarios excluding small sectors there is config option that can be
- * disabled: CONFIG_MTD_SPI_NOR_USE_4K_SECTORS.
+ * disabled: CONFIG_SPI_FLASH_USE_4K_SECTORS.
  * For historical (and compatibility) reasons (before we got above config) some
  * old entries may be missing 4K flag.
  */
Signature · 1 line
2.23.0
#3 lore raw

cover spi-nor-core: Fix small sector erase with SFDP

In reply to Vignesh Raghavendra
Quoted 8 lines · Vignesh Raghavendra

First patch improves error reporting on erase/write failures Second patch makes sure small sector is used even when SFDP is enabled and CONFIG_SPI_FLASH_USE_4K_SECTORS is set.

Jagan,

Could you please consider these patches for next -rc?

Applied to u-boot-spi/master