Эх сурвалжийг харах

qcacld-3.0: Remove flag CONFIG_PER_VDEV_TX_DESC_POOL

Remove flag CONFIG_PER_VDEV_TX_DESC_POOL.
Legacy per vdev flow control implementation under
CONFIG_PER_VDEV_TX_DESC_POOL was never used in cld3.0 driver.
For a Genoa a new per vdev flow control implementation for HL systems,
was added under the flag QCA_HL_NETDEV_FLOW_CONTROL.
Hence remove CONFIG_PER_VDEV_TX_DESC_POOL and replace it with
QCA_HL_NETDEV_FLOW_CONTROL or QCA_LL_LEGACY_TX_FLOW_CONTROL whereever
applicable.

Change-Id: Ibdf88e60cff7d3be46924ce7605f468781b5b856
CRs-Fixed: 2373790
Ajit Pal Singh 6 жил өмнө
parent
commit
f9a4a38bcf

+ 0 - 1
Kbuild

@@ -2180,7 +2180,6 @@ cppflags-$(CONFIG_FEATURE_HL_DBS_GROUP_CREDIT_SHARING) += -DFEATURE_HL_DBS_GROUP
 cppflags-$(CONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE) += -DCONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE
 
 cppflags-$(CONFIG_TX_DESC_HI_PRIO_RESERVE) += -DCONFIG_TX_DESC_HI_PRIO_RESERVE
-cppflags-$(CONFIG_PER_VDEV_TX_DESC_POOL) += -DCONFIG_PER_VDEV_TX_DESC_POOL
 
 #Enable FW logs through ini
 cppflags-y += -DCONFIG_FW_LOGS_BASED_ON_INI

+ 0 - 1
configs/default_defconfig

@@ -424,7 +424,6 @@ endif
 ifeq ($(CONFIG_ROME_IF),sdio)
 	CONFIG_HIF_SDIO := y
 	CONFIG_TX_DESC_HI_PRIO_RESERVE := y
-	CONFIG_PER_VDEV_TX_DESC_POOL := y
 	CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL := y
 	CONFIG_TGT_NUM_MSDU_DESC := 0
 endif

+ 1 - 1
core/dp/txrx/ol_tx_hl.c

@@ -227,7 +227,7 @@ struct ol_tx_desc_t *ol_tx_hl_desc_alloc(struct ol_txrx_pdev_t *pdev,
 }
 #endif
 
-#ifdef CONFIG_PER_VDEV_TX_DESC_POOL
+#ifdef QCA_HL_NETDEV_FLOW_CONTROL
 /**
  * ol_txrx_rsrc_threshold_lo() - set threshold low - when to start tx desc
  *				 margin replenishment

+ 1 - 1
core/dp/txrx/ol_txrx.h

@@ -98,7 +98,7 @@ ol_tx_desc_pool_size_hl(struct cdp_cfg *ctrl_pdev);
 #define FW_STATS_DESC_POOL_SIZE 10
 #endif
 
-#ifdef CONFIG_PER_VDEV_TX_DESC_POOL
+#ifdef QCA_HL_NETDEV_FLOW_CONTROL
 #define TXRX_HL_TX_FLOW_CTRL_VDEV_LOW_WATER_MARK 400
 #define TXRX_HL_TX_FLOW_CTRL_MGMT_RESERVED 100
 #endif

+ 0 - 9
core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -102,8 +102,6 @@ void hdd_softap_tx_resume_timer_expired_handler(void *adapter_context)
 				     WLAN_CONTROL_PATH);
 }
 
-#if defined(CONFIG_PER_VDEV_TX_DESC_POOL)
-
 /**
  * hdd_softap_tx_resume_false() - Resume OS TX Q false leads to queue disabling
  * @adapter: pointer to hdd adapter
@@ -136,13 +134,6 @@ hdd_softap_tx_resume_false(struct hdd_adapter *adapter, bool tx_resume)
 			adapter->hdd_stats.tx_rx_stats.txflow_timer_cnt++;
 	}
 }
-#else
-
-static inline void
-hdd_softap_tx_resume_false(struct hdd_adapter *adapter, bool tx_resume)
-{
-}
-#endif
 
 void hdd_softap_tx_resume_cb(void *adapter_context, bool tx_resume)
 {

+ 0 - 8
core/hdd/src/wlan_hdd_tx_rx.c

@@ -181,7 +181,6 @@ void hdd_tx_resume_timer_expired_handler(void *adapter_context)
 	wlan_hdd_netif_queue_control(adapter, WLAN_WAKE_ALL_NETIF_QUEUE,
 				     WLAN_CONTROL_PATH);
 }
-#if defined(CONFIG_PER_VDEV_TX_DESC_POOL)
 
 /**
  * hdd_tx_resume_false() - Resume OS TX Q false leads to queue disabling
@@ -219,13 +218,6 @@ hdd_tx_resume_false(struct hdd_adapter *adapter, bool tx_resume)
 	adapter->hdd_stats.tx_rx_stats.txflow_pause_cnt++;
 	adapter->hdd_stats.tx_rx_stats.is_txflow_paused = true;
 }
-#else
-
-static inline void
-hdd_tx_resume_false(struct hdd_adapter *adapter, bool tx_resume)
-{
-}
-#endif
 
 static inline struct sk_buff *hdd_skb_orphan(struct hdd_adapter *adapter,
 		struct sk_buff *skb)