michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: Improve Telink B91 Flash Write and Erase APIs

Browse source 
- Fixed from Flash to Flash write issue (added heap usage).
- Speed up Flash Erase operation (based on erase size).

Signed-off-by: Yuriy Vynnychek <yura.vynnychek@telink-semi.com>
This commit is contained in:
Yuriy Vynnychek 2022-05-24 13:40:38 +03:00 • committed by Carles Cufí
commit e36d481893
1 changed files with 59 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

59
drivers/flash/soc_flash_b91.c
View file

@ -6,12 +6,23 @@
#define DT_DRV_COMPAT telink_b91_flash_controller #define DT_DRV_COMPAT telink_b91_flash_controller
#define FLASH_SIZE DT_REG_SIZE(DT_INST(0, soc_nv_flash)) #define FLASH_SIZE DT_REG_SIZE(DT_INST(0, soc_nv_flash))
#define FLASH_ORIGIN DT_REG_ADDR(DT_INST(0, soc_nv_flash))
#include "flash.h" #include "flash.h"
#include <string.h>
#include <zephyr/device.h> #include <zephyr/device.h>
#include <zephyr/drivers/flash.h> #include <zephyr/drivers/flash.h>
/* driver definitions */
#define BLOCK_64K_SIZE (0x10000u)
#define BLOCK_64K_PAGES (BLOCK_64K_SIZE / PAGE_SIZE)
#define BLOCK_32K_SIZE (0x8000u)
#define BLOCK_32K_PAGES (BLOCK_32K_SIZE / PAGE_SIZE)
#define SECTOR_SIZE (0x1000u)
#define SECTOR_PAGES (SECTOR_SIZE / PAGE_SIZE)
/* driver data structure */ /* driver data structure */
struct flash_b91_data { struct flash_b91_data {
struct k_sem write_lock; struct k_sem write_lock;
@ -66,7 +77,7 @@ static int flash_b91_erase(const struct device *dev, off_t offset, size_t len)
return -EINVAL; return -EINVAL;
} }
/* Erase can be done only by pages */ /* erase can be done only by pages */
if (((offset % PAGE_SIZE) != 0) || ((len % PAGE_SIZE) != 0)) { if (((offset % PAGE_SIZE) != 0) || ((len % PAGE_SIZE) != 0)) {
return -EINVAL; return -EINVAL;
} }
@ -76,11 +87,30 @@ static int flash_b91_erase(const struct device *dev, off_t offset, size_t len)
return -EACCES; return -EACCES;
} }
/* erase flash page by page */ while (page_nums) {
for (int i = 0; i < page_nums; i++) { /* check for 64K erase possibility, then check for 32K and so on.. */
if ((page_nums >= BLOCK_64K_PAGES) && ((offset % BLOCK_64K_SIZE) == 0)) {
/* erase 64K block */
flash_erase_64kblock(offset);
page_nums -= BLOCK_64K_PAGES;
offset += BLOCK_64K_SIZE;
} else if ((page_nums >= BLOCK_32K_PAGES) && ((offset % BLOCK_32K_SIZE) == 0)) {
/* erase 32K block */
flash_erase_32kblock(offset);
page_nums -= BLOCK_32K_PAGES;
offset += BLOCK_32K_SIZE;
} else if ((page_nums >= SECTOR_PAGES) && ((offset % SECTOR_SIZE) == 0)) {
/* erase sector */
flash_erase_sector(offset);
page_nums -= SECTOR_PAGES;
offset += SECTOR_SIZE;
} else {
/* erase page */
flash_erase_page(offset); flash_erase_page(offset);
page_nums--;
offset += PAGE_SIZE; offset += PAGE_SIZE;
} }
}
/* release semaphore */ /* release semaphore */
k_sem_give(&dev_data->write_lock); k_sem_give(&dev_data->write_lock);
@ -92,6 +122,7 @@ static int flash_b91_erase(const struct device *dev, off_t offset, size_t len)
static int flash_b91_write(const struct device *dev, off_t offset, static int flash_b91_write(const struct device *dev, off_t offset,
const void *data, size_t len) const void *data, size_t len)
{ {
void *buf = NULL;
struct flash_b91_data *dev_data = dev->data; struct flash_b91_data *dev_data = dev->data;
/* return SUCCESS if len equals 0 (required by tests/drivers/flash) */ /* return SUCCESS if len equals 0 (required by tests/drivers/flash) */
@ -109,9 +140,31 @@ static int flash_b91_write(const struct device *dev, off_t offset,
return -EACCES; return -EACCES;
} }
/* need to store data in intermediate RAM buffer in case from flash to flash write */
if (((uint32_t)data >= FLASH_ORIGIN) &&
((uint32_t)data < (FLASH_ORIGIN + FLASH_SIZE))) {
buf = k_malloc(len);
if (buf == NULL) {
k_sem_give(&dev_data->write_lock);
return -ENOMEM;
}
/* copy Flash data to RAM */
memcpy(buf, data, len);
/* substitute data with allocated buffer */
data = buf;
}
/* write flash */ /* write flash */
flash_write_page(offset, len, (unsigned char *)data); flash_write_page(offset, len, (unsigned char *)data);
/* if ram memory is allocated for flash writing it should be free */
if (buf != NULL) {
k_free(buf);
}
/* release semaphore */ /* release semaphore */
k_sem_give(&dev_data->write_lock); k_sem_give(&dev_data->write_lock);