@@ -519,12 +519,18 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len)
struct mtd_info *mtd = &nor->mtd;
int status_old, status_new;
u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
+ u8 wr_mask = mask;
u8 shift = ffs(mask) - 1, pow, val;
loff_t lock_len;
- bool can_be_top = true, can_be_bottom = nor->flags & SNOR_F_HAS_SR_TB;
+ bool can_be_top = true, can_be_bottom = false;
bool use_top;
int ret;
+ if (nor->flags & SNOR_F_HAS_SR_TB) {
+ wr_mask |= SR_TB;
+ can_be_bottom = true;
+ }
+
status_old = read_sr(nor);
if (status_old < 0)
return status_old;
@@ -571,7 +577,7 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len)
if (!(val & mask))
return -EINVAL;
- status_new = (status_old & ~mask & ~SR_TB) | val;
+ status_new = (status_old & ~wr_mask) | val;
/* Disallow further writes if WP pin is asserted */
status_new |= SR_SRWD;
@@ -591,7 +597,21 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len)
ret = write_sr(nor, status_new);
if (ret)
return ret;
- return spi_nor_wait_till_ready(nor);
+ ret = spi_nor_wait_till_ready(nor);
+ if (ret)
+ return ret;
+
+ ret = read_sr(nor);
+ if (ret < 0)
+ return ret;
+
+ if ((ret ^ status_new) & (wr_mask | SR_SRWD)) {
+ dev_dbg(nor->dev, "read-back failure: %#x, %#x\n",
+ status_new, ret);
+ return -EIO;
+ }
+
+ return 0;
}
/*
@@ -604,12 +624,18 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
struct mtd_info *mtd = &nor->mtd;
int status_old, status_new;
u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
+ u8 wr_mask = mask;
u8 shift = ffs(mask) - 1, pow, val;
loff_t lock_len;
- bool can_be_top = true, can_be_bottom = nor->flags & SNOR_F_HAS_SR_TB;
+ bool can_be_top = true, can_be_bottom = false;
bool use_top;
int ret;
+ if (nor->flags & SNOR_F_HAS_SR_TB) {
+ wr_mask |= SR_TB;
+ can_be_bottom = true;
+ }
+
status_old = read_sr(nor);
if (status_old < 0)
return status_old;
@@ -658,7 +684,7 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
return -EINVAL;
}
- status_new = (status_old & ~mask & ~SR_TB) | val;
+ status_new = (status_old & ~wr_mask) | val;
/* Don't protect status register if we're fully unlocked */
if (lock_len == 0)
@@ -679,7 +705,21 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
ret = write_sr(nor, status_new);
if (ret)
return ret;
- return spi_nor_wait_till_ready(nor);
+ ret = spi_nor_wait_till_ready(nor);
+ if (ret)
+ return ret;
+
+ ret = read_sr(nor);
+ if (ret < 0)
+ return ret;
+
+ if ((ret ^ status_new) & (wr_mask | SR_SRWD)) {
+ dev_dbg(nor->dev, "read-back failure: %#x, %#x\n",
+ status_new, ret);
+ return -EIO;
+ }
+
+ return 0;
}
/*
When programming the Status Register for performing write protect, it's important to know the result of the operation (i.e., success or failure). Particularly, it's possible to fail when the hardware write protect pin (WP#) is asserted, potentially disallowing writes to the status register. Previously, even if we weren't able to update the status register, ioctl(MEMLOCK) and ioctl(MEMUNLOCK) would return success. Let's add a read-back check, to make sure that the status register was updated appropriately. If the relevant bits weren't updated, then return -EIO. Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- drivers/mtd/spi-nor/spi-nor.c | 52 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 6 deletions(-)