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

qcacmn: CONFIG_WIN Macros to be moved out of DP/HAL

Browse Source 
Remove CONFIG_WIN usage from Lithium DP and HAL module.

Change-Id: If388e45cb3e7e31493edd422a2f4c40f0dd4a799
CRs-Fixed: 2474613
This commit is contained in:
Akshay Kosigi
2019-06-19 14:33:47 +05:30
committed by nshrivas
parent f09509b3f4
commit 283e2358f4
5 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dp/inc/cdp_txrx_stats_struct.h
View File

@@ -1269,7 +1269,7 @@ struct cdp_pdev_stats {
struct cdp_tid_stats tid_stats; struct cdp_tid_stats tid_stats;
}; };
#ifndef CONFIG_MCL #ifdef QCA_ENH_V3_STATS_SUPPORT
/* /*
* Enumeration of PDEV Configuration parameter * Enumeration of PDEV Configuration parameter
*/ */

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

@@ -91,7 +91,7 @@
#ifdef WLAN_TX_PKT_CAPTURE_ENH #ifdef WLAN_TX_PKT_CAPTURE_ENH
extern uint8_t extern uint8_t
dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS]; dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS_MAX];
#endif #endif
#if DP_PRINT_ENABLE #if DP_PRINT_ENABLE

32
dp/wifi3.0/dp_main.c
View File

@@ -89,6 +89,14 @@ QDF_COMPILE_TIME_ASSERT(hif_event_history_size,
(HIF_EVENT_HIST_MAX & (HIF_EVENT_HIST_MAX - 1)) == 0); (HIF_EVENT_HIST_MAX & (HIF_EVENT_HIST_MAX - 1)) == 0);
#endif /* WLAN_FEATURE_DP_EVENT_HISTORY */ #endif /* WLAN_FEATURE_DP_EVENT_HISTORY */
/*
* If WLAN_CFG_INT_NUM_CONTEXTS is changed,
* WLAN_CFG_INT_NUM_CONTEXTS_MAX should also be updated
*/
QDF_COMPILE_TIME_ASSERT(wlan_cfg_num_int_ctxs,
WLAN_CFG_INT_NUM_CONTEXTS_MAX >=
WLAN_CFG_INT_NUM_CONTEXTS);
#ifdef WLAN_RX_PKT_CAPTURE_ENH #ifdef WLAN_RX_PKT_CAPTURE_ENH
#include "dp_rx_mon_feature.h" #include "dp_rx_mon_feature.h"
#else #else
@@ -216,37 +224,17 @@ static uint8_t default_pcp_tid_map[PCP_TID_MAP_MAX] = {
/** /**
* @brief Cpu to tx ring map * @brief Cpu to tx ring map
*/ */
#ifdef CONFIG_WIN
#ifdef WLAN_TX_PKT_CAPTURE_ENH
uint8_t uint8_t
dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS] = { dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS_MAX] = {
{0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2}, {0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2},
{0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1}, {0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1},
{0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0}, {0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0},
{0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2}, {0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2},
{0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3}, {0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3},
#ifdef WLAN_TX_PKT_CAPTURE_ENH
{0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1} {0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1}
};
#else
static uint8_t
dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS] = {
{0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2},
{0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1},
{0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0},
{0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2},
{0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3}
};
#endif #endif
#else
static uint8_t
dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS] = {
{0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2},
{0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1},
{0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0},
{0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2},
{0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3}
}; };
#endif
/** /**
* @brief Select the type of statistics * @brief Select the type of statistics

6
hal/wifi3.0/hal_srng.c
View File

@@ -244,19 +244,19 @@ static void hal_target_based_configure(struct hal_soc *hal)
hal_qca6390_attach(hal); hal_qca6390_attach(hal);
break; break;
#endif #endif
#if defined(QCA_WIFI_QCA8074) && defined(CONFIG_WIN) #if defined(QCA_WIFI_QCA8074) && defined(WIFI_TARGET_TYPE_3_0)
case TARGET_TYPE_QCA8074: case TARGET_TYPE_QCA8074:
hal_qca8074_attach(hal); hal_qca8074_attach(hal);
break; break;
#endif #endif
#if defined(QCA_WIFI_QCA8074V2) && defined(CONFIG_WIN) #if defined(QCA_WIFI_QCA8074V2)
case TARGET_TYPE_QCA8074V2: case TARGET_TYPE_QCA8074V2:
hal_qca8074v2_attach(hal); hal_qca8074v2_attach(hal);
break; break;
#endif #endif
#if defined(QCA_WIFI_QCA6018) && defined(CONFIG_WIN) #if defined(QCA_WIFI_QCA6018)
case TARGET_TYPE_QCA6018: case TARGET_TYPE_QCA6018:
hal_qca8074v2_attach(hal); hal_qca8074v2_attach(hal);
break; break;

2
wlan_cfg/wlan_cfg.h
View File

@@ -45,6 +45,8 @@
#define NUM_RXDMA_RINGS_PER_PDEV 1 #define NUM_RXDMA_RINGS_PER_PDEV 1
#endif #endif
#define WLAN_CFG_INT_NUM_CONTEXTS_MAX 11
/* Tx configuration */ /* Tx configuration */
#define MAX_LINK_DESC_BANKS 8 #define MAX_LINK_DESC_BANKS 8
#define MAX_TXDESC_POOLS 4 #define MAX_TXDESC_POOLS 4