michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: nrf_qspi_nor: improve diagnostics/behavior of erase

Browse source 
Erase can only succeed if the address is sector-aligned, and the span
to erase is an integer multiple of the sector size.  Validate this
before starting the process of erasing things.

Also reduce the check that the affected region is within the device
span to its minimal equivalent conditions.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-05-28 11:15:11 -05:00 • committed by Maureen Helm
commit c11ef527b1
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
drivers/flash/nrf_qspi_nor.c
View file

@ -311,8 +311,13 @@ static int qspi_send_cmd(struct device *dev, const struct qspi_cmd *cmd)
/* QSPI erase */
static int qspi_erase(struct device *dev, uint32_t addr, uint32_t size)
{
/* Check input parameters */
if (!size) {
/* address must be sector-aligned */
if ((addr % QSPI_SECTOR_SIZE) != 0) {
return -EINVAL;
}
/* size must be a non-zero multiple of sectors */
if ((size == 0) || (size % QSPI_SECTOR_SIZE) != 0) {
return -EINVAL;
}
@ -512,11 +517,9 @@ static int qspi_nor_read(struct device *dev, off_t addr, void *dest,
const struct qspi_nor_config *params = dev->config_info;
/* should be between 0 and flash size */
if (addr >= params->size ||
addr < 0 ||
size > params->size ||
(addr) + size > params->size) {
/* affected region should be within device */
if (addr < 0 ||
(addr + size) > params->size) {
LOG_ERR("read error: address or size "
"exceeds expected values."
"Addr: 0x%lx size %zu", (long)addr, size);
@ -563,11 +566,9 @@ static int qspi_nor_write(struct device *dev, off_t addr, const void *src,
return -EACCES;
}
/* should be between 0 and flash size */
if (addr >= params->size ||
addr < 0 ||
size > params->size ||
(addr) + size > params->size) {
/* affected region should be within device */
if (addr < 0 ||
(addr + size) > params->size) {
LOG_ERR("write error: address or size "
"exceeds expected values."
"Addr: 0x%lx size %zu", (long)addr, size);
@ -594,11 +595,9 @@ static int qspi_nor_erase(struct device *dev, off_t addr, size_t size)
return -EACCES;
}
/* should be between 0 and flash size */
if (addr >= params->size ||
addr < 0 ||
size > params->size ||
(addr) + size > params->size) {
/* affected region should be within device */
if (addr < 0 ||
(addr + size) > params->size) {
LOG_ERR("erase error: address or size "
"exceeds expected values."
"Addr: 0x%lx size %zu", (long)addr, size);