Skip to content

[Backport v3.7.99-ncs3-branch] [nrf noup] mbox: Temporary workaround for SCFW not capturing some ic-… #2568

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

Merged
merged 5 commits into from
Mar 17, 2025
Merged

[Backport v3.7.99-ncs3-branch] [nrf noup] mbox: Temporary workaround for SCFW not capturing some ic-… #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4925bbb
[nrf fromlist] mbox: temporary workaround for missing ic-msg
meijemac Feb 28, 2025
6882c3d
Revert "[nrf noup] moduled: hal_nordic: require nrf-regtool"
karstenkoenig Feb 5, 2025
e997d70
[nrf fromtree] modules: hal_nordic: bump regtool to 8.1.2
karstenkoenig Feb 3, 2025
5c0f3eb
[nrf noup] moduled: hal_nordic: require nrf-regtool
gmarull Oct 30, 2024
f434ebb
[nrf fromtree] kernel: timeout: ensure next timeout is set when abort…
kwd-doodling Jan 2, 2025
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
6 changes: 6 additions & 0 deletions drivers/mbox/mbox_nrf_vevif_task_tx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@

#define DT_DRV_COMPAT nordic_nrf_vevif_task_tx

#include <zephyr/kernel.h>
#include <zephyr/devicetree.h>
#include <zephyr/drivers/mbox.h>

#include <haly/nrfy_vpr.h>

#define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
#define VEVIF_RETRIGGER_DELAY 12

Check notice on line 16 in drivers/mbox/mbox_nrf_vevif_task_tx.c

View workflow job for this annotation

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

You may want to run clang-format on this change 

drivers/mbox/mbox_nrf_vevif_task_tx.c:16 
-#define VEVIF_RETRIGGER_DELAY	12
+#define VEVIF_RETRIGGER_DELAY 12
struct mbox_vevif_task_tx_conf {
NRF_VPR_Type *vpr;
uint32_t tasks_mask;
Expand Down Expand Up @@ -39,6 +41,10 @@

nrfy_vpr_task_trigger(config->vpr, nrfy_vpr_trigger_task_get(id));

k_busy_wait(VEVIF_RETRIGGER_DELAY);

nrfy_vpr_task_trigger(config->vpr, nrfy_vpr_trigger_task_get(id));

return 0;
}

Expand Down
5 changes: 5 additions & 0 deletions kernel/timeout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,13 @@ int z_abort_timeout(struct _timeout *to)

K_SPINLOCK(&timeout_lock) {
if (sys_dnode_is_linked(&to->node)) {
bool is_first = (to == first());

remove_timeout(to);
ret = 0;
if (is_first) {
sys_clock_set_timeout(next_timeout(), false);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/hal_nordic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
list(APPEND nrf_regtool_components GENERATE:BICR)
endif()
if(DEFINED nrf_regtool_components)
find_package(nrf-regtool 8.0.0 REQUIRED
find_package(nrf-regtool 8.1.2 REQUIRED
COMPONENTS ${nrf_regtool_components}
PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
NO_CMAKE_PATH
Expand Down
Loading