sf: Drop spl_flash_get_sw_write_prot

The get_sw_write_prot API is used to get the write-protected
bits of flash by reading the status register and other wards
it's API for reading register bits.

1) This kind of requirement can be achieved using existing
   flash operations and flash locking API calls instead of
   making a separate flash API.
2) Technically there is no real hardware user for this API to
   use in the source tree.
3) Having a flash operations API for simple register read bits
   also make difficult to extend the flash operations.
4) Instead of touching generic code, it is possible to have
   this functionality inside spinor operations in the form of
   flash hooks or fixups for associated flash chips.

Considering all these points, this patch drops the get_sw_write_prot
and associated code bases.

Cc: Simon Glass <[email protected]>
Cc: Vignesh R <[email protected]>
Signed-off-by: Jagan Teki <[email protected]>

diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index de369aa001dd566a8061a1fe6f00456d9dafd4d9..9ce2ecb99ac2679347499c15aca27b11170304ee 100644 (file)
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -30,15 +30,6 @@ int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len)
        return log_ret(sf_get_ops(dev)->erase(dev, offset, len));
 }
 
-int spl_flash_get_sw_write_prot(struct udevice *dev)
-{
-       struct dm_spi_flash_ops *ops = sf_get_ops(dev);
-
-       if (!ops->get_sw_write_prot)
-               return -ENOSYS;
-       return log_ret(ops->get_sw_write_prot(dev));
-}
-
 /*
  * TODO([email protected]): This is an old-style function. We should remove
  * it when all SPI flash drivers use dm

diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 3bcb7a22df3996248369684f40aa332545abfae0..dabd40a4cc1ed10ff720dbde03c624d77a81c78b 100644 (file)
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -75,10 +75,6 @@ extern const struct flash_info spi_nor_ids[];
 #define JEDEC_MFR(info)        ((info)->id[0])
 #define JEDEC_ID(info)         (((info)->id[1]) << 8 | ((info)->id[2]))
 
-/* Get software write-protect value (BP bits) */
-int spi_flash_cmd_get_sw_write_prot(struct spi_flash *flash);
-
-
 #if CONFIG_IS_ENABLED(SPI_FLASH_MTD)
 int spi_flash_mtd_register(struct spi_flash *flash);
 void spi_flash_mtd_unregister(void);

diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index ee7cbaf3f60f8631e6935d094976852fea3002cf..4e9973bb62a0475219eda4a4265a221cbeaa6c4b 100644 (file)
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -130,13 +130,6 @@ static int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len)
        return mtd->_erase(mtd, &instr);
 }
 
-static int spi_flash_std_get_sw_write_prot(struct udevice *dev)
-{
-       struct spi_flash *flash = dev_get_uclass_priv(dev);
-
-       return spi_flash_cmd_get_sw_write_prot(flash);
-}
-
 int spi_flash_std_probe(struct udevice *dev)
 {
        struct spi_slave *slave = dev_get_parent_priv(dev);
@@ -162,7 +155,6 @@ static const struct dm_spi_flash_ops spi_flash_std_ops = {
        .read = spi_flash_std_read,
        .write = spi_flash_std_write,
        .erase = spi_flash_std_erase,
-       .get_sw_write_prot = spi_flash_std_get_sw_write_prot,
 };
 
 static const struct udevice_id spi_flash_std_ids[] = {

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 56b44ebbe8d0649ec8dc952b0c58c995fb4015d3..310d477f004107a1f73607b273806b7364cb1ea3 100644 (file)
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -2640,14 +2640,3 @@ int spi_nor_scan(struct spi_nor *nor)
 
        return 0;
 }
-
-/* U-Boot specific functions, need to extend MTD to support these */
-int spi_flash_cmd_get_sw_write_prot(struct spi_nor *nor)
-{
-       int sr = read_sr(nor);
-
-       if (sr < 0)
-               return sr;
-
-       return (sr >> 2) & 7;
-}

diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 55f86d51555c68a8390d696bde7238729cbdbb10..9f676c649d88641880e838657d63d0136c2b4b3f 100644 (file)
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -798,9 +798,3 @@ int spi_nor_scan(struct spi_nor *nor)
 
        return 0;
 }
-
-/* U-Boot specific functions, need to extend MTD to support these */
-int spi_flash_cmd_get_sw_write_prot(struct spi_nor *nor)
-{
-       return -ENOTSUPP;
-}

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 0b23f57a71b34f502f8801dcaa11d6f3158e2fd2..d9b2af856c08feb18adda8934452483800f83bb4 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -34,19 +34,6 @@ struct dm_spi_flash_ops {
        int (*write)(struct udevice *dev, u32 offset, size_t len,
                     const void *buf);
        int (*erase)(struct udevice *dev, u32 offset, size_t len);
-       /**
-        * get_sw_write_prot() - Check state of software write-protect feature
-        *
-        * SPI flash chips can lock a region of the flash defined by a
-        * 'protected area'. This function checks if this protected area is
-        * defined.
-        *
-        * @dev:        SPI flash device
-        * @return 0 if no region is write-protected, 1 if a region is
-        *      write-protected, -ENOSYS if the driver does not implement this,
-        *      other -ve value on error
-        */
-       int (*get_sw_write_prot)(struct udevice *dev);
 };
 
 /* Access the serial operations for a device */
@@ -88,20 +75,6 @@ int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len,
  */
 int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len);
 
-/**
- * spl_flash_get_sw_write_prot() - Check state of software write-protect feature
- *
- * SPI flash chips can lock a region of the flash defined by a
- * 'protected area'. This function checks if this protected area is
- * defined.
- *
- * @dev:       SPI flash device
- * @return 0 if no region is write-protected, 1 if a region is
- *     write-protected, -ENOSYS if the driver does not implement this,
- *     other -ve value on error
- */
-int spl_flash_get_sw_write_prot(struct udevice *dev);
-
 /**
  * spi_flash_std_probe() - Probe a SPI flash device
  *

diff --git a/test/dm/sf.c b/test/dm/sf.c
index 55b8d1545fc59c1328a70bdf2f8a1e5098581265..9e7dead684d34a0158aa3b0fde522fb389b8866a 100644 (file)
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -20,7 +20,7 @@
 /* Simple test of sandbox SPI flash */
 static int dm_test_spi_flash(struct unit_test_state *uts)
 {
-       struct udevice *dev, *emul;
+       struct udevice *dev;
        int full_size = 0x200000;
        int size = 0x10000;
        u8 *src, *dst;
@@ -50,14 +50,6 @@ static int dm_test_spi_flash(struct unit_test_state *uts)
        ut_assertok(spi_flash_read_dm(dev, 0, size, dst));
        ut_asserteq_mem(src, dst, size);
 
-       /* Try the write-protect stuff */
-       ut_assertok(uclass_first_device_err(UCLASS_SPI_EMUL, &emul));
-       ut_asserteq(0, spl_flash_get_sw_write_prot(dev));
-       sandbox_sf_set_block_protect(emul, 1);
-       ut_asserteq(1, spl_flash_get_sw_write_prot(dev));
-       sandbox_sf_set_block_protect(emul, 0);
-       ut_asserteq(0, spl_flash_get_sw_write_prot(dev));
-
        /* Check mapping */
        ut_assertok(dm_spi_get_mmap(dev, &map_base, &map_size, &offset));
        ut_asserteq(0x1000, map_base);