Race free sleep design

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

Author: krish2718

hw_if/hal/src/common/hal_api_common.c

@@ -59,6 +59,12 @@ enum nrf_wifi_status hal_rpu_ps_wake(struct nrf_wifi_hal_dev_ctx *hal_dev_ctx)
 	if (!hal_dev_ctx->rpu_fw_booted)
 		return NRF_WIFI_STATUS_SUCCESS;
 
+	/* Cancel any pending sleep timer to prevent it from firing
+	 * during the wake operation or subsequent register/memory access.
+	 * The timer will be rescheduled at the end of this function.
+	 */
+	nrf_wifi_osal_timer_kill(hal_dev_ctx->rpu_ps_timer);
+
 	if (hal_dev_ctx->rpu_ps_state == RPU_PS_STATE_AWAKE) {
 		status = NRF_WIFI_STATUS_SUCCESS;
 
@@ -121,9 +127,10 @@ enum nrf_wifi_status hal_rpu_ps_wake(struct nrf_wifi_hal_dev_ctx *hal_dev_ctx)
 #endif /* NRF_WIFI_RPU_RECOVERY_PS_STATE_DEBUG */
 
 out:
-
-	nrf_wifi_osal_timer_schedule(hal_dev_ctx->rpu_ps_timer,
-		NRF70_RPU_PS_IDLE_TIMEOUT_MS);
+	/* Note: Timer scheduling is done by the caller after releasing
+	 * the lock to prevent the timer from firing during subsequent
+	 * operations (register/memory reads/writes).
+	 */
 	return status;
 }
 

hw_if/hal/src/common/hal_mem.c

@@ -118,6 +118,14 @@ static enum nrf_wifi_status rpu_mem_read_ram(struct nrf_wifi_hal_dev_ctx *hal_de
 out:
 	nrf_wifi_osal_spinlock_irq_rel(hal_dev_ctx->rpu_ps_lock,
 				       &flags);
+
+	/* Schedule sleep timer after releasing the lock to prevent
+	 * it from firing during the critical section.
+	 */
+	if (status == NRF_WIFI_STATUS_SUCCESS) {
+		nrf_wifi_osal_timer_schedule(hal_dev_ctx->rpu_ps_timer,
+					    NRF70_RPU_PS_IDLE_TIMEOUT_MS);
+	}
 #endif /* NRF_WIFI_LOW_POWER */
 
 	return status;
@@ -169,6 +177,14 @@ static enum nrf_wifi_status rpu_mem_write_ram(struct nrf_wifi_hal_dev_ctx *hal_d
 out:
 	nrf_wifi_osal_spinlock_irq_rel(hal_dev_ctx->rpu_ps_lock,
 				       &flags);
+
+	/* Schedule sleep timer after releasing the lock to prevent
+	 * it from firing during the critical section.
+	 */
+	if (status == NRF_WIFI_STATUS_SUCCESS) {
+		nrf_wifi_osal_timer_schedule(hal_dev_ctx->rpu_ps_timer,
+					    NRF70_RPU_PS_IDLE_TIMEOUT_MS);
+	}
 #endif /* NRF_WIFI_LOW_POWER */
 
 	return status;

hw_if/hal/src/common/hal_reg.c

@@ -91,6 +91,14 @@ enum nrf_wifi_status hal_rpu_reg_read(struct nrf_wifi_hal_dev_ctx *hal_dev_ctx,
 #ifdef NRF_WIFI_LOW_POWER
 	nrf_wifi_osal_spinlock_irq_rel(hal_dev_ctx->rpu_ps_lock,
 				       &flags);
+
+	/* Schedule sleep timer after releasing the lock to prevent
+	 * it from firing during the critical section.
+	 */
+	if (status == NRF_WIFI_STATUS_SUCCESS) {
+		nrf_wifi_osal_timer_schedule(hal_dev_ctx->rpu_ps_timer,
+					    NRF70_RPU_PS_IDLE_TIMEOUT_MS);
+	}
 #endif /* NRF_WIFI_LOW_POWER */
 
 	return status;
@@ -151,6 +159,14 @@ enum nrf_wifi_status hal_rpu_reg_write(struct nrf_wifi_hal_dev_ctx *hal_dev_ctx,
 out:
 	nrf_wifi_osal_spinlock_irq_rel(hal_dev_ctx->rpu_ps_lock,
 				       &flags);
+
+	/* Schedule sleep timer after releasing the lock to prevent
+	 * it from firing during the critical section.
+	 */
+	if (status == NRF_WIFI_STATUS_SUCCESS) {
+		nrf_wifi_osal_timer_schedule(hal_dev_ctx->rpu_ps_timer,
+					    NRF70_RPU_PS_IDLE_TIMEOUT_MS);
+	}
 #endif /* NRF_WIFI_LOW_POWER */
 
 	return status;