qcacld-3.0: Vote for up/down only if add/remove peer is successful

Currently, wma_add_sta status is not considered while voting for
link up in case of NDI. But if wma_add_sta fails to add a peer,
this link vote leads to stale link vote up.
Same is the case for wma_delete_sta and the return status is not
considered. This leads to a vote down of link for a non-existing
peer if peer is not present.

Below scenario leads to this situation,
1. Enable NAN and have an NDP connection between two devices.
2. Try to establish another NDP between the same devices but
   don't respond for the request on the responder side.
3. NDP timeout happens in firmware and firmware sends an
   NDP CONFIRM failure with timeout reason. This event carries
   number of NDP-peers on the peer also and firmware sends
   this as 0.
4. Driver removes the peer entry as firmware mentioned
   no.of peers left as 0. It shall vote down the link also.
5. Firmware sends NDP_END for the first NDP connection and host
   tries to delete the peer entry as part of this. But the peer
   got deleted @step-4 already and wma_delete_sta returns a
   failure now.
   As the peer is not present, corresponding link vote-down also
   should be skipped.

To avoid these, consider the return status of wma_add_sta for
link vote up and consider the return status of wma_delete_sta for
link vote down.

Change-Id: Iea40961366307f57b4f969245c0732d685d5e415
CRs-Fixed: 3108455

core/wma/src/wma_dev_if.c

@@ -5134,6 +5134,7 @@ void wma_add_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 {
 	uint8_t oper_mode = BSS_OPERATIONAL_MODE_STA;
 	void *htc_handle;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	htc_handle = lmac_get_htc_hdl(wma->psoc);
 	if (!htc_handle) {
@@ -5158,7 +5159,7 @@ void wma_add_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 		wma_add_sta_req_ap_mode(wma, add_sta);
 		break;
 	case BSS_OPERATIONAL_MODE_NDI:
-		wma_add_sta_ndi_mode(wma, add_sta);
+		status = wma_add_sta_ndi_mode(wma, add_sta);
 		break;
 	}
 
@@ -5199,7 +5200,8 @@ void wma_add_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 	}
 
 	/* handle wow for nan with 1 or more peer in same way */
-	if (BSS_OPERATIONAL_MODE_NDI == oper_mode) {
+	if (BSS_OPERATIONAL_MODE_NDI == oper_mode &&
+	    QDF_IS_STATUS_SUCCESS(status)) {
 		wma_debug("disable runtime pm and vote for link up");
 		htc_vote_link_up(htc_handle, HTC_LINK_VOTE_NDP_USER_ID);
 		wma_ndp_prevent_runtime_pm(wma);
@@ -5215,6 +5217,7 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta)
 	uint8_t vdev_id = del_sta->smesessionId;
 	bool rsp_requested = del_sta->respReqd;
 	void *htc_handle;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	htc_handle = lmac_get_htc_hdl(wma->psoc);
 	if (!htc_handle) {
@@ -5254,7 +5257,7 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta)
 			qdf_mem_free(del_sta);
 		break;
 	case BSS_OPERATIONAL_MODE_NDI:
-		wma_delete_sta_req_ndi_mode(wma, del_sta);
+		status = wma_delete_sta_req_ndi_mode(wma, del_sta);
 		break;
 	default:
 		wma_err("Incorrect oper mode %d", oper_mode);
@@ -5297,7 +5300,8 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta)
 		return;
 	}
 
-	if (BSS_OPERATIONAL_MODE_NDI == oper_mode) {
+	if (BSS_OPERATIONAL_MODE_NDI == oper_mode &&
+	    QDF_IS_STATUS_SUCCESS(status)) {
 		wma_debug("allow runtime pm and vote for link down");
 		htc_vote_link_down(htc_handle, HTC_LINK_VOTE_NDP_USER_ID);
 		wma_ndp_allow_runtime_pm(wma);

core/wma/src/wma_nan_datapath.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -34,15 +35,7 @@
 #include "cdp_txrx_misc.h"
 #include <cdp_txrx_handle.h>
 
-/**
- * wma_add_sta_ndi_mode() - Process ADD_STA for NaN Data path
- * @wma: wma handle
- * @add_sta: Parameters of ADD_STA command
- *
- * Sends CREATE_PEER command to firmware
- * Return: void
- */
-void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta)
+QDF_STATUS wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 {
 	enum ol_txrx_peer_state state = OL_TXRX_PEER_STATE_CONN;
 	uint8_t pdev_id = WMI_PDEV_ID_SOC;
@@ -106,22 +99,17 @@ send_rsp:
 	wma_debug("Sending add sta rsp to umac (mac:"QDF_MAC_ADDR_FMT", status:%d)",
 		  QDF_MAC_ADDR_REF(add_sta->staMac), add_sta->status);
 	wma_send_msg_high_priority(wma, WMA_ADD_STA_RSP, (void *)add_sta, 0);
+
+	return add_sta->status;
 }
 
-/**
- * wma_delete_sta_req_ndi_mode() - Process DEL_STA request for NDI data peer
- * @wma: WMA context
- * @del_sta: DEL_STA parameters from LIM
- *
- * Removes wma/txrx peer entry for the NDI STA
- *
- * Return: None
- */
-void wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
-					tpDeleteStaParams del_sta)
+QDF_STATUS wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
+				       tpDeleteStaParams del_sta)
 {
-	wma_remove_peer(wma, del_sta->staMac,
-			del_sta->smesessionId, false);
+	QDF_STATUS status;
+
+	status = wma_remove_peer(wma, del_sta->staMac,
+				 del_sta->smesessionId, false);
 	del_sta->status = QDF_STATUS_SUCCESS;
 
 	if (del_sta->respReqd) {
@@ -133,4 +121,5 @@ void wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
 		qdf_mem_free(del_sta);
 	}
 
+	return status;
 }

core/wma/src/wma_nan_datapath.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -46,7 +47,15 @@ static inline uint32_t wma_ndp_get_eventid_from_tlvtag(uint32_t tag)
 #define WMA_IS_VDEV_IN_NDI_MODE(intf, vdev_id) \
 				(WMI_VDEV_TYPE_NDI == intf[vdev_id].type)
 
-void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta);
+/**
+ * wma_add_sta_ndi_mode() - Process ADD_STA for NaN Data path
+ * @wma: wma handle
+ * @add_sta: Parameters of ADD_STA command
+ *
+ * Sends CREATE_PEER command to firmware
+ * Return: QDF_STATUS
+ */
+QDF_STATUS wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta);
 
 /**
  * wma_update_hdd_cfg_ndp() - Update target device NAN datapath capability
@@ -61,8 +70,17 @@ static inline void wma_update_hdd_cfg_ndp(tp_wma_handle wma_handle,
 	tgt_cfg->nan_datapath_enabled = wma_handle->nan_datapath_enabled;
 }
 
-void wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
-					tpDeleteStaParams del_sta);
+/**
+ * wma_delete_sta_req_ndi_mode() - Process DEL_STA request for NDI data peer
+ * @wma: WMA context
+ * @del_sta: DEL_STA parameters from LIM
+ *
+ * Removes wma/txrx peer entry for the NDI STA
+ *
+ * Returns: QDF_STATUS_SUCCESS if peer deletion is successful
+ */
+QDF_STATUS wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
+				       tpDeleteStaParams del_sta);
 
 /**
  * wma_is_ndi_active() - Determines of the nan data iface is active
@@ -89,12 +107,19 @@ static inline void wma_update_hdd_cfg_ndp(tp_wma_handle wma_handle,
 	return;
 }
 
-static inline void wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
-					tpDeleteStaParams del_sta)
+static inline
+QDF_STATUS wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
+				       tpDeleteStaParams del_sta)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
+static inline
+QDF_STATUS wma_add_sta_ndi_mode(tp_wma_handle wma,
+				tpAddStaParams add_sta)
 {
+	return QDF_STATUS_E_NOSUPPORT;
 }
-static inline void wma_add_sta_ndi_mode(tp_wma_handle wma,
-					tpAddStaParams add_sta) {}
 
 static inline bool wma_is_ndi_active(tp_wma_handle wma_handle) { return false; }
 #endif /* WLAN_FEATURE_NAN */