Unverified Commit 40b7d5cc authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

mtd: spi-nor: Check all the bits written, not just the BP ones 



Check that all the bits written in the write_sr_and_check() method
match the status_new received value. Failing to write the other bits
is dangerous too, extend the check.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent b0db77f5

drivers/mtd/spi-nor/spi-nor.c

+4 −5
Original line number Diff line number Diff line
@@ -960,8 +960,7 @@ static int spi_nor_write_sr(struct spi_nor *nor, const u8 *sr, size_t len) 
}



/* Write status register and ensure bits in mask match written values */

static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new,

				      u8 mask)

static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new)

{

	int ret;
@@ -975,7 +974,7 @@ static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new, 
	if (ret)

		return ret;



	return ((nor->bouncebuf[0] & mask) != (status_new & mask)) ? -EIO : 0;

	return (nor->bouncebuf[0] != status_new) ? -EIO : 0;

}



/**
@@ -1774,7 +1773,7 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) 
	if ((status_new & mask) < (status_old & mask))

		return -EINVAL;



	return spi_nor_write_sr_and_check(nor, status_new, mask);

	return spi_nor_write_sr_and_check(nor, status_new);

}



/*
@@ -1859,7 +1858,7 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) 
	if ((status_new & mask) > (status_old & mask))

		return -EINVAL;



	return spi_nor_write_sr_and_check(nor, status_new, mask);

	return spi_nor_write_sr_and_check(nor, status_new);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE