Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: spi-nor: add SPI_NOR_HAS_LOCK flag

We can't determine this purely by manufacturer type (see commit
67b9bcd36906 ("mtd: spi-nor: fix Spansion regressions (aliased with
Winbond)")), and it's not autodetectable by anything like SFDP. So make
a new flag for it.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

+5 -2
+5 -2
drivers/mtd/spi-nor/spi-nor.c
··· 69 69 #define SPI_NOR_DUAL_READ BIT(5) /* Flash supports Dual Read */ 70 70 #define SPI_NOR_QUAD_READ BIT(6) /* Flash supports Quad Read */ 71 71 #define USE_FSR BIT(7) /* use flag status register */ 72 + #define SPI_NOR_HAS_LOCK BIT(8) /* Flash supports lock/unlock via SR */ 72 73 }; 73 74 74 75 #define JEDEC_MFR(info) ((info)->id[0]) ··· 1238 1237 1239 1238 if (JEDEC_MFR(info) == SNOR_MFR_ATMEL || 1240 1239 JEDEC_MFR(info) == SNOR_MFR_INTEL || 1241 - JEDEC_MFR(info) == SNOR_MFR_SST) { 1240 + JEDEC_MFR(info) == SNOR_MFR_SST || 1241 + info->flags & SPI_NOR_HAS_LOCK) { 1242 1242 write_enable(nor); 1243 1243 write_sr(nor, 0); 1244 1244 spi_nor_wait_till_ready(nor); ··· 1256 1254 mtd->_read = spi_nor_read; 1257 1255 1258 1256 /* NOR protection support for STmicro/Micron chips and similar */ 1259 - if (JEDEC_MFR(info) == SNOR_MFR_MICRON) { 1257 + if (JEDEC_MFR(info) == SNOR_MFR_MICRON || 1258 + info->flags & SPI_NOR_HAS_LOCK) { 1260 1259 nor->flash_lock = stm_lock; 1261 1260 nor->flash_unlock = stm_unlock; 1262 1261 nor->flash_is_locked = stm_is_locked;