From e184e546746e710638b459ca92405939467f3a59 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Thu, 23 Oct 2025 13:32:36 +0200 Subject: [PATCH 1/5] Revert "samples: bluetooth: align to nrfx 4.0" This reverts commit 1a32b39c6bd8781bc242f33f1bce53f493d9807f. --- .../conn_time_sync/src/controller_time_nrf54.c | 11 ++++++++++- .../iso_time_sync/src/controller_time_nrf54.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c b/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c index 0f4ea039c9f0..2d5d42e3a45b 100644 --- a/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c +++ b/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c @@ -31,7 +31,16 @@ int controller_time_init(void) uint64_t controller_time_us_get(void) { - return nrfx_grtc_syscounter_get(); + int ret; + uint64_t current_time_us; + + ret = nrfx_grtc_syscounter_get(¤t_time_us); + if (ret != NRFX_SUCCESS) { + printk("Failed obtaining system time (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM); + return 0; + } + + return current_time_us; } void controller_time_trigger_set(uint64_t timestamp_us) diff --git a/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c b/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c index b4049880b850..cef75738556d 100644 --- a/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c +++ b/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c @@ -31,7 +31,16 @@ int controller_time_init(void) uint64_t controller_time_us_get(void) { - return nrfx_grtc_syscounter_get(); + int ret; + uint64_t current_time_us; + + ret = nrfx_grtc_syscounter_get(¤t_time_us); + if (ret != NRFX_SUCCESS) { + printk("Failed obtaining system time (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM); + return 0; + } + + return current_time_us; } void controller_time_trigger_set(uint64_t timestamp_us) From e7888ffdb0097b1f7517decaec03763a11a5e421 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Thu, 23 Oct 2025 13:40:08 +0200 Subject: [PATCH 2/5] manifest: update sdk-zephyr and nrfx To check if revert of GRTC read optimizations solves CI issues. Signed-off-by: Nikodem Kastelik --- west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/west.yml b/west.yml index 9c66344d4928..a8ae540060a1 100644 --- a/west.yml +++ b/west.yml @@ -66,7 +66,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: e089ee03f61cde98c8eafdbb6f420e6d30b92886 + revision: pull/3421/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -280,7 +280,7 @@ manifest: path: nrfx groups: - nrfx - revision: 2bb95f2bf701c060f795ab20cff1f57c27c96900 + revision: pull/1001/head # West-related configuration for the nrf repository. self: From 4a72d617d75efcbdaae307106e0b06b42194098c Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Thu, 23 Oct 2025 21:18:03 +0200 Subject: [PATCH 3/5] manifest: bring sdk-zephyr back to collab-nrfx-4.0 To verify nrfy_grtc changes while keeping nrfx_grtc changes Signed-off-by: Nikodem Kastelik --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index a8ae540060a1..ca8e8b03517c 100644 --- a/west.yml +++ b/west.yml @@ -66,7 +66,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: pull/3421/head + revision: e089ee03f61cde98c8eafdbb6f420e6d30b92886 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From c6a1b35d9265c65c53e35646d13033146ca5a067 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Thu, 23 Oct 2025 21:18:46 +0200 Subject: [PATCH 4/5] Revert "Revert "samples: bluetooth: align to nrfx 4.0"" This reverts commit e184e546746e710638b459ca92405939467f3a59. --- .../conn_time_sync/src/controller_time_nrf54.c | 11 +---------- .../iso_time_sync/src/controller_time_nrf54.c | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c b/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c index 2d5d42e3a45b..0f4ea039c9f0 100644 --- a/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c +++ b/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c @@ -31,16 +31,7 @@ int controller_time_init(void) uint64_t controller_time_us_get(void) { - int ret; - uint64_t current_time_us; - - ret = nrfx_grtc_syscounter_get(¤t_time_us); - if (ret != NRFX_SUCCESS) { - printk("Failed obtaining system time (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM); - return 0; - } - - return current_time_us; + return nrfx_grtc_syscounter_get(); } void controller_time_trigger_set(uint64_t timestamp_us) diff --git a/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c b/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c index cef75738556d..b4049880b850 100644 --- a/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c +++ b/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c @@ -31,16 +31,7 @@ int controller_time_init(void) uint64_t controller_time_us_get(void) { - int ret; - uint64_t current_time_us; - - ret = nrfx_grtc_syscounter_get(¤t_time_us); - if (ret != NRFX_SUCCESS) { - printk("Failed obtaining system time (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM); - return 0; - } - - return current_time_us; + return nrfx_grtc_syscounter_get(); } void controller_time_trigger_set(uint64_t timestamp_us) From 115de9b525e9561697be29b9cc991102b52f455b Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Fri, 24 Oct 2025 08:23:50 +0200 Subject: [PATCH 5/5] manifest: update nrfx to have fix for GRTC counter masking Proper bitmask needs to be used when reading GRTC counter. Signed-off-by: Nikodem Kastelik --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index ca8e8b03517c..347772458715 100644 --- a/west.yml +++ b/west.yml @@ -280,7 +280,7 @@ manifest: path: nrfx groups: - nrfx - revision: pull/1001/head + revision: pull/1005/head # West-related configuration for the nrf repository. self: