Add RPU recovery info

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -682,15 +682,6 @@ config NET_MGMT_EVENT_QUEUE_SIZE
 	# Doing interface down and up even with delay puts a lot of events in the queue
 	default 16
 
-config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
-	int "RPU recovery propagation delay in milliseconds"
-	default 10
-	help
-	  Propagation delay in milliseconds to wait after the RPU is powered down
-	  before powering it up. This delay is required to ensure that the recovery
-	  is propagated to all the applications and stack, and has enough time to
-	  clean up the resources.
-
 config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
 	int "RPU recovery power save active timeout in milliseconds"
 	default 50000

drivers/wifi/nrf_wifi/inc/fmac_main.h

@@ -113,6 +113,8 @@ struct nrf_wifi_ctx_zep {
 	bool rpu_recovery_in_progress;
 	unsigned long last_rpu_recovery_time_ms;
 	unsigned int rpu_recovery_retries;
+	int rpu_recovery_success;
+	int rpu_recovery_failure;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 

drivers/wifi/nrf_wifi/src/net_if.c

@@ -74,6 +74,7 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 								nrf_wifi_rpu_recovery_work);
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	int ret;
+	bool recovery_fail = false;
 
 	if (!vif_ctx_zep) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
@@ -143,6 +144,8 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	/* This indirectly does a cold-boot of RPU */
 	ret = net_if_down(vif_ctx_zep->zep_net_if_ctx);
 	if (ret) {
+		rpu_ctx_zep->rpu_recovery_failure++;
+		recovery_fail = true;
 		LOG_ERR("%s: net_if_down failed: %d", __func__, ret);
 		/* Continue with the recovery */
 	}
@@ -158,6 +161,9 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	}
 	rpu_ctx_zep->rpu_recovery_in_progress = false;
 	rpu_ctx_zep->last_rpu_recovery_time_ms = k_uptime_get();
+	if (!recovery_fail) {
+		rpu_ctx_zep->rpu_recovery_success++;
+	}
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: RPU recovery done", __func__);

drivers/wifi/nrf_wifi/src/wifi_util.c

@@ -915,6 +915,52 @@
 	k_mutex_unlock(&ctx->rpu_lock);
 	return ret;
 }
+
+static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
+					   size_t argc,
+					   const char *argv[])
+{
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+	struct nrf_wifi_hal_dev_ctx *hal_dev_ctx = NULL;
+	unsigned long current_time_ms = nrf_wifi_osal_time_get_curr_ms();
+	int ret;
+
+	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
+	if (!ctx || !ctx->rpu_ctx) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "RPU context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+
+	fmac_dev_ctx = ctx->rpu_ctx;
+	hal_dev_ctx = fmac_dev_ctx->hal_dev_ctx;
+
+	shell_fprintf(sh,
+		      SHELL_INFO,
+		      "wdt_irq_received: %d\n"
+		      "wdt_irq_ignored: %d\n"
+		      "last_wakeup_now_asserted_time_ms: %lu milliseconds\n"
+		      "last_wakeup_now_deasserted_time_ms: %lu milliseconds\n"
+		      "last_rpu_sleep_opp_time_ms: %lu milliseconds\n"
+		      "current time: %lu milliseconds\n"
+		      "rpu_recovery_success: %d\n"
+		      "rpu_recovery_failure: %d\n\n",
+		      hal_dev_ctx->wdt_irq_received,
+		      hal_dev_ctx->wdt_irq_ignored,
+		      hal_dev_ctx->last_wakeup_now_asserted_time_ms,
+		      hal_dev_ctx->last_wakeup_now_deasserted_time_ms,
+		      hal_dev_ctx->last_rpu_sleep_opp_time_ms,
+		      current_time_ms,
+		      ctx->rpu_recovery_success,
+		      ctx->rpu_recovery_failure);
+
+	ret = 0;
+unlock:
+	k_mutex_unlock(&ctx->rpu_lock);
+	return ret;
+}
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(
@@ -967,7 +1013,7 @@
 #endif /* CONFIG_NRF70_STA_MODE */
 	SHELL_CMD_ARG(tx_rate,
 		      NULL,
 		      "Sets TX data rate to either a fixed value or AUTO\n"
 		      "Parameters:\n"
 		      "    <rate_flag> : The TX data rate type to be set, where:\n"
 		      "        0 - LEGACY\n"
@@ -1013,7 +1059,13 @@
 		      nrf_wifi_util_trigger_rpu_recovery,
 		      1,
 		      0),
+	SHELL_CMD_ARG(rpu_recovery_info,
+		      NULL,
+		      "Dump RPU recovery information",
+		      nrf_wifi_util_rpu_recovery_info,
+		      1,
+		      0),
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 	SHELL_SUBCMD_SET_END);
 
 

west.yml

@@ -303,7 +303,7 @@ manifest:
       revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: f9e2abdb70761003912b1b929a37b536f68a91da
+      revision: 71261e2b719b98500b7741c3398a74a5fb631596
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719