samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Use correct set of macros for Rx monitor dependent features

Browse Source 
Use correct set of macros for Rx monitor dependent features.

Change-Id: I51833852811bb339afd284a1291460ec827fe6e5
CRs-Fixed: 3169125
This commit is contained in:
Harsh Kumar Bijlani
2022-04-07 17:21:01 +05:30
committed by Wade Song
parent debe09f974
commit ad3d4de01a
4 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dp/wifi3.0/monitor/1.0/dp_mon_1.0.c
View File

@@ -877,9 +877,8 @@ dp_set_bpr_enable_1_0(struct dp_pdev *pdev, int val)
}
#endif
#if defined(WDI_EVENT_ENABLE) &&\
(defined(QCA_ENHANCED_STATS_SUPPORT) || !defined(REMOVE_PKT_LOG))
#ifndef WLAN_TX_PKT_CAPTURE_ENH
#ifdef QCA_ENHANCED_STATS_SUPPORT
#if defined(WDI_EVENT_ENABLE) && !defined(WLAN_TX_PKT_CAPTURE_ENH)
/**
* dp_ppdu_desc_notify_1_0 - Notify upper layer for PPDU indication via WDI
*
@@ -1040,14 +1039,6 @@ dp_mon_register_feature_ops_1_0(struct dp_soc *soc)
#if defined(WDI_EVENT_ENABLE) &&\
(defined(QCA_ENHANCED_STATS_SUPPORT) || !defined(REMOVE_PKT_LOG))
mon_ops->mon_ppdu_stats_ind_handler = dp_ppdu_stats_ind_handler;
#ifndef WLAN_TX_PKT_CAPTURE_ENH
mon_ops->mon_ppdu_desc_deliver = dp_ppdu_desc_deliver;
mon_ops->mon_ppdu_desc_notify = dp_ppdu_desc_notify_1_0;
#else
mon_ops->mon_ppdu_desc_deliver = dp_ppdu_desc_deliver_1_0;
#endif
mon_ops->mon_ppdu_stats_feat_enable_check =
dp_ppdu_stats_feat_enable_check_1_0;
#endif
#ifdef WLAN_RX_PKT_CAPTURE_ENH
mon_ops->mon_config_enh_rx_capture = dp_config_enh_rx_capture;
@@ -1080,6 +1071,16 @@ dp_mon_register_feature_ops_1_0(struct dp_soc *soc)
dp_mon_tx_enable_enhanced_stats_1_0;
mon_ops->mon_tx_disable_enhanced_stats =
dp_mon_tx_disable_enhanced_stats_1_0;
mon_ops->mon_ppdu_stats_feat_enable_check =
dp_ppdu_stats_feat_enable_check_1_0;
#ifndef WLAN_TX_PKT_CAPTURE_ENH
mon_ops->mon_ppdu_desc_deliver = dp_ppdu_desc_deliver;
#ifdef WDI_EVENT_ENABLE
mon_ops->mon_ppdu_desc_notify = dp_ppdu_desc_notify_1_0;
#endif
#else
mon_ops->mon_ppdu_desc_deliver = dp_ppdu_desc_deliver_1_0;
#endif
#ifdef WLAN_FEATURE_11BE
mon_ops->mon_tx_stats_update = NULL;
#endif

15
dp/wifi3.0/monitor/2.0/dp_mon_2.0.c
View File

@@ -536,8 +536,8 @@ dp_set_bpr_enable_2_0(struct dp_pdev *pdev, int val)
}
#endif /* QCA_SUPPORT_BPR */
#if defined(WDI_EVENT_ENABLE) &&\
(defined(QCA_ENHANCED_STATS_SUPPORT) || !defined(REMOVE_PKT_LOG))
#ifdef QCA_ENHANCED_STATS_SUPPORT
#ifdef WDI_EVENT_ENABLE
/**
* dp_ppdu_desc_notify_2_0 - Notify upper layer for PPDU indication via WDI
*
@@ -563,6 +563,7 @@ static void dp_ppdu_desc_notify_2_0(struct dp_pdev *pdev, qdf_nbuf_t nbuf)
qdf_nbuf_free(nbuf);
}
}
#endif
/**
* dp_ppdu_stats_feat_enable_check_2_0 - Check if feature(s) is enabled to
@@ -1145,10 +1146,6 @@ dp_mon_register_feature_ops_2_0(struct dp_soc *soc)
#if defined(WDI_EVENT_ENABLE) &&\
(defined(QCA_ENHANCED_STATS_SUPPORT) || !defined(REMOVE_PKT_LOG))
mon_ops->mon_ppdu_stats_ind_handler = dp_ppdu_stats_ind_handler;
mon_ops->mon_ppdu_desc_deliver = dp_ppdu_desc_deliver;
mon_ops->mon_ppdu_desc_notify = dp_ppdu_desc_notify_2_0;
mon_ops->mon_ppdu_stats_feat_enable_check =
dp_ppdu_stats_feat_enable_check_2_0;
#endif
#ifdef WLAN_RX_PKT_CAPTURE_ENH
mon_ops->mon_config_enh_rx_capture = NULL;
@@ -1181,7 +1178,13 @@ dp_mon_register_feature_ops_2_0(struct dp_soc *soc)
dp_mon_tx_enable_enhanced_stats_2_0;
mon_ops->mon_tx_disable_enhanced_stats =
dp_mon_tx_disable_enhanced_stats_2_0;
mon_ops->mon_ppdu_stats_feat_enable_check =
dp_ppdu_stats_feat_enable_check_2_0;
mon_ops->mon_tx_stats_update = dp_mon_tx_stats_update_2_0;
mon_ops->mon_ppdu_desc_deliver = dp_ppdu_desc_deliver;
#ifdef WDI_EVENT_ENABLE
mon_ops->mon_ppdu_desc_notify = dp_ppdu_desc_notify_2_0;
#endif
#endif
#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC)
mon_ops->mon_filter_setup_smart_monitor =

10
dp/wifi3.0/monitor/dp_mon.c
View File

@@ -4555,7 +4555,6 @@ static struct ppdu_info *dp_htt_process_tlv(struct dp_pdev *pdev,
}
#endif /* QCA_ENHANCED_STATS_SUPPORT */
#if defined(WDI_EVENT_ENABLE)
#ifdef QCA_ENHANCED_STATS_SUPPORT
/**
* dp_tx_ppdu_stats_feat_enable_check() - Check if feature(s) is enabled to
@@ -4575,7 +4574,10 @@ static bool dp_tx_ppdu_stats_feat_enable_check(struct dp_pdev *pdev)
else
return false;
}
#endif
#if defined(WDI_EVENT_ENABLE)
#ifdef QCA_ENHANCED_STATS_SUPPORT
/**
* dp_txrx_ppdu_stats_handler() - Function to process HTT PPDU stats from FW
* @soc: DP SOC handle
@@ -5619,9 +5621,6 @@ void dp_mon_feature_ops_deregister(struct dp_soc *soc)
#if defined(WDI_EVENT_ENABLE) &&\
(defined(QCA_ENHANCED_STATS_SUPPORT) || !defined(REMOVE_PKT_LOG))
mon_ops->mon_ppdu_stats_ind_handler = NULL;
mon_ops->mon_ppdu_desc_deliver = NULL;
mon_ops->mon_ppdu_desc_notify = NULL;
mon_ops->mon_ppdu_stats_feat_enable_check = NULL;
#endif
#ifdef WLAN_RX_PKT_CAPTURE_ENH
mon_ops->mon_config_enh_rx_capture = NULL;
@@ -5647,6 +5646,9 @@ void dp_mon_feature_ops_deregister(struct dp_soc *soc)
mon_ops->mon_filter_setup_enhanced_stats = NULL;
mon_ops->mon_tx_enable_enhanced_stats = NULL;
mon_ops->mon_tx_disable_enhanced_stats = NULL;
mon_ops->mon_ppdu_desc_deliver = NULL;
mon_ops->mon_ppdu_desc_notify = NULL;
mon_ops->mon_ppdu_stats_feat_enable_check = NULL;
#ifdef WLAN_FEATURE_11BE
mon_ops->mon_tx_stats_update = NULL;
#endif

13
dp/wifi3.0/monitor/dp_mon.h
View File

@@ -514,8 +514,10 @@ dp_vdev_set_monitor_mode_rings(struct dp_pdev *pdev,
bool dp_ppdu_stats_ind_handler(struct htt_soc *soc,
uint32_t *msg_word,
qdf_nbuf_t htt_t2h_msg);
#endif
#if !defined(WLAN_TX_PKT_CAPTURE_ENH) || defined(QCA_MONITOR_2_0_SUPPORT)
#if defined(QCA_ENHANCED_STATS_SUPPORT) && \
(!defined(WLAN_TX_PKT_CAPTURE_ENH) || defined(QCA_MONITOR_2_0_SUPPORT))
/**
* dp_ppdu_desc_deliver(): Function to deliver Tx PPDU status descriptor
* to upper layer
@@ -526,7 +528,6 @@ bool dp_ppdu_stats_ind_handler(struct htt_soc *soc,
*/
void dp_ppdu_desc_deliver(struct dp_pdev *pdev, struct ppdu_info *ppdu_info);
#endif
#endif
struct dp_mon_ops {
QDF_STATUS (*mon_soc_cfg_init)(struct dp_soc *soc);
@@ -611,10 +612,6 @@ struct dp_mon_ops {
bool (*mon_ppdu_stats_ind_handler)(struct htt_soc *soc,
uint32_t *msg_word,
qdf_nbuf_t htt_t2h_msg);
void (*mon_ppdu_desc_deliver)(struct dp_pdev *pdev,
struct ppdu_info *ppdu_info);
void (*mon_ppdu_desc_notify)(struct dp_pdev *pdev, qdf_nbuf_t nbuf);
bool (*mon_ppdu_stats_feat_enable_check)(struct dp_pdev *pdev);
#endif
QDF_STATUS (*mon_htt_ppdu_stats_attach)(struct dp_pdev *pdev);
void (*mon_htt_ppdu_stats_detach)(struct dp_pdev *pdev);
@@ -687,6 +684,10 @@ struct dp_mon_ops {
struct cdp_tx_completion_ppdu_user *ppdu);
void (*mon_tx_enable_enhanced_stats)(struct dp_pdev *pdev);
void (*mon_tx_disable_enhanced_stats)(struct dp_pdev *pdev);
void (*mon_ppdu_desc_deliver)(struct dp_pdev *pdev,
struct ppdu_info *ppdu_info);
bool (*mon_ppdu_stats_feat_enable_check)(struct dp_pdev *pdev);
void (*mon_ppdu_desc_notify)(struct dp_pdev *pdev, qdf_nbuf_t nbuf);
#endif
#ifdef QCA_MCOPY_SUPPORT
void (*mon_filter_setup_mcopy_mode)(struct dp_pdev *pdev);