Merge "qcacmn: Fix build error when DISABLE_MON_CONFIG is defined"

dp/wifi3.0/be/dp_be.c

@@ -405,6 +405,10 @@ dp_hw_cookie_conversion_init(struct dp_soc_be *be_soc,
 				     DP_CC_PPT_ENTRY_HW_APEND_BITS_4K_ALIGNED));
 
 		ppt_index = ppt_id_start + i;
+
+		if (ppt_index >= DP_CC_PPT_MAX_ENTRIES)
+			qdf_assert_always(0);
+
 		spt_desc[i].ppt_index = ppt_index;
 
 		be_soc->page_desc_base[ppt_index].page_v_addr =

dp/wifi3.0/dp_types.h

@@ -76,8 +76,13 @@
 
 #if defined(WLAN_MAX_PDEVS) && (WLAN_MAX_PDEVS == 1)
 #define WLAN_DP_RESET_MON_BUF_RING_FILTER
+#define MAX_TXDESC_POOLS 6
+#else
+#define MAX_TXDESC_POOLS 4
 #endif
 
+#define MAX_RXDESC_POOLS 4
+
 /* Max no. of VDEV per PSOC */
 #ifdef WLAN_PSOC_MAX_VDEVS
 #define MAX_VDEV_CNT WLAN_PSOC_MAX_VDEVS
@@ -92,9 +97,6 @@
 #define DP_PDEV_MAX_VDEVS 17
 #endif
 
-#define MAX_TXDESC_POOLS 6
-#define MAX_RXDESC_POOLS 4
-
 #define EXCEPTION_DEST_RING_ID 0
 #define MAX_IDLE_SCATTER_BUFS 16
 #define DP_MAX_IRQ_PER_CONTEXT 12

dp/wifi3.0/monitor/2.0/dp_tx_mon_2.0.c

@@ -228,7 +228,8 @@ dp_tx_mon_buf_desc_pool_init(struct dp_soc *soc)
 	uint32_t num_entries;
 
 	num_entries =
-		wlan_cfg_get_dp_soc_rx_mon_buf_ring_size(soc->wlan_cfg_ctx);
+		wlan_cfg_get_dp_soc_tx_mon_buf_ring_size(soc->wlan_cfg_ctx);
+
 	return dp_mon_desc_pool_init(&mon_soc_be->tx_desc_mon, num_entries);
 }
 

dp/wifi3.0/monitor/dp_mon.h

@@ -2344,11 +2344,13 @@ dp_tx_mon_process(struct dp_soc *soc, struct dp_intr *int_ctx,
 static inline
 uint32_t dp_tx_mon_buf_refill(struct dp_intr *int_ctx)
 {
+	return 0;
 }
 
 static inline
 uint32_t dp_rx_mon_buf_refill(struct dp_intr *int_ctx)
 {
+	return 0;
 }
 #endif
 

wlan_cfg/cfg_dp.h

@@ -342,7 +342,7 @@
 #define WLAN_CFG_RXDMA_MONITOR_BUF_RING_SIZE_MIN 16
 #define WLAN_CFG_RXDMA_MONITOR_BUF_RING_SIZE_MAX 8192
 
-#define WLAN_CFG_TX_MONITOR_BUF_RING_SIZE 8192
+#define WLAN_CFG_TX_MONITOR_BUF_RING_SIZE 4096
 #define WLAN_CFG_TX_MONITOR_BUF_RING_SIZE_MIN 16
 #define WLAN_CFG_TX_MONITOR_BUF_RING_SIZE_MAX 8192
 
@@ -352,7 +352,7 @@
 
 #define WLAN_CFG_TX_MONITOR_DST_RING_SIZE 2048
 #define WLAN_CFG_TX_MONITOR_DST_RING_SIZE_MIN 48
-#define WLAN_CFG_TX_MONITOR_DST_RING_SIZE_MAX 4096
+#define WLAN_CFG_TX_MONITOR_DST_RING_SIZE_MAX 8192
 
 #define WLAN_CFG_RXDMA_MONITOR_STATUS_RING_SIZE 1024
 #define WLAN_CFG_RXDMA_MONITOR_STATUS_RING_SIZE_MIN 16

wlan_cfg/wlan_init_cfg.h

@@ -69,10 +69,6 @@
 
 /* Tx configuration */
 #define MAX_LINK_DESC_BANKS 8
-#define MAX_TXDESC_POOLS 6
-
-/* Rx configuration */
-#define MAX_RXDESC_POOLS 4
 
 #define MAX_REO_DEST_RINGS 8
 #define MAX_TCL_DATA_RINGS 5