Browse Source

qcacld-3.0: Don't register vdev start stop delete event in wma_open

Vdev start/stop/delete events have been registered in
target_if_vdev_mgr_wmi_event_register in MCL/WIN common code.

Change MACRO name SERIALIZE_VDEV_RESP_TIMER to
SERIALIZE_VDEV_RESP.

Change-Id: I4d54a4755d7311b488f12f46a73db7e4645a4e0b
CRs-Fixed: 2554732
Jianmin Zhu 5 years ago
parent
commit
bc99999c41
3 changed files with 8 additions and 25 deletions
  1. 1 1
      Kbuild
  2. 3 3
      core/wma/inc/wma.h
  3. 4 21
      core/wma/src/wma_main.c

+ 1 - 1
Kbuild

@@ -2970,7 +2970,7 @@ cppflags-y += -DFEATURE_NBUFF_REPLENISH_TIMER
 cppflags-y += -DPEER_CACHE_RX_PKTS
 cppflags-y += -DPCIE_REG_WINDOW_LOCAL_NO_CACHE
 
-cppflags-y += -DSERIALIZE_VDEV_RESP_TIMER
+cppflags-y += -DSERIALIZE_VDEV_RESP
 cppflags-y += -DTGT_IF_VDEV_MGR_CONV
 
 cppflags-y += -DCONFIG_CHAN_NUM_API

+ 3 - 3
core/wma/inc/wma.h

@@ -421,9 +421,9 @@ typedef void (*txFailIndCallback)(uint8_t *peer_mac, uint8_t seqNo);
  *
  */
 enum wma_rx_exec_ctx {
-	WMA_RX_WORK_CTX,
-	WMA_RX_TASKLET_CTX,
-	WMA_RX_SERIALIZER_CTX
+	WMA_RX_WORK_CTX = WMI_RX_WORK_CTX,
+	WMA_RX_TASKLET_CTX = WMI_RX_TASKLET_CTX,
+	WMA_RX_SERIALIZER_CTX = WMI_RX_SERIALIZER_CTX,
 };
 
 /**

+ 4 - 21
core/wma/src/wma_main.c

@@ -1563,10 +1563,11 @@ uint32_t wma_critical_events_in_flight(void)
 	t_wma_handle *wma;
 
 	wma = cds_get_context(QDF_MODULE_ID_WMA);
-	if (!wma)
+	if (!wma || !wma->wmi_handle) {
+		WMA_LOGE("Invalid wma or wmi handle");
 		return 0;
-
-	return qdf_atomic_read(&wma->critical_events_in_flight);
+	}
+	return wmi_critical_events_in_flight(wma->wmi_handle);
 }
 
 static bool wma_event_is_critical(uint32_t event_id)
@@ -3367,19 +3368,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 	qdf_spinlock_create(&wma_handle->wma_hold_req_q_lock);
 	qdf_atomic_init(&wma_handle->is_wow_bus_suspended);
 
-	/* Register vdev start response event handler */
-	wmi_unified_register_event_handler(wma_handle->wmi_handle,
-					   wmi_vdev_start_resp_event_id,
-					   target_if_vdev_mgr_start_response_handler,
-					   WMA_RX_SERIALIZER_CTX);
-
-	/* Register vdev stop response event handler */
-	wmi_unified_register_event_handler(
-				wma_handle->wmi_handle,
-				wmi_vdev_stopped_event_id,
-				target_if_vdev_mgr_stop_response_handler,
-				WMA_RX_SERIALIZER_CTX);
-
 	/* register for STA kickout function */
 	wmi_unified_register_event_handler(wma_handle->wmi_handle,
 					   wmi_peer_sta_kickout_event_id,
@@ -3538,11 +3526,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 					   wmi_peer_assoc_conf_event_id,
 					   wma_peer_assoc_conf_handler,
 					   WMA_RX_SERIALIZER_CTX);
-	wmi_unified_register_event_handler(
-				wma_handle->wmi_handle,
-				wmi_vdev_delete_resp_event_id,
-				target_if_vdev_mgr_delete_response_handler,
-				WMA_RX_SERIALIZER_CTX);
 	wmi_unified_register_event_handler(wma_handle->wmi_handle,
 					   wmi_peer_delete_response_event_id,
 					   wma_peer_delete_handler,