manifest: Update sdk-zephyr and nrfxlib revision and align to new API

e-rk · rlubos · commit 333818a59b5a · 2024-11-21T11:34:45.000+01:00
Updated the hal_nordic revision and adjusted the code base to use
multi-instance DPPI API.
Certain applications have to explicitly enable nrfx_dppi and nrfx_ppib
support with Kconfigs.
Updated the nrfxlib revision to add the softdevice_controller include
paths globally.

Signed-off-by: Rafał Kuźnia &lt;rafal.kuznia@nordicsemi.no&gt;
diff --git a/applications/nrf5340_audio/src/modules/audio_sync_timer.c b/applications/nrf5340_audio/src/modules/audio_sync_timer.c
@@ -144,6 +144,7 @@ static void rtc_isr_handler(nrfx_rtc_int_type_t int_type)
 static int audio_sync_timer_init(void)
 {
 	nrfx_err_t ret;
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
 
 	ret = nrfx_timer_init(&audio_sync_hf_timer_instance, &cfg, unused_timer_isr_handler);
 	if (ret - NRFX_ERROR_BASE_NUM) {
@@ -161,7 +162,7 @@ static int audio_sync_timer_init(void)
 	nrfx_rtc_overflow_enable(&audio_sync_lf_timer_instance, true);
 
 	/* Initialize capturing of I2S frame start event timestamps */
-	ret = nrfx_dppi_channel_alloc(&dppi_channel_i2s_frame_start);
+	ret = nrfx_dppi_channel_alloc(&dppi, &dppi_channel_i2s_frame_start);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel alloc error (I2S frame start): %d", ret);
 		return -ENOMEM;
@@ -177,14 +178,14 @@ static int audio_sync_timer_init(void)
 			      dppi_channel_i2s_frame_start);
 
 	nrf_i2s_publish_set(NRF_I2S0, NRF_I2S_EVENT_FRAMESTART, dppi_channel_i2s_frame_start);
-	ret = nrfx_dppi_channel_enable(dppi_channel_i2s_frame_start);
+	ret = nrfx_dppi_channel_enable(&dppi, dppi_channel_i2s_frame_start);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel enable error (I2S frame start): %d", ret);
 		return -EIO;
 	}
 
 	/* Initialize capturing of current timestamps */
-	ret = nrfx_dppi_channel_alloc(&dppi_channel_curr_time_capture);
+	ret = nrfx_dppi_channel_alloc(&dppi, &dppi_channel_curr_time_capture);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel alloc error (I2S frame start) - Return value: %d", ret);
 		return -ENOMEM;
@@ -200,14 +201,14 @@ static int audio_sync_timer_init(void)
 
 	nrf_egu_publish_set(NRF_EGU0, NRF_EGU_EVENT_TRIGGERED0, dppi_channel_curr_time_capture);
 
-	ret = nrfx_dppi_channel_enable(dppi_channel_curr_time_capture);
+	ret = nrfx_dppi_channel_enable(&dppi, dppi_channel_curr_time_capture);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel enable error (I2S frame start) - Return value: %d", ret);
 		return -EIO;
 	}
 
 	/* Initialize functionality for synchronization between APP and NET core */
-	ret = nrfx_dppi_channel_alloc(&dppi_channel_rtc_start);
+	ret = nrfx_dppi_channel_alloc(&dppi, &dppi_channel_rtc_start);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel alloc error (timer clear): %d", ret);
 		return -ENOMEM;
@@ -222,14 +223,14 @@ static int audio_sync_timer_init(void)
 				   NRF_IPC_CHANNEL_4);
 	nrf_ipc_publish_set(NRF_IPC, AUDIO_SYNC_TIMER_NET_APP_IPC_EVT, dppi_channel_rtc_start);
 
-	ret = nrfx_dppi_channel_enable(dppi_channel_rtc_start);
+	ret = nrfx_dppi_channel_enable(&dppi, dppi_channel_rtc_start);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel enable error (timer clear): %d", ret);
 		return -EIO;
 	}
 
 	/* Initialize functionality for synchronization between RTC and TIMER */
-	ret = nrfx_dppi_channel_alloc(&dppi_channel_timer_sync_with_rtc);
+	ret = nrfx_dppi_channel_alloc(&dppi, &dppi_channel_timer_sync_with_rtc);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel alloc error (timer clear): %d", ret);
 		return -ENOMEM;
@@ -242,7 +243,7 @@ static int audio_sync_timer_init(void)
 
 	nrfx_rtc_tick_enable(&audio_sync_lf_timer_instance, false);
 
-	ret = nrfx_dppi_channel_enable(dppi_channel_timer_sync_with_rtc);
+	ret = nrfx_dppi_channel_enable(&dppi, dppi_channel_timer_sync_with_rtc);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel enable error (timer clear): %d", ret);
 		return -EIO;
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -6,4 +6,4 @@
 
 CONFIG_NRFX_TIMER0=y
 CONFIG_NRFX_RTC0=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -6,4 +6,4 @@
 
 CONFIG_NRFX_TIMER0=y
 CONFIG_NRFX_RTC0=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
 CONFIG_BT_RX_STACK_SIZE=2048
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
 CONFIG_BT_RX_STACK_SIZE=2048
diff --git a/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet.conf
@@ -9,6 +9,6 @@ CONFIG_IPC_SERVICE=y
 CONFIG_IPC_SERVICE_BACKEND_RPMSG=y
 CONFIG_MBOX=y
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
 
 CONFIG_HEAP_MEM_POOL_SIZE=4096
diff --git a/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.conf b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.conf
@@ -8,7 +8,7 @@ CONFIG_IPC_SERVICE=y
 CONFIG_IPC_SERVICE_BACKEND_RPMSG=y
 CONFIG_MBOX=y
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
 
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 
diff --git a/samples/bluetooth/direct_test_mode/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/direct_test_mode/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -12,4 +12,4 @@ CONFIG_NRFX_TIMER2=n
 # Use necessary peripherals
 CONFIG_NRFX_TIMER20=y
 CONFIG_NRFX_TIMER10=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
diff --git a/samples/bluetooth/direct_test_mode/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/bluetooth/direct_test_mode/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -12,4 +12,4 @@ CONFIG_NRFX_TIMER2=n
 # Use necessary peripherals
 CONFIG_NRFX_TIMER20=y
 CONFIG_NRFX_TIMER10=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -6,4 +6,4 @@
 
 CONFIG_NRFX_TIMER0=y
 CONFIG_NRFX_RTC0=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -6,4 +6,4 @@
 
 CONFIG_NRFX_TIMER0=y
 CONFIG_NRFX_RTC0=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
 CONFIG_BT_RX_STACK_SIZE=2048
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
 CONFIG_BT_RX_STACK_SIZE=2048
diff --git a/samples/peripheral/802154_phy_test/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/peripheral/802154_phy_test/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,7 +11,8 @@ CONFIG_PTT_CACHE_MGMT=n
 
 # nrfx drivers configuration:
 CONFIG_NRFX_TIMER20=y  # enable TIMER2
-CONFIG_NRFX_DPPI=y  # enable DPPIC
+# enable DPPIC
+CONFIG_NRFX_GPPI=y
 
 # Set temperature sensor update period in ms
 CONFIG_NRF_802154_TEMPERATURE_UPDATE_PERIOD=10000
diff --git a/samples/peripheral/radio_test/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/peripheral/radio_test/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -9,4 +9,4 @@ CONFIG_NRFX_TIMER0=n
 
 # Enable the necessary drivers
 CONFIG_NRFX_TIMER10=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
diff --git a/samples/peripheral/radio_test/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/peripheral/radio_test/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -9,4 +9,4 @@ CONFIG_NRFX_TIMER0=n
 
 # Enable the necessary drivers
 CONFIG_NRFX_TIMER10=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_GPPI=y
diff --git a/subsys/debug/cpu_load/cpu_load.c b/subsys/debug/cpu_load/cpu_load.c
@@ -48,6 +48,8 @@ static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 {
 	nrfx_err_t err;
 #ifdef DPPI_PRESENT
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
 	if (*PUBLISH_ADDR(evt) != 0) {
 		if (!IS_ENABLED(CONFIG_CPU_LOAD_USE_SHARED_DPPI_CHANNELS)) {
 			return NRFX_ERROR_BUSY;
@@ -60,7 +62,7 @@ static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 		err = NRFX_SUCCESS;
 		shared_ch_mask |= BIT(*ch);
 	} else {
-		err = nrfx_dppi_channel_alloc(ch);
+		err = nrfx_dppi_channel_alloc(&dppi, ch);
 	}
 #else
 	err = nrfx_ppi_channel_alloc((nrf_ppi_channel_t *)ch);
@@ -71,9 +73,11 @@ static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 static nrfx_err_t ppi_free(uint8_t ch)
 {
 #ifdef DPPI_PRESENT
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
 	if (!IS_ENABLED(CONFIG_CPU_LOAD_USE_SHARED_DPPI_CHANNELS)
 		|| ((BIT(ch) & shared_ch_mask) == 0)) {
-		return nrfx_dppi_channel_free(ch);
+		return nrfx_dppi_channel_free(&dppi, ch);
 	} else {
 		return NRFX_SUCCESS;
 	}
diff --git a/subsys/debug/ppi_trace/ppi_trace.c b/subsys/debug/ppi_trace/ppi_trace.c
@@ -65,6 +65,8 @@ static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 {
 	nrfx_err_t err;
 #ifdef DPPI_PRESENT
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
 	if (*PUBLISH_ADDR(evt) != 0) {
 		/* Use mask of one of subscribe registers in the system,
 		 * assuming that all subscribe registers has the same mask for
@@ -73,7 +75,7 @@ static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 		*ch = *PUBLISH_ADDR(evt) & DPPIC_SUBSCRIBE_CHG_EN_CHIDX_Msk;
 		err = NRFX_SUCCESS;
 	} else {
-		err = nrfx_dppi_channel_alloc(ch);
+		err = nrfx_dppi_channel_alloc(&dppi, ch);
 	}
 #else
 	err = nrfx_ppi_channel_alloc((nrf_ppi_channel_t *)ch);
diff --git a/subsys/dm/dm.c b/subsys/dm/dm.c
@@ -25,8 +25,11 @@
 
 #if defined(DPPI_PRESENT)
 #include <nrfx_dppi.h>
+
+static nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
 #define gppi_channel_t uint8_t
-#define gppi_channel_alloc nrfx_dppi_channel_alloc
+#define gppi_channel_alloc(x) nrfx_dppi_channel_alloc(&dppi, x)
 #else
 #include <nrfx_ppi.h>
 #define gppi_channel_t nrf_ppi_channel_t
diff --git a/subsys/esb/esb_dppi.c b/subsys/esb/esb_dppi.c
@@ -225,44 +225,46 @@ int esb_ppi_init(void)
 
 #else
 
-	err = nrfx_dppi_channel_alloc(&radio_address_timer_stop);
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
+	err = nrfx_dppi_channel_alloc(&dppi, &radio_address_timer_stop);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_alloc(&timer_compare0_radio_disable);
+	err = nrfx_dppi_channel_alloc(&dppi, &timer_compare0_radio_disable);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_alloc(&timer_compare1_radio_txen);
+	err = nrfx_dppi_channel_alloc(&dppi, &timer_compare1_radio_txen);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_alloc(&disabled_phy_end_egu);
+	err = nrfx_dppi_channel_alloc(&dppi, &disabled_phy_end_egu);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_alloc(&egu_timer_start);
+	err = nrfx_dppi_channel_alloc(&dppi, &egu_timer_start);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_alloc(&egu_ramp_up);
+	err = nrfx_dppi_channel_alloc(&dppi, &egu_ramp_up);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
 	if (IS_ENABLED(CONFIG_ESB_NEVER_DISABLE_TX)) {
-		err = nrfx_dppi_channel_alloc(&radio_end_timer_start);
+		err = nrfx_dppi_channel_alloc(&dppi, &radio_end_timer_start);
 		if (err != NRFX_SUCCESS) {
 			goto error;
 		}
 	}
 
-	err = nrfx_dppi_group_alloc(&ramp_up_dppi_group);
+	err = nrfx_dppi_group_alloc(&dppi, &ramp_up_dppi_group);
 	if (err != NRFX_SUCCESS) {
 		LOG_ERR("gppi_group_alloc failed with: %d\n", err);
 		return -ENODEV;
@@ -315,44 +317,46 @@ void esb_ppi_deinit(void)
 
 #else
 
-	err = nrfx_dppi_channel_free(radio_address_timer_stop);
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
+	err = nrfx_dppi_channel_free(&dppi, radio_address_timer_stop);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_free(timer_compare0_radio_disable);
+	err = nrfx_dppi_channel_free(&dppi, timer_compare0_radio_disable);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_free(timer_compare1_radio_txen);
+	err = nrfx_dppi_channel_free(&dppi, timer_compare1_radio_txen);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_free(disabled_phy_end_egu);
+	err = nrfx_dppi_channel_free(&dppi, disabled_phy_end_egu);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_free(egu_timer_start);
+	err = nrfx_dppi_channel_free(&dppi, egu_timer_start);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
-	err = nrfx_dppi_channel_free(egu_ramp_up);
+	err = nrfx_dppi_channel_free(&dppi, egu_ramp_up);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
 
 	if (IS_ENABLED(CONFIG_ESB_NEVER_DISABLE_TX)) {
-		err = nrfx_dppi_channel_free(radio_end_timer_start);
+		err = nrfx_dppi_channel_free(&dppi, radio_end_timer_start);
 		if (err != NRFX_SUCCESS) {
 			goto error;
 		}
 	}
 
-	err = nrfx_dppi_group_free(ramp_up_dppi_group);
+	err = nrfx_dppi_group_free(&dppi, ramp_up_dppi_group);
 	if (err != NRFX_SUCCESS) {
 		goto error;
 	}
diff --git a/subsys/mpsl/fem/common/mpsl_fem_utils.c b/subsys/mpsl/fem/common/mpsl_fem_utils.c
@@ -19,12 +19,15 @@
 int mpsl_fem_utils_ppi_channel_alloc(uint8_t *ppi_channels, size_t size)
 {
 	nrfx_err_t err = NRFX_ERROR_NOT_SUPPORTED;
+#ifdef DPPI_PRESENT
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+#endif
 
 	for (int i = 0; i < size; i++) {
 		IF_ENABLED(CONFIG_HAS_HW_NRF_PPI,
 			(err = nrfx_ppi_channel_alloc(&ppi_channels[i]);));
 		IF_ENABLED(CONFIG_HAS_HW_NRF_DPPIC,
-			(err = nrfx_dppi_channel_alloc(&ppi_channels[i]);));
+			(err = nrfx_dppi_channel_alloc(&dppi, &ppi_channels[i]);));
 		if (err != NRFX_SUCCESS) {
 			return -ENOMEM;
 		}
diff --git a/subsys/mpsl/pin_debug/mpsl_pin_debug_radio_core.c b/subsys/mpsl/pin_debug/mpsl_pin_debug_radio_core.c
diff --git a/tests/subsys/debug/cpu_load/src/test_cpu_load.c b/tests/subsys/debug/cpu_load/src/test_cpu_load.c
diff --git a/west.yml b/west.yml

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause`
`5`	`5`	`#`
`6`	`6`
`7`		`-CONFIG_NRFX_DPPI=y`
	`7`	`+CONFIG_NRFX_GPPI=y`
`8`	`8`	`CONFIG_BT_RX_STACK_SIZE=2048`