qcacmn: featurize PKTLOG send cmd under feature flag in WMI layer

Featurize PKTLOG cmd handle under feature flag FEATURE_PKTLOG
as part of CONFIG_MCL cleanup.

Change-Id: Iae8c7e7caad001d7d37a8e17c1eb892f96009066
CRs-Fixed: 2467198

wmi/inc/wmi_unified_api.h

@@ -556,7 +556,14 @@ QDF_STATUS wmi_unified_wow_add_wakeup_pattern_send(void *wmi_hdl,
 QDF_STATUS wmi_unified_wow_remove_wakeup_pattern_send(void *wmi_hdl,
 		struct wow_remove_wakeup_pattern_params *param);
 
-#ifndef CONFIG_MCL
+/**
+ *  wmi_unified_packet_log_enable_send() - WMI request stats function
+ *  @param wmi_handle : handle to WMI.
+ *  @param PKTLOG_EVENT : PKTLOG Event
+ *  @param mac_id : MAC id corresponds to pdev id
+ *
+ *  Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
 QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl,
 			WMI_HOST_PKTLOG_EVENT PKTLOG_EVENT, uint8_t mac_id);
 
@@ -575,11 +582,6 @@ QDF_STATUS wmi_unified_peer_based_pktlog_send(void *wmi_hdl,
 					      uint8_t *macaddr,
 					      uint8_t mac_id,
 					      uint8_t enb_dsb);
-#else
-QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl,
-				uint8_t macaddr[QDF_MAC_ADDR_SIZE],
-				struct packet_enable_params *param);
-#endif
 
 QDF_STATUS wmi_unified_packet_log_disable_send(void *wmi_hdl, uint8_t mac_id);
 
@@ -784,7 +786,7 @@ QDF_STATUS wmi_unified_start_oem_data_cmd(void *wmi_hdl,
 QDF_STATUS wmi_unified_dfs_phyerr_filter_offload_en_cmd(void *wmi_hdl,
 			bool dfs_phyerr_filter_offload);
 
-#ifdef CONFIG_MCL
+#if !defined(REMOVE_PKT_LOG) && defined(FEATURE_PKTLOG)
 QDF_STATUS wmi_unified_pktlog_wmi_send_cmd(void *wmi_hdl,
 				   WMI_PKTLOG_EVENT pktlog_event,
 				   uint32_t cmd_id,

wmi/inc/wmi_unified_priv.h

@@ -386,14 +386,8 @@ QDF_STATUS (*send_stats_request_cmd)(wmi_unified_t wmi_handle,
 				uint8_t macaddr[QDF_MAC_ADDR_SIZE],
 				struct stats_request_params *param);
 
-#ifdef CONFIG_WIN
 QDF_STATUS (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle,
 			WMI_HOST_PKTLOG_EVENT PKTLOG_EVENT, uint8_t mac_id);
-#else
-QDF_STATUS (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle,
-				uint8_t macaddr[QDF_MAC_ADDR_SIZE],
-				struct packet_enable_params *param);
-#endif
 
 QDF_STATUS (*send_packet_log_disable_cmd)(wmi_unified_t wmi_handle,
 	uint8_t mac_id);
@@ -788,7 +782,9 @@ QDF_STATUS (*send_config_packet_filter_cmd)(wmi_unified_t wmi_handle,
 #ifdef CONFIG_MCL
 QDF_STATUS (*send_bcn_buf_ll_cmd)(wmi_unified_t wmi_handle,
 			wmi_bcn_send_from_host_cmd_fixed_param * param);
+#endif
 
+#if !defined(REMOVE_PKT_LOG) && defined(FEATURE_PKTLOG)
 QDF_STATUS (*send_pktlog_wmi_send_cmd)(wmi_unified_t wmi_handle,
 				   WMI_PKTLOG_EVENT pktlog_event,
 				   WMI_CMD_ID cmd_id, uint8_t user_triggered);

wmi/src/wmi_unified_api.c

@@ -692,36 +692,6 @@ QDF_STATUS wmi_unified_stats_request_send(wmi_unified_t wmi_handle,
 	return QDF_STATUS_E_FAILURE;
 }
 
-#ifdef CONFIG_MCL
-/**
- *  wmi_unified_packet_log_enable_send() - WMI request stats function
- *  @param wmi_handle      : handle to WMI.
- *  @param macaddr        : MAC address
- *  @param param    : pointer to hold stats request parameter
- *
- *  Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl,
-				uint8_t macaddr[QDF_MAC_ADDR_SIZE],
-				struct packet_enable_params *param)
-{
-	wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
-
-	if (wmi_handle->ops->send_packet_log_enable_cmd)
-		return wmi_handle->ops->send_packet_log_enable_cmd(wmi_handle,
-				  macaddr, param);
-
-	return QDF_STATUS_E_FAILURE;
-}
-#else
-/**
- *  wmi_unified_packet_log_enable_send() - WMI request stats function
- *  @param wmi_handle      : handle to WMI.
- *  @param macaddr        : MAC address
- *  @param param    : pointer to hold stats request parameter
- *
- *  Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
 QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl,
 			WMI_HOST_PKTLOG_EVENT PKTLOG_EVENT, uint8_t mac_id)
 {
@@ -758,7 +728,7 @@ QDF_STATUS wmi_unified_peer_based_pktlog_send(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
-#endif
+
 /**
  *  wmi_unified_packet_log_disable__send() - WMI pktlog disable function
  *  @param wmi_handle      : handle to WMI.
@@ -1090,7 +1060,6 @@ QDF_STATUS wmi_unified_lro_config_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
-#ifdef CONFIG_MCL
 /**
  * wmi_unified_peer_rate_report_cmd() - process the peer rate report command
  * @wmi_hdl: Pointer to wmi handle
@@ -1110,7 +1079,6 @@ QDF_STATUS wmi_unified_peer_rate_report_cmd(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
-#endif
 
 /**
  * wmi_unified_process_update_edca_param() - update EDCA params
@@ -1501,16 +1469,16 @@ wmi_unified_dfs_phyerr_filter_offload_en_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
-#if !defined(REMOVE_PKT_LOG)
+#if !defined(REMOVE_PKT_LOG) && defined(FEATURE_PKTLOG)
 /**
  * wmi_unified_pktlog_wmi_send_cmd() - send pktlog enable/disable command to target
  * @wmi_handle: wmi handle
  * @pktlog_event: pktlog event
  * @cmd_id: pktlog cmd id
+ * @user_triggered: user triggered input for PKTLOG enable mode
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
-#ifdef CONFIG_MCL
 QDF_STATUS wmi_unified_pktlog_wmi_send_cmd(void *wmi_hdl,
 				   WMI_PKTLOG_EVENT pktlog_event,
 				   uint32_t cmd_id,
@@ -1524,8 +1492,7 @@ QDF_STATUS wmi_unified_pktlog_wmi_send_cmd(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
-#endif
-#endif /* REMOVE_PKT_LOG */
+#endif /* !REMOVE_PKT_LOG && FEATURE_PKTLOG */
 
 /**
  * wmi_unified_stats_ext_req_cmd() - request ext stats from fw

wmi/src/wmi_unified_tlv.c

@@ -2028,8 +2028,6 @@ static QDF_STATUS send_stats_request_cmd_tlv(wmi_unified_t wmi_handle,
 	return ret;
 }
 
-#ifdef CONFIG_WIN
-
 /**
  *  send_peer_based_pktlog_cmd() - Send WMI command to enable packet-log
  *  @wmi_handle: handle to WMI.
@@ -2164,53 +2162,6 @@ static QDF_STATUS send_packet_log_disable_cmd_tlv(wmi_unified_t wmi_handle,
 
 	return ret;
 }
-#else
-/**
- *  send_packet_log_enable_cmd_tlv() - Send WMI command to enable
- *  packet-log
- *  @param wmi_handle      : handle to WMI.
- *  @param macaddr	: MAC address
- *  @param param    : pointer to hold stats request parameter
- *
- *  Return: QDF_STATUS.
- */
-static QDF_STATUS send_packet_log_enable_cmd_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[QDF_MAC_ADDR_SIZE],
-				struct packet_enable_params *param)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-/**
- *  send_peer_based_pktlog_cmd() - Send WMI command to enable packet-log
- *  @wmi_handle: handle to WMI.
- *  @macaddr: Peer mac address to be filter
- *  @mac_id: mac id to have radio context
- *  @enb_dsb: Enable MAC based filtering or Disable
- *
- *  Return: QDF_STATUS
- */
-static QDF_STATUS send_peer_based_pktlog_cmd(wmi_unified_t wmi_handle,
-					     uint8_t *macaddr,
-					     uint8_t mac_id,
-					     uint8_t enb_dsb)
-{
-	return QDF_STATUS_SUCCESS;
-}
-/**
- *  send_packet_log_disable_cmd_tlv() - Send WMI command to disable
- *  packet-log
- *  @param wmi_handle      : handle to WMI.
- *  @mac_id: mac id to have radio context
- *
- *  Return: QDF_STATUS.
- */
-static QDF_STATUS send_packet_log_disable_cmd_tlv(wmi_unified_t wmi_handle,
-				uint8_t mac_id)
-{
-	return QDF_STATUS_SUCCESS;
-}
-#endif
 
 #define WMI_FW_TIME_STAMP_LOW_MASK 0xffffffff
 /**
@@ -5474,12 +5425,13 @@ send_dfs_phyerr_filter_offload_en_cmd_tlv(wmi_unified_t wmi_handle,
 	return QDF_STATUS_SUCCESS;
 }
 
-#if !defined(REMOVE_PKT_LOG) && defined(CONFIG_MCL)
+#if !defined(REMOVE_PKT_LOG) && defined(FEATURE_PKTLOG)
 /**
  * send_pktlog_wmi_send_cmd_tlv() - send pktlog enable/disable command to target
  * @wmi_handle: wmi handle
  * @pktlog_event: pktlog event
  * @cmd_id: pktlog cmd id
+ * @user_triggered: user triggered input for PKTLOG enable mode
  *
  * Return: CDF status
  */
@@ -5555,7 +5507,7 @@ wmi_send_failed:
 	wmi_buf_free(buf);
 	return QDF_STATUS_E_FAILURE;
 }
-#endif /* !REMOVE_PKT_LOG &&  CONFIG_MCL*/
+#endif /* !REMOVE_PKT_LOG && FEATURE_PKTLOG */
 
 /**
  * send_stats_ext_req_cmd_tlv() - request ext stats from fw
@@ -11703,9 +11655,9 @@ struct wmi_ops tlv_ops =  {
 	.send_link_status_req_cmd = send_link_status_req_cmd_tlv,
 #ifdef CONFIG_MCL
 	.send_bcn_buf_ll_cmd = send_bcn_buf_ll_cmd_tlv,
-#ifndef REMOVE_PKT_LOG
-	.send_pktlog_wmi_send_cmd = send_pktlog_wmi_send_cmd_tlv,
 #endif
+#if !defined(REMOVE_PKT_LOG) && defined(FEATURE_PKTLOG)
+	.send_pktlog_wmi_send_cmd = send_pktlog_wmi_send_cmd_tlv,
 #endif
 #ifdef WLAN_SUPPORT_GREEN_AP
 	.send_egap_conf_params_cmd = send_egap_conf_params_cmd_tlv,