drivers: wifi: Add PS exit strategy runtime configuration

nrf_wifi/fw_if/umac_if/inc/default/fmac_api.h

@@ -983,6 +983,22 @@ enum nrf_wifi_status nrf_wifi_fmac_set_ps_wakeup_mode(void *fmac_dev_ctx,
 							unsigned char if_idx,
 							bool ps_wakeup_mode);
 
+/**
+ * @brief Configure power save exit strategy.
+ * @param fmac_dev_ctx Pointer to the UMAC IF context for a RPU WLAN device.
+ * @param if_idx Index of the interface on which power management is to be set.
+ * @param ps_exit_strategy PS exit strategy to be configured in RPU.
+ *
+ * This function is used to send a command to RPU
+ * to configure PS exit strategy in RPU.
+ *
+ * @return Command execution status
+ */
+enum nrf_wifi_status nrf_wifi_fmac_set_ps_exit_strategy(
+						void *fmac_dev_ctx,
+						unsigned char if_idx,
+						unsigned int ps_exit_strategy);
+
 #ifdef CONFIG_NRF700X_RAW_DATA_TX
 /**
  * @brief Transmit a raw unaltered frame to the RPU.

nrf_wifi/fw_if/umac_if/inc/fmac_cmd.h

@@ -72,4 +72,6 @@ enum nrf_wifi_status umac_cmd_prog_stats_get(struct nrf_wifi_fmac_dev_ctx *fmac_
 #endif /* CONFIG_NRF700X_RADIO_TEST */
 					     int stat_type);
 
+enum nrf_wifi_status umac_cmd_set_ps_exit_strategy(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx,
+					enum ps_exit_strategy ps_exit_strategy);
 #endif /* __FMAC_CMD_H__ */

nrf_wifi/fw_if/umac_if/inc/fw/host_rpu_sys_if.h

@@ -843,13 +843,13 @@ enum keep_alive_status {
  * @brief This enum specifies the type of frames used to retrieve buffered data
  *  from the AP in power save mode.
  */
-enum data_retrieve_mechanism {
-	/** Retrieves data from the AP using a PS-Poll frame */
-	PS_POLL_FRAME,
-	/** Retrieves data from the AP using a QoS Null frame */
-	QOS_NULL_FRAME,
-	/** For future implementation. The RPU will decide which frame to use */
-	AUTOMATIC
+enum ps_exit_strategy {
+	/** Uses an intelligent algo and decide whether to
+	 * stay or exit power save mode to receive buffered frames.
+	 */
+	INT_PS = 0,
+	/** Exits power save mode for every TIM */
+	EVERY_TIM
 };
 
 #define TWT_EXTEND_SP_EDCA  0x1
@@ -897,9 +897,9 @@ struct nrf_wifi_cmd_sys_init {
 	 */
 	unsigned int discon_timeout;
 	/** RPU uses QoS null frame or PS-Poll frame to retrieve buffered frames
-	 * from the AP in power save @ref data_retrieve_mechanism.
+	 * from the AP in power save @ref ps_exit_strategy.
 	 */
-	unsigned char ps_data_retrieval_mech;
+	unsigned char ps_exit_strategy;
 	/** The RPU uses this value to configure watchdog timer */
 	unsigned int watchdog_timer_val;
 	/** The RPU uses this value to decide whether keep alive

nrf_wifi/fw_if/umac_if/inc/fw/host_rpu_umac_if.h

@@ -143,7 +143,9 @@ enum nrf_wifi_umac_commands {
 	/** Set listen interval @ref nrf_wifi_umac_cmd_set_listen_interval */
 	NRF_WIFI_UMAC_CMD_SET_LISTEN_INTERVAL,
 	/** Configure extended power save @ref nrf_wifi_umac_cmd_config_extended_ps */
-	NRF_WIFI_UMAC_CMD_CONFIG_EXTENDED_PS
+	NRF_WIFI_UMAC_CMD_CONFIG_EXTENDED_PS,
+	/** Command to specify power save exit strategy */
+	NRF_WIFI_UMAC_CMD_PS_EXIT_STRATEGY,
 };
 
  /**
@@ -2924,6 +2926,8 @@ struct nrf_wifi_umac_event_power_save_info {
 	unsigned int ps_timeout;
 	/** Listen interval value */
 	unsigned short listen_interval;
+	/** Power save exit strategy */
+	unsigned char ps_exit_strategy;
 	/** Number TWT flows */
 	unsigned char num_twt_flows;
 	/** TWT info of each flow @ref nrf_wifi_umac_config_twt_info */
@@ -3499,4 +3503,16 @@ struct nrf_wifi_umac_event_cmd_status {
 	unsigned int cmd_status;
 } __NRF_WIFI_PKD;
 
+/**
+ * @brief This structure defines the command used to configure the power save exit
+ * strategy for retrieving buffered data from the AP in power save mode.
+ *
+ */
+struct nrf_wifi_cmd_ps_exit_strategy {
+	/** Header @ref nrf_wifi_umac_hdr */
+	struct nrf_wifi_umac_hdr umac_hdr;
+	/** Power save exit strategy */
+	unsigned char ps_exit_strategy;
+} __NRF_WIFI_PKD;
+
 #endif /* __HOST_RPU_UMAC_IF_H */

nrf_wifi/fw_if/umac_if/src/cmd.c

@@ -222,11 +222,11 @@ enum nrf_wifi_status umac_cmd_init(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx,
 		umac_cmd_data->disable_beamforming = 1;
 	}
 
-#if defined(CONFIG_NRF_WIFI_QOS_NULL_BASED_RETRIEVAL)
-	umac_cmd_data->ps_data_retrieval_mech = QOS_NULL_FRAME;
+#if defined(CONFIG_NRF_WIFI_PS_INT_PS)
+	umac_cmd_data->ps_exit_strategy = INT_PS;
 #else
-	umac_cmd_data->ps_data_retrieval_mech = PS_POLL_FRAME;
-#endif  /* CONFIG_NRF_WIFI_QOS_NULL_BASED_RETRIEVAL */
+	umac_cmd_data->ps_exit_strategy = EVERY_TIM;
+#endif  /* CONFIG_NRF_WIFI_PS_INT_PS */
 
 	status = nrf_wifi_hal_ctrl_cmd_send(fmac_dev_ctx->hal_dev_ctx,
 					    umac_cmd,

nrf_wifi/fw_if/umac_if/src/default/fmac_api.c

@@ -3160,4 +3160,44 @@ enum nrf_wifi_status nrf_wifi_fmac_set_ps_wakeup_mode(void *dev_ctx,
 
 	return status;
 }
+
+
+enum nrf_wifi_status nrf_wifi_fmac_set_ps_exit_strategy(void *dev_ctx,
+							unsigned char if_idx,
+							unsigned int ps_exit_strategy)
+{
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct nrf_wifi_cmd_ps_exit_strategy *set_ps_exit_strategy_cmd = NULL;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+
+	(void)if_idx;
+
+	fmac_dev_ctx = dev_ctx;
+
+	set_ps_exit_strategy_cmd = nrf_wifi_osal_mem_zalloc(fmac_dev_ctx->fpriv->opriv,
+							    sizeof(*set_ps_exit_strategy_cmd));
+
+	if (!set_ps_exit_strategy_cmd) {
+		nrf_wifi_osal_log_err(fmac_dev_ctx->fpriv->opriv,
+				      "%s: Unable to allocate memory\n", __func__);
+		goto out;
+	}
+
+	set_ps_exit_strategy_cmd->umac_hdr.cmd_evnt = NRF_WIFI_UMAC_CMD_PS_EXIT_STRATEGY;
+	set_ps_exit_strategy_cmd->umac_hdr.ids.wdev_id = if_idx;
+	set_ps_exit_strategy_cmd->umac_hdr.ids.valid_fields |=
+		NRF_WIFI_INDEX_IDS_WDEV_ID_VALID;
+	set_ps_exit_strategy_cmd->ps_exit_strategy = ps_exit_strategy;
+
+	status = umac_cmd_cfg(fmac_dev_ctx,
+			      set_ps_exit_strategy_cmd,
+			      sizeof(*set_ps_exit_strategy_cmd));
+out:
+	if (set_ps_exit_strategy_cmd) {
+		nrf_wifi_osal_mem_free(fmac_dev_ctx->fpriv->opriv,
+				       set_ps_exit_strategy_cmd);
+	}
+
+	return status;
+}
 #endif /* CONFIG_NRF700X_STA_MODE */