Skip to content

Commit e5f31d1

Browse files
committed
[nrf fromlist] modules: hal_nordic: nrfs: Fix init priority
In 7579ccc (modules: hal_nordic: nrfs: Fix initialization priority) used wrong priority as it assumed that NRFS is using IPC service init priority. Priorities are fixed now and static assert is added to ensure that NRFS init priority is higher than IPC service. Upstream PR #: 106896 Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
1 parent dfe08d9 commit e5f31d1

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,4 +280,6 @@ __weak void nrfs_backend_fatal_error_handler(enum nrfs_backend_error error_id)
280280
sys_reboot(SYS_REBOOT_WARM);
281281
}
282282

283-
SYS_INIT(ipc_channel_init, POST_KERNEL, UTIL_INC(CONFIG_NRFS_BACKEND_IPC_SERVICE_INIT_PRIO));
283+
BUILD_ASSERT(CONFIG_NRFS_BACKEND_IPC_SERVICE_INIT_PRIO > CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY);
284+
285+
SYS_INIT(ipc_channel_init, POST_KERNEL, CONFIG_NRFS_BACKEND_IPC_SERVICE_INIT_PRIO);

soc/nordic/common/mram_latency.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,4 @@ static int init_nrfs(void)
176176

177177
SYS_INIT(init_manager, PRE_KERNEL_1, 0);
178178
/* Needs to be initialized after IPC and nrfs. */
179-
SYS_INIT(init_nrfs, POST_KERNEL, UTIL_INC(UTIL_INC(CONFIG_NRFS_BACKEND_IPC_SERVICE_INIT_PRIO)));
179+
SYS_INIT(init_nrfs, POST_KERNEL, UTIL_INC(CONFIG_NRFS_BACKEND_IPC_SERVICE_INIT_PRIO));

0 commit comments

Comments
 (0)