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

qcacmn: Remove HK header dependencies for ipq6018 compilation

Browse Source 
Add target specific HW header for ipq6018 compilation.
Remove the 8074 header dependencies for 6018 compilation.

Change-Id: I8e45e3e039a4596c6722538405dcd381918fa6b1
This commit is contained in:
Basamma Yakkanahalli
2019-04-27 05:24:00 +05:30
committed by nshrivas
parent 99d0783cec
commit b85768e4e5
9 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dp/inc/cdp_txrx_cmn_reg.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -56,7 +56,7 @@ ol_txrx_soc_handle ol_txrx_soc_attach(void *scn_handle, struct ol_if_ops *dp_ol_
* *
* Return: DP SOC handle on success, NULL on failure * Return: DP SOC handle on success, NULL on failure
*/ */
#ifdef QCA_WIFI_QCA8074 #if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6018)
void *dp_soc_attach_wifi3(void *ctrl_psoc, void *hif_handle, void *dp_soc_attach_wifi3(void *ctrl_psoc, void *hif_handle,
HTC_HANDLE htc_handle, qdf_device_t qdf_osdev, HTC_HANDLE htc_handle, qdf_device_t qdf_osdev,
struct ol_if_ops *ol_ops, uint16_t device_id); struct ol_if_ops *ol_ops, uint16_t device_id);

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

@@ -10500,7 +10500,7 @@ static void dp_soc_set_txrx_ring_map(struct dp_soc *soc)
} }
} }
#ifdef QCA_WIFI_QCA8074 #if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6018)
#ifndef QCA_MEM_ATTACH_ON_WIFI3 #ifndef QCA_MEM_ATTACH_ON_WIFI3

2
dp/wifi3.0/dp_peer.c
View File

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

4
hif/src/ce/ce_main.c
View File

@@ -52,8 +52,8 @@
#endif #endif
#include "mp_dev.h" #include "mp_dev.h"
#if (defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6290)) && \ #if (defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6290) || \
!defined(QCA_WIFI_SUPPORT_SRNG) defined(QCA_WIFI_QCA6018)) && !defined(QCA_WIFI_SUPPORT_SRNG)
#define QCA_WIFI_SUPPORT_SRNG #define QCA_WIFI_SUPPORT_SRNG
#endif #endif

4
hif/src/hif_main.c
View File

@@ -38,7 +38,7 @@
#include "qdf_status.h" #include "qdf_status.h"
#include "hif_debug.h" #include "hif_debug.h"
#include "mp_dev.h" #include "mp_dev.h"
#ifdef QCA_WIFI_QCA8074 #if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6018)
#include "hal_api.h" #include "hal_api.h"
#endif #endif
#include "hif_napi.h" #include "hif_napi.h"
@@ -486,7 +486,7 @@ void hif_close(struct hif_opaque_softc *hif_ctx)
qdf_mem_free(scn); qdf_mem_free(scn);
} }
#if defined(QCA_WIFI_QCA8074) || \ #if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6018) || \
defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390)
static QDF_STATUS hif_hal_attach(struct hif_softc *scn) static QDF_STATUS hif_hal_attach(struct hif_softc *scn)
{ {

3
htc/htc.c
View File

@@ -45,7 +45,8 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(htc,
#endif #endif
#if (defined(CONFIG_MCL) || (QCA_WIFI_QCA8074)) #if (defined(CONFIG_MCL) || defined(QCA_WIFI_QCA8074) || \
defined(QCA_WIFI_QCA6018))
static const uint32_t svc_id[] = {WMI_CONTROL_SVC, WMI_CONTROL_SVC_WMAC1, static const uint32_t svc_id[] = {WMI_CONTROL_SVC, WMI_CONTROL_SVC_WMAC1,
WMI_CONTROL_SVC_WMAC2}; WMI_CONTROL_SVC_WMAC2};
#else #else

2
qdf/linux/src/qdf_mem.c
View File

@@ -1538,7 +1538,7 @@ static inline void *qdf_mem_dma_alloc(qdf_device_t osdev, void *dev,
return vaddr; return vaddr;
} }
#elif defined(QCA_WIFI_QCA8074) && defined(BUILD_X86) #elif defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86)
#define QCA8074_RAM_BASE 0x50000000 #define QCA8074_RAM_BASE 0x50000000
#define QDF_MEM_ALLOC_X86_MAX_RETRIES 10 #define QDF_MEM_ALLOC_X86_MAX_RETRIES 10
void *qdf_mem_dma_alloc(qdf_device_t osdev, void *dev, qdf_size_t size, void *qdf_mem_dma_alloc(qdf_device_t osdev, void *dev, qdf_size_t size,

2
qdf/linux/src/qdf_nbuf.c
View File

@@ -352,7 +352,7 @@ void __qdf_nbuf_count_dec(__qdf_nbuf_t nbuf)
qdf_export_symbol(__qdf_nbuf_count_dec); qdf_export_symbol(__qdf_nbuf_count_dec);
#endif #endif
#if defined(QCA_WIFI_QCA8074) && defined (BUILD_X86) #if defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86)
struct sk_buff *__qdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve, struct sk_buff *__qdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve,
int align, int prio, const char *func, int align, int prio, const char *func,
uint32_t line) uint32_t line)

3
target_if/dfs/src/target_if_dfs_full_offload.c
View File

@@ -390,7 +390,8 @@ free_vdevref:
} }
#endif #endif
#if (defined(CONFIG_MCL) || (QCA_WIFI_QCA8074)) #if (defined(CONFIG_MCL) || defined(QCA_WIFI_QCA8074) || \
defined(QCA_WIFI_QCA6018))
QDF_STATUS target_process_bang_radar_cmd( QDF_STATUS target_process_bang_radar_cmd(
struct wlan_objmgr_pdev *pdev, struct wlan_objmgr_pdev *pdev,
struct dfs_emulate_bang_radar_test_cmd *dfs_unit_test) struct dfs_emulate_bang_radar_test_cmd *dfs_unit_test)