From 0ffa79f0a44c60cfd0b004eb332595ebc976ccc9 Mon Sep 17 00:00:00 2001 From: Ripan Deuri Date: Tue, 7 Jun 2022 12:50:43 +0530 Subject: [PATCH] qcacmn: Use CONFIG_SAWF macro for enabling HW Tx Delay Use CONFIG_SAWF macro to prevent linking dp_set_delta_tsf in low memory profile. Change-Id: I07b75f893e6d043839225d9b7288823b6ef2f823 CRs-Fixed: 3211426 --- dp/inc/cdp_txrx_ctrl.h | 2 +- dp/inc/cdp_txrx_ops.h | 2 +- dp/wifi3.0/dp_main.c | 2 +- dp/wifi3.0/dp_tx.c | 2 +- dp/wifi3.0/dp_tx.h | 2 +- dp/wifi3.0/dp_types.h | 2 +- hal/wifi3.0/hal_tx.h | 2 +- hal/wifi3.0/li/hal_li_generic_api.h | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dp/inc/cdp_txrx_ctrl.h b/dp/inc/cdp_txrx_ctrl.h index 6206058129..82e589e130 100644 --- a/dp/inc/cdp_txrx_ctrl.h +++ b/dp/inc/cdp_txrx_ctrl.h @@ -1321,7 +1321,7 @@ void cdp_txrx_peer_flush_frags(ol_txrx_soc_handle soc, uint8_t vdev_id, peer_mac); } -#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(QCA_PEER_EXT_STATS) +#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(CONFIG_SAWF) /** * cdp_set_delta_tsf() - wrapper function to set delta_tsf * @soc: SOC TXRX handle diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h index 04472f6035..88f951f323 100644 --- a/dp/inc/cdp_txrx_ops.h +++ b/dp/inc/cdp_txrx_ops.h @@ -882,7 +882,7 @@ struct cdp_ctrl_ops { #endif -#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(QCA_PEER_EXT_STATS) +#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(CONFIG_SAWF) void (*txrx_set_delta_tsf)(struct cdp_soc_t *soc, uint8_t vdev_id, uint32_t delta_tsf); #endif diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index d364611ea4..fc721000f8 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -12682,7 +12682,7 @@ static struct cdp_ctrl_ops dp_ops_ctrl = { #ifdef QCA_MULTIPASS_SUPPORT .txrx_peer_set_vlan_id = dp_peer_set_vlan_id, #endif /*QCA_MULTIPASS_SUPPORT*/ -#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(QCA_PEER_EXT_STATS) +#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(CONFIG_SAWF) .txrx_set_delta_tsf = dp_set_delta_tsf, #endif #ifdef WLAN_FEATURE_TSF_UPLINK_DELAY diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 83bb9230fb..0ce9aee303 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -4543,7 +4543,7 @@ void dp_tx_update_connectivity_stats(struct dp_soc *soc, } #endif -#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(QCA_PEER_EXT_STATS) +#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(CONFIG_SAWF) QDF_STATUS dp_tx_compute_hw_delay_us(struct hal_tx_completion_status *ts, uint32_t delta_tsf, diff --git a/dp/wifi3.0/dp_tx.h b/dp/wifi3.0/dp_tx.h index 5e9f05f70f..c44daf0954 100644 --- a/dp/wifi3.0/dp_tx.h +++ b/dp/wifi3.0/dp_tx.h @@ -916,7 +916,7 @@ dp_tx_hw_desc_update_evt(uint8_t *hal_tx_desc_cached, } #endif -#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(QCA_PEER_EXT_STATS) +#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(CONFIG_SAWF) /** * dp_tx_compute_hw_delay_us() - Compute hardware Tx completion delay * @ts: Tx completion status diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h index da06c525d1..deede7c657 100644 --- a/dp/wifi3.0/dp_types.h +++ b/dp/wifi3.0/dp_types.h @@ -3216,7 +3216,7 @@ struct dp_vdev { #ifdef WIFI_MONITOR_SUPPORT struct dp_mon_vdev *monitor_vdev; #endif -#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(QCA_PEER_EXT_STATS) +#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(CONFIG_SAWF) /* Delta between TQM clock and TSF clock */ uint32_t delta_tsf; #endif diff --git a/hal/wifi3.0/hal_tx.h b/hal/wifi3.0/hal_tx.h index 5bd694af3b..143d732a9f 100644 --- a/hal/wifi3.0/hal_tx.h +++ b/hal/wifi3.0/hal_tx.h @@ -233,7 +233,7 @@ struct hal_tx_completion_status { uint8_t transmit_cnt; uint8_t tid; uint16_t peer_id; -#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(QCA_PEER_EXT_STATS) +#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(CONFIG_SAWF) uint32_t buffer_timestamp:19; #endif }; diff --git a/hal/wifi3.0/li/hal_li_generic_api.h b/hal/wifi3.0/li/hal_li_generic_api.h index 078a7eb234..132bd4e60e 100644 --- a/hal/wifi3.0/li/hal_li_generic_api.h +++ b/hal/wifi3.0/li/hal_li_generic_api.h @@ -69,7 +69,7 @@ void hal_rx_wbm_err_info_get_generic_li(void *wbm_desc, wbm_er_info->rxdma_err_code = HAL_RX_WBM_RXDMA_ERROR_CODE_GET(wbm_desc); } -#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(QCA_PEER_EXT_STATS) +#if defined(WLAN_FEATURE_TSF_UPLINK_DELAY) || defined(CONFIG_SAWF) static inline void hal_tx_comp_get_buffer_timestamp(void *desc, struct hal_tx_completion_status *ts) @@ -77,13 +77,13 @@ hal_tx_comp_get_buffer_timestamp(void *desc, ts->buffer_timestamp = HAL_TX_DESC_GET(desc, WBM_RELEASE_RING_4, BUFFER_TIMESTAMP); } -#else /* !WLAN_FEATURE_TSF_UPLINK_DELAY || QCA_PEER_EXT_STATS */ +#else /* !WLAN_FEATURE_TSF_UPLINK_DELAY || CONFIG_SAWF */ static inline void hal_tx_comp_get_buffer_timestamp(void *desc, struct hal_tx_completion_status *ts) { } -#endif /* WLAN_FEATURE_TSF_UPLINK_DELAY || QCA_PEER_EXT_STATS */ +#endif /* WLAN_FEATURE_TSF_UPLINK_DELAY || CONFIG_SAWF */ #ifdef QCA_UNDECODED_METADATA_SUPPORT static inline void