qcacmn: Replace 8074_VP with WIFI_EMULATION_3_0

Replace QCA_WIFI_QCA8074_VP with CONFIG_WIFI_EMULATION_WIFI_3_0
since VP platform is not being used anymore.
Most of the parameters present inside QCA_WIFI_QCA8074_VP are related
to emulation timeouts. Hence replacing it with a more meaningful flag.

Change-Id: I22a0e5803e765333947f1613b376dcc6bd25b5af
这个提交包含在:
Nandha Kishore Easwaran
2019-12-24 10:36:37 +05:30
提交者 nshrivas
父节点 b59458c284
当前提交 b7c18849ae
修改 6 个文件,包含 7 行新增10 行删除

查看文件

@@ -2416,24 +2416,24 @@ static void dp_hw_link_desc_pool_cleanup(struct dp_soc *soc)
#ifdef IPA_OFFLOAD
#define REO_DST_RING_SIZE_QCA6290 1023
#ifndef QCA_WIFI_QCA8074_VP
#ifndef CONFIG_WIFI_EMULATION_WIFI_3_0
#define REO_DST_RING_SIZE_QCA8074 1023
#define REO_DST_RING_SIZE_QCN9000 2048
#else
#define REO_DST_RING_SIZE_QCA8074 8
#define REO_DST_RING_SIZE_QCN9000 8
#endif /* QCA_WIFI_QCA8074_VP */
#endif /* CONFIG_WIFI_EMULATION_WIFI_3_0 */
#else
#define REO_DST_RING_SIZE_QCA6290 1024
#ifndef QCA_WIFI_QCA8074_VP
#ifndef CONFIG_WIFI_EMULATION_WIFI_3_0
#define REO_DST_RING_SIZE_QCA8074 2048
#define REO_DST_RING_SIZE_QCN9000 2048
#else
#define REO_DST_RING_SIZE_QCA8074 8
#define REO_DST_RING_SIZE_QCN9000 8
#endif /* QCA_WIFI_QCA8074_VP */
#endif /* CONFIG_WIFI_EMULATION_WIFI_3_0 */
#endif /* IPA_OFFLOAD */
#ifndef FEATURE_WDS

查看文件

@@ -1801,7 +1801,7 @@ static void dp_reo_desc_free(struct dp_soc *soc, void *cb_ctxt,
qdf_mem_free(freedesc);
}
#if defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86)
#if defined(CONFIG_WIFI_EMULATION_WIFI_3_0) && defined(BUILD_X86)
/* Hawkeye emulation requires bus address to be >= 0x50000000 */
static inline int dp_reo_desc_addr_chk(qdf_dma_addr_t dma_addr)
{

查看文件

@@ -2013,7 +2013,6 @@ int hif_pci_bus_configure(struct hif_softc *hif_sc)
if (status)
goto disable_wlan;
/* QCA_WIFI_QCA8074_VP:Should not be executed on 8074 VP platform */
if (hif_needs_bmi(hif_osc)) {
status = hif_set_hia(hif_sc);
if (status)

查看文件

@@ -605,7 +605,6 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
hif_register_tbl_attach(ol_sc, hif_type);
hif_target_register_tbl_attach(ol_sc, target_type);
/* QCA_WIFI_QCA8074_VP:Should not be executed on 8074 VP platform */
if ((tgt_info->target_type != TARGET_TYPE_QCA8074) &&
(tgt_info->target_type != TARGET_TYPE_QCA8074V2) &&
(tgt_info->target_type != TARGET_TYPE_QCA6018)) {
@@ -624,7 +623,6 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
return QDF_STATUS_SUCCESS;
err_target_sync:
/* QCA_WIFI_QCA8074_VP:Should not be executed on 8074 VP platform */
if ((tgt_info->target_type != TARGET_TYPE_QCA8074) &&
(tgt_info->target_type != TARGET_TYPE_QCA8074V2) &&
(tgt_info->target_type != TARGET_TYPE_QCA6018)) {

查看文件

@@ -1962,7 +1962,7 @@ static inline void *qdf_mem_dma_alloc(qdf_device_t osdev, void *dev,
return vaddr;
}
#elif defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86) && \
#elif defined(CONFIG_WIFI_EMULATION_WIFI_3_0) && defined(BUILD_X86) && \
!defined(QCA_WIFI_QCN9000)
#define QCA8074_RAM_BASE 0x50000000

查看文件

@@ -382,7 +382,7 @@ void __qdf_nbuf_count_dec(__qdf_nbuf_t nbuf)
qdf_export_symbol(__qdf_nbuf_count_dec);
#endif
#if defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86) && \
#if defined(CONFIG_WIFI_EMULATION_WIFI_3_0) && defined(BUILD_X86) && \
!defined(QCA_WIFI_QCN9000)
struct sk_buff *__qdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve,
int align, int prio, const char *func,