Skip to contentSkip to conversation

spi_flash: Add error message when lock operations are not supported

PATCH New Fabio Estevam 2 participants 5 messages Nov 11, 2015 – Nov 17, 2015 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 spi_flash: Add error message when lock operations are not supported

From: Fabio Estevam <[email protected]>

In the case of lock operations not being supported, we should better let the user know instead of failing silently.

---
 include/spi_flash.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
include/spi_flash.h +3 -1
index 0ae0062..ff51c50 100644
@@ -237,8 +237,10 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset,
 static inline int spi_flash_protect(struct spi_flash *flash, u32 ofs, u32 len,
 					bool prot)
 {
-	if (!flash->flash_lock)
+	if (!flash->flash_lock) {
+		printf("Protect operation not supported for this flash\n");
 		return -EOPNOTSUPP;
+	}
 
 	if (prot)
 		return flash->flash_lock(flash, ofs, len);
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/2 sf_probe: Add lock ops for SST SPI NOR flash

From: Fabio Estevam <[email protected]>

SST SPI NOR flash has the same locking programming bits as ST Micro.

Add support for it.

---
 drivers/mtd/spi/sf_internal.h | 1 +
 drivers/mtd/spi/sf_probe.c    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/spi/sf_internal.h +1 -0
index 8793f18..85c8a89 100644
@@ -64,6 +64,7 @@ enum spi_nor_option_flags {
 #define SPI_FLASH_CFI_MFR_SPANSION	0x01
 #define SPI_FLASH_CFI_MFR_STMICRO	0x20
 #define SPI_FLASH_CFI_MFR_MACRONIX	0xc2
+#define SPI_FLASH_CFI_MFR_SST		0xbf
 #define SPI_FLASH_CFI_MFR_WINBOND	0xef
 
 /* Erase commands */
drivers/mtd/spi/sf_probe.c +2 -1
index bc05d30..fea6c24 100644
@@ -184,8 +184,9 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode,
 
 	/* lock hooks are flash specific - assign them based on idcode0 */
 	switch (idcode[0]) {
-#ifdef CONFIG_SPI_FLASH_STMICRO
+#if defined CONFIG_SPI_FLASH_STMICRO || defined CONFIG_SPI_FLASH_SST
 	case SPI_FLASH_CFI_MFR_STMICRO:
+	case SPI_FLASH_CFI_MFR_SST:
 		flash->flash_lock = stm_lock;
 		flash->flash_unlock = stm_unlock;
 		flash->flash_is_locked = stm_is_locked;
Signature · 1 line
1.9.1
#3 lore raw

PATCH 2/2 sf_probe: Add lock ops for SST SPI NOR flash

In reply to Fabio Estevam
Quoted 30 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

SST SPI NOR flash has the same locking programming bits as ST Micro.

Add support for it.

---
 drivers/mtd/spi/sf_internal.h | 1 +
 drivers/mtd/spi/sf_probe.c    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/spi/sf_internal.h +1 -0
index 8793f18..85c8a89 100644
@@ -64,6 +64,7 @@ enum spi_nor_option_flags {
 #define SPI_FLASH_CFI_MFR_SPANSION     0x01
 #define SPI_FLASH_CFI_MFR_STMICRO      0x20
 #define SPI_FLASH_CFI_MFR_MACRONIX     0xc2
+#define SPI_FLASH_CFI_MFR_SST          0xbf
 #define SPI_FLASH_CFI_MFR_WINBOND      0xef
 
 /* Erase commands */
drivers/mtd/spi/sf_probe.c +0 -0
index bc05d30..fea6c24 100644
@@ -184,8 +184,9 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode,
 

drivers/mtd/spi/sf_probe.c static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode,

Quoted 10 lines
drivers/mtd/spi/sf_probe.c +2 -2
        /* lock hooks are flash specific - assign them based on idcode0 */
        switch (idcode[0]) {
-#ifdef CONFIG_SPI_FLASH_STMICRO
+#if defined CONFIG_SPI_FLASH_STMICRO || defined CONFIG_SPI_FLASH_SST
        case SPI_FLASH_CFI_MFR_STMICRO:
+       case SPI_FLASH_CFI_MFR_SST:
                flash->flash_lock = stm_lock;
                flash->flash_unlock = stm_unlock;
                flash->flash_is_locked = stm_is_locked;
--

Please add SST #ifdef on lock definitions as well.

thanks!

Signature · 1 line
Jagan | openedev.
#4 lore raw

PATCH 1/2 spi_flash: Add error message when lock operations are not supported

In reply to Fabio Estevam
Quoted 15 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

In the case of lock operations not being supported, we should better let the user know instead of failing silently.

---
 include/spi_flash.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
include/spi_flash.h +0 -0
index 0ae0062..ff51c50 100644

include/spi_flash.h static inline int spi_flash_erase(struct spi_flash *flash, u32 offset, · line 243

Quoted 8 lines
include/spi_flash.h +3 -1
@@ -237,8 +237,10 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset,
 static inline int spi_flash_protect(struct spi_flash *flash, u32 ofs, u32 len,
                                        bool prot)
 {
-       if (!flash->flash_lock)
+       if (!flash->flash_lock) {
+               printf("Protect operation not supported for this flash\n");
                return -EOPNOTSUPP;
+       }

Here it's not required, it's better to print the protected area in cmd_sf itself similar way as mtd_utils flash_lock

thanks!

Signature · 1 line
Jagan | openedev.