adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 8

drivers: misc: nordic_vpr_launcher: fix address handling

Browse source 
When CONFIG_XIP=y, execution address may come from a partition, so its
absolute address is needed. Fix code by using VPR_ADDR() macro in all
cases: execution and source addresses.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This commit is contained in:
Gerard Marull-Paretas 2024-02-26 17:41:58 +01:00 committed by Carles Cufí
parent 4a72cb16cf
commit f0b975032a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
View file

@ -45,8 +45,8 @@ static int nordic_vpr_launcher_init(const struct device *dev)
return 0;
}
/* obtain VPR source address either from memory or partition */
#define VPR_SRC_ADDR(node_id) \
/* obtain VPR address either from memory or partition */
#define VPR_ADDR(node_id) \
(DT_REG_ADDR(node_id) + \
COND_CODE_0(DT_FIXED_PARTITION_EXISTS(node_id), (0), (DT_REG_ADDR(DT_GPARENT(node_id)))))
@ -59,9 +59,9 @@ static int nordic_vpr_launcher_init(const struct device *dev)
\
static const struct nordic_vpr_launcher_config config##inst = { \
.vpr = (NRF_VPR_Type *)DT_INST_REG_ADDR(inst), \
.exec_addr = DT_REG_ADDR(DT_INST_PHANDLE(inst, execution_memory)), \
.exec_addr = VPR_ADDR(DT_INST_PHANDLE(inst, execution_memory)), \
COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, source_memory), \
(.src_addr = VPR_SRC_ADDR(DT_INST_PHANDLE(inst, source_memory)), \
(.src_addr = VPR_ADDR(DT_INST_PHANDLE(inst, source_memory)), \
.src_size = DT_REG_SIZE(DT_INST_PHANDLE(inst, source_memory)),), \
())}; \
\