modules: nrfxlib: nrf_802154: Fix control of PPI channels

Rework implementation of local domain and cross domain connections
setup. Local domain connections happens frequent from an interrupt
context so need to be fast.

Signed-off-by: Krzysztof Chruściński <[email protected]>

Author: nordic-krch

modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_platform_sl_lptimer_grtc_hw_task.c

@@ -244,47 +244,55 @@ void nrf_802154_platform_sl_lptimer_hw_task_local_domain_connections_clear(void)
 #define INVALID_CHANNEL UINT8_MAX
 
 static nrfx_gppi_handle_t peri_rad_handle;
+static uint32_t ppib_chan;
 
 void nrf_802154_platform_sl_lptimer_hw_task_cross_domain_connections_setup(uint32_t cc_channel)
-{
-	ARG_UNUSED(cc_channel);
-}
-
-void nrf_802154_platform_sl_lptimer_hw_task_cross_domain_connections_clear(void)
-{
-	nrfx_gppi_domain_conn_free(peri_rad_handle);
-}
-
-void nrf_802154_platform_sl_lptimer_hw_task_local_domain_connections_setup(uint32_t dppi_ch,
-									   uint32_t cc_channel)
 {
 	nrfx_gppi_resource_t resource = {
 		.domain_id = NRFX_GPPI_DOMAIN_RAD,
-		.channel = dppi_ch
+		.channel = 0
 	};
 	uint32_t eep = z_nrf_grtc_timer_compare_evt_address_get(cc_channel);
 	int err;
 
-	if (dppi_ch == NRF_802154_SL_HW_TASK_PPI_INVALID) {
-		return;
-	}
-
-	/* Setup a connection between Peri and Rad domain. For Rad domain use provided channel.
-	 * Remaining resources (bridge and dppi channel in PERI) allocate dynamically.
-	 */
 	err = nrfx_gppi_ext_conn_alloc(NRFX_GPPI_DOMAIN_PERI, NRFX_GPPI_DOMAIN_RAD,
 				       &peri_rad_handle, &resource);
 	__ASSERT_NO_MSG(err == 0);
 
+	/* Add event endpoint (GRTC compare) to the previously configured connection. */
 	err = nrfx_gppi_ep_attach(eep, peri_rad_handle);
 	__ASSERT_NO_MSG(err == 0);
 
+	/* Get PPIB channel used in the connection. */
+	ppib_chan = nrfx_gppi_domain_channel_get(peri_rad_handle, NRFX_GPPI_NODE_PPIB11_21);
+	__ASSERT_NO_MSG(ppib_chan >= 0);
+
+	/* Disable PPIB for now until exact channel from RADIO domain is known. */
+	nrf_ppib_publish_clear(NRF_PPIB11, nrf_ppib_receive_event_get(ppib_chan));
+
 	nrfx_gppi_conn_enable(peri_rad_handle);
 }
 
-void nrf_802154_platform_sl_lptimer_hw_task_local_domain_connections_clear(void)
+void nrf_802154_platform_sl_lptimer_hw_task_cross_domain_connections_clear(void)
 {
 	nrfx_gppi_conn_disable(peri_rad_handle);
+	nrfx_gppi_domain_conn_free(peri_rad_handle);
+}
+
+void nrf_802154_platform_sl_lptimer_hw_task_local_domain_connections_setup(uint32_t dppi_ch,
+									   uint32_t cc_channel)
+{
+	if (dppi_ch == NRF_802154_SL_HW_TASK_PPI_INVALID) {
+		return;
+	}
+
+	/* Configure PPIB to forward GRTC event to the DPPI channel from the Radio domain. */
+	nrf_ppib_publish_set(NRF_PPIB11, nrf_ppib_receive_event_get(ppib_chan), dppi_ch);
+}
+
+void nrf_802154_platform_sl_lptimer_hw_task_local_domain_connections_clear(void)
+{
+	nrf_ppib_publish_clear(NRF_PPIB11, nrf_ppib_receive_event_get(ppib_chan));
 }
 
 #endif

modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_platform_timestamper.c

@@ -231,37 +231,44 @@ void nrf_802154_platform_timestamper_local_domain_connections_setup(uint32_t dpp
 #include <soc/interconnect/nrfx_gppi_lumos.h>
 
 static nrfx_gppi_handle_t rad_peri_handle;
+static uint32_t ppib_chan;
 
 void nrf_802154_platform_timestamper_cross_domain_connections_setup(void)
 {
-	__ASSERT_NO_MSG(rad_peri_handle != 0);
+	nrfx_gppi_resource_t resource = {
+		.domain_id = NRFX_GPPI_DOMAIN_RAD,
+		.channel = 0
+	};
 	nrf_grtc_task_t capture_task =
 		nrfy_grtc_sys_counter_capture_task_get(m_timestamp_cc_channel);
 	uint32_t tep = nrfy_grtc_task_address_get(NRF_GRTC, capture_task);
 	int err;
 
+	err = nrfx_gppi_ext_conn_alloc(NRFX_GPPI_DOMAIN_RAD, NRFX_GPPI_DOMAIN_PERI,
+				       &rad_peri_handle, &resource);
+	__ASSERT_NO_MSG(err == 0);
+
 	/* Add task endpoint (GRTC capture) to the previously configured connection. */
 	err = nrfx_gppi_ep_attach(tep, rad_peri_handle);
 	__ASSERT_NO_MSG(err == 0);
 
+	/* Get PPIB channel used in the connection. */
+	ppib_chan = nrfx_gppi_domain_channel_get(rad_peri_handle, NRFX_GPPI_NODE_PPIB11_21);
+	__ASSERT_NO_MSG(ppib_chan >= 0);
+
+	/* Disable PPIB for now until exact channel from RADIO domain is known. */
+	nrf_ppib_subscribe_clear(NRF_PPIB11, nrf_ppib_send_task_get(ppib_chan));
+
 	nrfx_gppi_conn_enable(rad_peri_handle);
 }
 
 void nrf_802154_platform_timestamper_local_domain_connections_setup(uint32_t dppi_ch)
 {
-	nrfx_gppi_resource_t resource = {
-		.domain_id = NRFX_GPPI_DOMAIN_RAD,
-		.channel = dppi_ch
-	};
-	int err;
-
 	z_nrf_grtc_timer_capture_prepare(m_timestamp_cc_channel);
-	/* Setup a connection between Rad and Peri domain. For Rad domain use provided channel.
-	 * Remaining resources (bridge and dppi channel in PERI) allocate dynamically.
+	/* Configure PPIB to forward provided DPPI channel from Radio domain and enable
+	 * the connection.
 	 */
-	err = nrfx_gppi_ext_conn_alloc(NRFX_GPPI_DOMAIN_RAD, NRFX_GPPI_DOMAIN_PERI,
-				       &rad_peri_handle, &resource);
-	__ASSERT_NO_MSG(err == 0);
+	nrf_ppib_subscribe_set(NRF_PPIB11, nrf_ppib_send_task_get(ppib_chan), dppi_ch);
 }
 
 #endif