[nrf fromlist] drivers: wifi: nrf_wifi: Add cookie handling support

Add cookie event callbacks to track RoC and cancel-RoC
requests and its responses from firmware.

Upstream PR #: 97183

Signed-off-by: Ravi Dondaputi <[email protected]>

Author: rado17

drivers/wifi/nrf_wifi/inc/wpa_supp_if.h

@@ -131,8 +131,9 @@ void nrf_wifi_supp_event_roc_cancel_complete(void *os_vif_ctx,
 					    unsigned int event_len);
 int nrf_wifi_supp_set_country(void *if_priv, const char *alpha2);
 int nrf_wifi_supp_get_country(void *if_priv, char *alpha2);
-int nrf_wifi_supp_remain_on_channel(void *if_priv, unsigned int freq, unsigned int duration);
-int nrf_wifi_supp_cancel_remain_on_channel(void *if_priv);
+int nrf_wifi_supp_remain_on_channel(void *if_priv, unsigned int freq,
+				     unsigned int duration, u64 host_cookie);
+int nrf_wifi_supp_cancel_remain_on_channel(void *if_priv, u64 rpu_cookie);
 int nrf_wifi_supp_set_p2p_powersave(void *if_priv, int legacy_ps, int opp_ps, int ctwindow);
 
 #endif /* CONFIG_NRF70_STA_MODE */

drivers/wifi/nrf_wifi/src/fmac_main.c

@@ -452,6 +452,11 @@ void nrf_wifi_event_proc_cookie_rsp(void *vif_ctx,
 	/* TODO: When supp_callbk_fns.mgmt_tx_status is implemented, add logic
 	 * here to use the cookie and host_cookie to map requests to responses.
 	 */
+	if (vif_ctx_zep->supp_drv_if_ctx &&
+		vif_ctx_zep->supp_callbk_fns.cookie_event) {
+		vif_ctx_zep->supp_callbk_fns.cookie_event(vif_ctx_zep->supp_drv_if_ctx,
+			cookie_rsp_event->host_cookie, cookie_rsp_event->cookie);
+		}
 }
 #endif /* CONFIG_NRF70_STA_MODE */
 

drivers/wifi/nrf_wifi/src/wpa_supp_if.c

@@ -2035,7 +2035,7 @@ void nrf_wifi_supp_event_remain_on_channel(void *if_priv,
 	if (vif_ctx_zep->supp_drv_if_ctx && vif_ctx_zep->supp_callbk_fns.roc_complete) {
 		vif_ctx_zep->supp_callbk_fns.roc_complete(vif_ctx_zep->supp_drv_if_ctx,
 				roc_complete->frequency,
-				roc_complete->dur);
+				roc_complete->dur, roc_complete->cookie);
 	}
 }
 
@@ -2064,12 +2064,12 @@ void nrf_wifi_supp_event_roc_cancel_complete(void *if_priv,
 
 	if (vif_ctx_zep->supp_drv_if_ctx && vif_ctx_zep->supp_callbk_fns.roc_cancel_complete) {
 		vif_ctx_zep->supp_callbk_fns.roc_cancel_complete(vif_ctx_zep->supp_drv_if_ctx,
-				roc_cancel_complete->frequency);
+				roc_cancel_complete->frequency, roc_cancel_complete->cookie);
 	}
 }
 
 int nrf_wifi_supp_remain_on_channel(void *if_priv, unsigned int freq,
-									unsigned int duration)
+				    unsigned int duration, u64 host_cookie)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 #ifdef NRF70_P2P_MODE
@@ -2102,6 +2102,7 @@ int nrf_wifi_supp_remain_on_channel(void *if_priv, unsigned int freq,
 	roc_info.nrf_wifi_freq_params.center_frequency2 = 0;
 	roc_info.nrf_wifi_freq_params.channel_type = NRF_WIFI_CHAN_HT20;
 	roc_info.dur = duration;
+	roc_info.host_cookie = host_cookie;
 
 	status = nrf_wifi_sys_fmac_p2p_roc_start(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
 						 &roc_info);
@@ -2115,7 +2116,7 @@ int nrf_wifi_supp_remain_on_channel(void *if_priv, unsigned int freq,
 	return status;
 }
 
-int nrf_wifi_supp_cancel_remain_on_channel(void *if_priv)
+int nrf_wifi_supp_cancel_remain_on_channel(void *if_priv, u64 cookie)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 #ifdef NRF70_P2P_MODE
@@ -2140,7 +2141,7 @@ int nrf_wifi_supp_cancel_remain_on_channel(void *if_priv)
 		goto out;
 	}
 
-	status = nrf_wifi_sys_fmac_p2p_roc_stop(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, 0);
+	status = nrf_wifi_sys_fmac_p2p_roc_stop(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, cookie);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_cancel_remain_on_channel failed", __func__);
 		goto out;