drivers: wifi: nrf71: Wait for IPC endpoint bind with timeout

Block in wifi_ipc_busyq_register() until the bound callback runs or
CONFIG_NRF71_IPC_BIND_TIMEOUT_MS expires. Downgrade transient not-ready
send errors to LOG_DBG once registration is expected to succeed.

Assisted-by: Cursor:Auto
Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>

Author: krish2718

drivers/wifi/nrf71/Kconfig

@@ -29,6 +29,28 @@ config IPC_SERVICE_BACKEND_ICMSG
 config IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE
 	default 5600
 
+config NRF71_IPC_BIND_TIMEOUT_MS
+	int "IPC endpoint bind timeout (ms)"
+	default 30000
+	help
+	  Maximum time to wait for the IPC endpoint bound callback after
+	  registration. The Wi-Fi UMAC peer must register its endpoint before
+	  bind completes. On timeout ipc_register_rx_cb() fails.
+
+config NRF71_IPC_SEND_TIMEOUT_MS
+	int "IPC host TX send timeout (ms)"
+	default 5000
+	help
+	  Maximum time to wait for a transient IPC busy condition when sending
+	  a command or TX buffer after the endpoint is bound. On timeout
+	  ipc_send() returns -ETIMEDOUT.
+
+config NRF71_IPC_SEND_RETRY_INTERVAL_US
+	int "IPC host TX retry interval (us)"
+	default 100
+	help
+	  Delay between retries when the IPC busy queue is not ready.
+
 choice NRF71_OPER_MODES
 	bool "nRF70 operating modes"
 	default NRF71_SYSTEM_MODE if !WIFI_USAGE_MODE_SCAN_ONLY

drivers/wifi/nrf71/bus/ipc_service.c

@@ -8,18 +8,46 @@
  * @brief IPC service layer of the nRF71 Wi-Fi driver.
  */
 
+#include <errno.h>
+
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF71_LOG_LEVEL);
 
 #include "ipc_service.h"
 
+static K_SEM_DEFINE(wifi_ipc_bind_sem, 0, 1);
+
+static void wifi_ipc_signal_bound(void)
+{
+	k_sem_give(&wifi_ipc_bind_sem);
+}
+
+static int wifi_ipc_wait_bound(wifi_ipc_t *context)
+{
+	if (context->busy_q.ipc_ready) {
+		return 0;
+	}
+
+	if (k_sem_take(&wifi_ipc_bind_sem,
+		       K_MSEC(CONFIG_NRF71_IPC_BIND_TIMEOUT_MS)) != 0 &&
+	    !context->busy_q.ipc_ready) {
+		LOG_ERR("IPC endpoint not bound after %d ms (Wi-Fi core up? "
+			"CONFIG_SOC_NRF71_WIFI_BOOT=y for TF-M builds)",
+			CONFIG_NRF71_IPC_BIND_TIMEOUT_MS);
+		return -ETIMEDOUT;
+	}
+
+	return 0;
+}
+
 static void wifi_ipc_ep_bound(void *priv)
 {
 	wifi_ipc_t *context = (wifi_ipc_t *)priv;
 
 	context->busy_q.ipc_ready = true;
+	wifi_ipc_signal_bound();
 }
 
 /* For single-endpoint TX+RX bind: set both contexts ready when endpoint is bound */
@@ -33,6 +61,7 @@ static void wifi_ipc_ep_bound_tx_rx(void *priv)
 	if (wifi_ipc_rx_ctx_shared != NULL) {
 		wifi_ipc_rx_ctx_shared->busy_q.ipc_ready = true;
 	}
+	wifi_ipc_signal_bound();
 }
 
 static void wifi_ipc_recv_callback(const void *data, size_t len, void *priv)
@@ -66,6 +95,8 @@ static wifi_ipc_status_t wifi_ipc_busyq_register(wifi_ipc_t *context)
 	int ret;
 	const struct device *ipc_instance = GET_IPC_INSTANCE(context->busy_q.ipc_inst);
 
+	k_sem_reset(&wifi_ipc_bind_sem);
+
 	ret = ipc_service_open_instance(ipc_instance);
 	if (ret < 0) {
 		return WIFI_IPC_STATUS_INIT_ERR;
@@ -80,6 +111,10 @@ static wifi_ipc_status_t wifi_ipc_busyq_register(wifi_ipc_t *context)
 		return WIFI_IPC_STATUS_INIT_ERR;
 	}
 
+	if (wifi_ipc_wait_bound(context) != 0) {
+		return WIFI_IPC_STATUS_INIT_ERR;
+	}
+
 	LOG_INF("IPC busy queue registered");
 
 	return WIFI_IPC_STATUS_OK;
@@ -103,6 +138,7 @@ wifi_ipc_status_t wifi_ipc_bind_ipc_service_tx_rx(wifi_ipc_t *tx_context,
 {
 	wifi_ipc_status_t ret;
 
+	wifi_ipc_busyq_init(&rx_context->busy_q, ipc_inst, NULL, priv);
 	wifi_ipc_rx_ctx_shared = rx_context;
 	wifi_ipc_busyq_init(&tx_context->busy_q, ipc_inst, rx_cb, priv);
 	tx_context->busy_q.ipc_ep_cfg.cb.bound = wifi_ipc_ep_bound_tx_rx;
@@ -119,7 +155,7 @@ static wifi_ipc_status_t wifi_ipc_busyq_send(wifi_ipc_t *context, const void *da
 	wifi_ipc_busyq_t *busyq = &context->busy_q;
 
 	if (!busyq->ipc_ready) {
-		LOG_ERR("IPC service is not ready");
+		LOG_DBG("IPC service is not ready");
 		return WIFI_IPC_STATUS_BUSYQ_NOTREADY;
 	}