michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/flash/soc_flash_lpc: integrate protection service into write/erase

Browse source 
Flash write protection services were integrated into erase and write
procedures. This is step required for fixing following issue:
Multi-threading flash access is not supported by
flash_write_protection_set().

flash_write_protection_set() will be deprecated.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2021-03-12 11:01:31 +01:00 • committed by Anas Nashif
commit 8e3eb3c740
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/flash/soc_flash_lpc.c
View file

@ -61,7 +61,7 @@ static int flash_lpc_erase(const struct device *dev, off_t offset, size_t len)
uint32_t stop; uint32_t stop;
uint32_t page_size; uint32_t page_size;
if (k_sem_take(&priv->write_lock, K_NO_WAIT)) { if (k_sem_take(&priv->write_lock, K_FOREVER)) {
return -EACCES; return -EACCES;
} }
@ -100,7 +100,7 @@ static int flash_lpc_write(const struct device *dev, off_t offset,
status_t rc; status_t rc;
unsigned int key; unsigned int key;
if (k_sem_take(&priv->write_lock, K_NO_WAIT)) { if (k_sem_take(&priv->write_lock, K_FOREVER)) {
return -EACCES; return -EACCES;
} }
@ -119,16 +119,10 @@ static int flash_lpc_write(const struct device *dev, off_t offset,
static int flash_lpc_write_protection(const struct device *dev, bool enable) static int flash_lpc_write_protection(const struct device *dev, bool enable)
{ {
struct flash_priv *priv = dev->data; ARG_UNUSED(dev);
int rc = 0; ARG_UNUSED(enable);
if (enable) { return 0;
rc = k_sem_take(&priv->write_lock, K_FOREVER);
} else {
k_sem_give(&priv->write_lock);
}
return rc;
} }
#if defined(CONFIG_FLASH_PAGE_LAYOUT) #if defined(CONFIG_FLASH_PAGE_LAYOUT)
@ -172,7 +166,7 @@ static int flash_lpc_init(const struct device *dev)
{ {
struct flash_priv *priv = dev->data; struct flash_priv *priv = dev->data;
k_sem_init(&priv->write_lock, 0, 1); k_sem_init(&priv->write_lock, 1, 1);
priv->pflash_block_base = DT_REG_ADDR(SOC_NV_FLASH_NODE); priv->pflash_block_base = DT_REG_ADDR(SOC_NV_FLASH_NODE);