patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers/flags: W25QXXDW internal erase logic fix

Browse source 
The old way of erasing was not completely moved to the new SPI access
function, thus always sending useless dummy bytes that could lead to
error (aka: erasing more than requested).

Fixes #8065

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2018-06-04 10:20:14 +02:00 committed by Anas Nashif
parent 538db99882
commit a88a98665b
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/flash/spi_flash_w25qxxdv.c
View file

@ -197,8 +197,8 @@ static inline int spi_flash_wb_erase_internal(struct device *dev,
off_t offset, size_t size)
{
struct spi_flash_data *const driver_data = dev->driver_data;
bool need_offset = true;
u8_t erase_opcode;
u32_t len;
if (offset < 0) {
return -ENOTSUP;
@ -214,19 +214,16 @@ static inline int spi_flash_wb_erase_internal(struct device *dev,
switch (size) {
case W25QXXDV_SECTOR_SIZE:
erase_opcode = W25QXXDV_CMD_SE;
len = W25QXXDV_LEN_CMD_ADDRESS;
break;
case W25QXXDV_BLOCK32K_SIZE:
erase_opcode = W25QXXDV_CMD_BE32K;
len = W25QXXDV_LEN_CMD_ADDRESS;
break;
case W25QXXDV_BLOCK_SIZE:
erase_opcode = W25QXXDV_CMD_BE;
len = W25QXXDV_LEN_CMD_ADDRESS;
break;
case CONFIG_SPI_FLASH_W25QXXDV_FLASH_SIZE:
erase_opcode = W25QXXDV_CMD_CE;
len = 1;
need_offset = false;
break;
default:
return -EIO;
@ -238,7 +235,7 @@ static inline int spi_flash_wb_erase_internal(struct device *dev,
* of each write or erase transaction.
*/
return spi_flash_wb_access(driver_data, erase_opcode,
true, offset, NULL, len, true);
need_offset, offset, NULL, 0, true);
}
static int spi_flash_wb_erase(struct device *dev, off_t offset, size_t size)