Skip to content

drivers: flash: nrf: DFU PM removeal fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Adam-Maciuga wants to merge 1 commit into
base: main
Choose a base branch
from
Open

drivers: flash: nrf: DFU PM removeal fix #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions drivers/flash/soc_flash_nrf_rram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@
#else
#define RRAM_START DT_REG_ADDR(RRAM)
#endif
#define RRAM_SIZE DT_REG_SIZE(RRAM)
#define RRAM_SIZE DT_REG_SIZE(RRAM)

#define PAGE_SIZE DT_PROP(RRAM, erase_block_size)
#define PAGE_COUNT ((RRAM_SIZE) / (PAGE_SIZE))

#define WRITE_BLOCK_SIZE_FROM_DT DT_PROP(RRAM, write_block_size)
#define ERASE_VALUE 0xFF

#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
#if CONFIG_TRUSTED_EXECUTION_NONSECURE
#include <soc_secure.h>
#if USE_PARTITION_MANAGER
#include <pm_config.h>
#endif /* USE_PARTITION_MANAGER */
#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */

#ifdef CONFIG_MULTITHREADING
Expand Down Expand Up @@ -297,10 +299,16 @@
}
addr += RRAM_START;

#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
#if CONFIG_TRUSTED_EXECUTION_NONSECURE
#if USE_PARTITION_MANAGER && PM_APP_ADDRESS
if (addr < PM_APP_ADDRESS) {
return soc_secure_mem_read(data, (void *)addr, len);
}
#elif !USE_PARTITION_MANAGER && DT_NODE_EXISTS(DT_NODELABEL(slot0_ns_partition))
if ((uintptr_t)addr < DT_REG_ADDR(DT_NODELABEL(slot0_ns_partition))) {
return soc_secure_mem_read(data, (void *)addr, len);
}
#endif
#endif

memcpy(data, (void *)addr, len);
Expand All @@ -320,7 +328,6 @@
return -EINVAL;
}


return nrf_write(addr, data, len);
}

Expand Down Expand Up @@ -351,9 +358,10 @@
static const struct flash_parameters parameters = {
.write_block_size = WRITE_LINE_SIZE,
.erase_value = ERASE_VALUE,
.caps = {
.no_explicit_erase = true,
},
.caps =
{

Check failure on line 362 in drivers/flash/soc_flash_nrf_rram.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

OPEN_BRACE 

drivers/flash/soc_flash_nrf_rram.c:362  that open brace { should be on the previous line
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.
.no_explicit_erase = true,
},
};

return &parameters;
Expand Down
Loading