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

qcacmn: CONFIG_MCL cleanup in cfg module

Browse Source 
Put MCL specific cfg default values under feaature flag
WLAN_MAX_PDEVS.

Change-Id: If34c10ca37e67fbd5fa36d04059be79600c3c328
CRs-Fixed: 2477486
This commit is contained in:
Vevek Venkatesan
2019-06-24 14:29:19 +05:30
committed by nshrivas
parent 87796c495a
commit 4a6c3e8568
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dp/wifi3.0/dp_types.h
View File

@@ -71,7 +71,7 @@
#define MAX_MON_LINK_DESC_BANKS 2 #define MAX_MON_LINK_DESC_BANKS 2
#define DP_VDEV_ALL 0xff #define DP_VDEV_ALL 0xff
#if defined(CONFIG_MCL) #if defined(WLAN_MAX_PDEVS) && (WLAN_MAX_PDEVS == 1)
#define MAX_PDEV_CNT 1 #define MAX_PDEV_CNT 1
#else #else
#define MAX_PDEV_CNT 3 #define MAX_PDEV_CNT 3

4
wlan_cfg/cfg_dp.h
View File

@@ -38,7 +38,6 @@
#define WLAN_CFG_NUM_TCL_DATA_RINGS_MIN 3 #define WLAN_CFG_NUM_TCL_DATA_RINGS_MIN 3
#define WLAN_CFG_NUM_TCL_DATA_RINGS_MAX 3 #define WLAN_CFG_NUM_TCL_DATA_RINGS_MAX 3
#ifdef CONFIG_MCL
#if defined(QCA_LL_TX_FLOW_CONTROL_V2) || \ #if defined(QCA_LL_TX_FLOW_CONTROL_V2) || \
defined(QCA_LL_PDEV_TX_FLOW_CONTROL) defined(QCA_LL_PDEV_TX_FLOW_CONTROL)
#define WLAN_CFG_TX_FLOW_START_QUEUE_OFFSET 10 #define WLAN_CFG_TX_FLOW_START_QUEUE_OFFSET 10
@@ -47,12 +46,11 @@
#define WLAN_CFG_TX_FLOW_START_QUEUE_OFFSET 0 #define WLAN_CFG_TX_FLOW_START_QUEUE_OFFSET 0
#define WLAN_CFG_TX_FLOW_STOP_QUEUE_TH 0 #define WLAN_CFG_TX_FLOW_STOP_QUEUE_TH 0
#endif #endif
#endif
#define WLAN_CFG_PER_PDEV_TX_RING_MIN 0 #define WLAN_CFG_PER_PDEV_TX_RING_MIN 0
#define WLAN_CFG_PER_PDEV_TX_RING_MAX 1 #define WLAN_CFG_PER_PDEV_TX_RING_MAX 1
#ifdef CONFIG_MCL #if defined(WLAN_MAX_PDEVS) && (WLAN_MAX_PDEVS == 1)
#define WLAN_CFG_PER_PDEV_RX_RING 0 #define WLAN_CFG_PER_PDEV_RX_RING 0
#define WLAN_CFG_PER_PDEV_LMAC_RING 0 #define WLAN_CFG_PER_PDEV_LMAC_RING 0
#define WLAN_LRO_ENABLE 0 #define WLAN_LRO_ENABLE 0

4
wlan_cfg/wlan_cfg.c
View File

@@ -90,7 +90,7 @@
#define WLAN_CFG_HOST2RXDMA_RING_MASK_2 0x4 #define WLAN_CFG_HOST2RXDMA_RING_MASK_2 0x4
#define WLAN_CFG_HOST2RXDMA_RING_MASK_3 0x0 #define WLAN_CFG_HOST2RXDMA_RING_MASK_3 0x0
#ifdef CONFIG_MCL #if defined(WLAN_MAX_PDEVS) && (WLAN_MAX_PDEVS == 1)
static const int tx_ring_mask[WLAN_CFG_INT_NUM_CONTEXTS] = { static const int tx_ring_mask[WLAN_CFG_INT_NUM_CONTEXTS] = {
WLAN_CFG_TX_RING_MASK_0, 0, 0, 0, 0, 0, 0}; WLAN_CFG_TX_RING_MASK_0, 0, 0, 0, 0, 0, 0};
@@ -201,7 +201,7 @@ static const int reo_status_ring_mask[WLAN_CFG_INT_NUM_CONTEXTS] = {
WLAN_CFG_REO_STATUS_RING_MASK_1, WLAN_CFG_REO_STATUS_RING_MASK_1,
WLAN_CFG_REO_STATUS_RING_MASK_2, WLAN_CFG_REO_STATUS_RING_MASK_2,
WLAN_CFG_REO_STATUS_RING_MASK_3}; WLAN_CFG_REO_STATUS_RING_MASK_3};
#endif /*CONFIG_MCL*/ #endif /* MAX_PDEV_CNT == 1 */
/** /**
* g_wlan_srng_cfg[] - Per ring_type specific configuration * g_wlan_srng_cfg[] - Per ring_type specific configuration

4
wlan_cfg/wlan_cfg.h
View File

@@ -23,7 +23,7 @@
* Temporary place holders. These should come either from target config * Temporary place holders. These should come either from target config
* or platform configuration * or platform configuration
*/ */
#if defined(CONFIG_MCL) #if defined(WLAN_MAX_PDEVS) && (WLAN_MAX_PDEVS == 1)
#define WLAN_CFG_DST_RING_CACHED_DESC 0 #define WLAN_CFG_DST_RING_CACHED_DESC 0
#define MAX_PDEV_CNT 1 #define MAX_PDEV_CNT 1
#define WLAN_CFG_INT_NUM_CONTEXTS 7 #define WLAN_CFG_INT_NUM_CONTEXTS 7
@@ -56,7 +56,7 @@
#define MAX_RX_MAC_RINGS 2 #define MAX_RX_MAC_RINGS 2
/* DP process status */ /* DP process status */
#ifdef CONFIG_MCL #if defined(MAX_PDEV_CNT) && (MAX_PDEV_CNT == 1)
#define CONFIG_PROCESS_RX_STATUS 1 #define CONFIG_PROCESS_RX_STATUS 1
#define CONFIG_PROCESS_TX_STATUS 1 #define CONFIG_PROCESS_TX_STATUS 1
#else #else