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

qcacmn: Fix compilation issues and a minor issue

Browse Source 
Removed qdf exports on functions defined in target specific
header files and defined those functions as static. Revert
changes on hal_rx_msdu_end_sa_idx_get and make
hal_rx_msdu_end_da_idx_get target specific

Change-Id: I2858b1d77118f0a26b54bf983bd342c7a4fe757d
This commit is contained in:
Balamurugan Mahalingam
2018-07-10 10:11:58 +05:30
committed by nshrivas
parent fe9c9c038c
commit 96d2d41c87
14 changed files with 57 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7539,7 +7539,9 @@ void *dp_soc_attach_wifi3(void *ctrl_psoc, void *hif_handle,
target_type = hal_get_target_type(soc->hal_soc); target_type = hal_get_target_type(soc->hal_soc);
switch (target_type) { switch (target_type) {
case TARGET_TYPE_QCA6290: case TARGET_TYPE_QCA6290:
#ifdef QCA_WIFI_QCA6390
case TARGET_TYPE_QCA6390: case TARGET_TYPE_QCA6390:
#endif
wlan_cfg_set_reo_dst_ring_size(soc->wlan_cfg_ctx, wlan_cfg_set_reo_dst_ring_size(soc->wlan_cfg_ctx,
REO_DST_RING_SIZE_QCA6290); REO_DST_RING_SIZE_QCA6290);
break; break;

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

@@ -374,7 +374,7 @@ dp_rx_intrabss_fwd(struct dp_soc *soc,
if ((hal_rx_msdu_end_da_is_valid_get(rx_tlv_hdr) && if ((hal_rx_msdu_end_da_is_valid_get(rx_tlv_hdr) &&
!hal_rx_msdu_end_da_is_mcbc_get(rx_tlv_hdr))) { !hal_rx_msdu_end_da_is_mcbc_get(rx_tlv_hdr))) {
da_idx = hal_rx_msdu_end_da_idx_get(rx_tlv_hdr); da_idx = hal_rx_msdu_end_da_idx_get(soc->hal_soc, rx_tlv_hdr);
ast_entry = soc->ast_table[da_idx]; ast_entry = soc->ast_table[da_idx];
if (!ast_entry) if (!ast_entry)

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

@@ -420,7 +420,7 @@ dp_rx_wds_srcport_learn(struct dp_soc *soc,
/* /*
* Get the AST entry from HW SA index and mark it as active * Get the AST entry from HW SA index and mark it as active
*/ */
sa_idx = hal_rx_msdu_end_sa_idx_get(soc->hal_soc, rx_tlv_hdr); sa_idx = hal_rx_msdu_end_sa_idx_get(rx_tlv_hdr);
qdf_spin_lock_bh(&soc->ast_lock); qdf_spin_lock_bh(&soc->ast_lock);
ast = soc->ast_table[sa_idx]; ast = soc->ast_table[sa_idx];

4
dp/wifi3.0/dp_rx_err.c
View File

@@ -107,7 +107,7 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc,
*/ */
qdf_spin_lock_bh(&soc->ast_lock); qdf_spin_lock_bh(&soc->ast_lock);
if (hal_rx_msdu_end_sa_is_valid_get(rx_tlv_hdr)) { if (hal_rx_msdu_end_sa_is_valid_get(rx_tlv_hdr)) {
sa_idx = hal_rx_msdu_end_sa_idx_get(soc->hal_soc, rx_tlv_hdr); sa_idx = hal_rx_msdu_end_sa_idx_get(rx_tlv_hdr);
if ((sa_idx < 0) || if ((sa_idx < 0) ||
(sa_idx >= (WLAN_UMAC_PSOC_MAX_PEERS * 2))) { (sa_idx >= (WLAN_UMAC_PSOC_MAX_PEERS * 2))) {
@@ -837,7 +837,7 @@ dp_rx_process_mic_error(struct dp_soc *soc,
goto fail; goto fail;
} }
tid = hal_rx_mpdu_start_tid_get(qdf_nbuf_data(nbuf)); tid = hal_rx_mpdu_start_tid_get(soc->hal_soc, qdf_nbuf_data(nbuf));
rx_seq = (((*(uint16_t *)wh->i_seq) & rx_seq = (((*(uint16_t *)wh->i_seq) &
IEEE80211_SEQ_SEQ_MASK) >> IEEE80211_SEQ_SEQ_MASK) >>
IEEE80211_SEQ_SEQ_SHIFT); IEEE80211_SEQ_SEQ_SHIFT);

34
dp/wifi3.0/hal_rx.h
View File

@@ -1030,7 +1030,13 @@ hal_rx_msdu_end_l3_hdr_padding_get(uint8_t *buf)
return l3_header_padding; return l3_header_padding;
} }
/** #define HAL_RX_MSDU_END_SA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_13_SA_IDX_OFFSET)), \
RX_MSDU_END_13_SA_IDX_MASK, \
RX_MSDU_END_13_SA_IDX_LSB))
/**
* hal_rx_msdu_end_sa_idx_get(): API to get the * hal_rx_msdu_end_sa_idx_get(): API to get the
* sa_idx from rx_msdu_end TLV * sa_idx from rx_msdu_end TLV
* *
@@ -1038,9 +1044,15 @@ hal_rx_msdu_end_l3_hdr_padding_get(uint8_t *buf)
* Return: sa_idx (SA AST index) * Return: sa_idx (SA AST index)
*/ */
static inline uint16_t static inline uint16_t
hal_rx_msdu_end_sa_idx_get(struct hal_soc *hal_soc, uint8_t *buf) hal_rx_msdu_end_sa_idx_get(uint8_t *buf)
{ {
return hal_soc->ops->hal_rx_msdu_end_sa_idx_get(buf); struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;
uint16_t sa_idx;
sa_idx = HAL_RX_MSDU_END_SA_IDX_GET(msdu_end);
return sa_idx;
} }
#define HAL_RX_MSDU_END_SA_IS_VALID_GET(_rx_msdu_end) \ #define HAL_RX_MSDU_END_SA_IS_VALID_GET(_rx_msdu_end) \
@@ -1715,12 +1727,6 @@ QDF_STATUS hal_rx_mpdu_get_addr4(uint8_t *buf, uint8_t *mac_addr)
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_13_DA_IDX_OFFSET)), \
RX_MSDU_END_13_DA_IDX_MASK, \
RX_MSDU_END_13_DA_IDX_LSB))
/** /**
* hal_rx_msdu_end_da_idx_get: API to get da_idx * hal_rx_msdu_end_da_idx_get: API to get da_idx
* from rx_msdu_end TLV * from rx_msdu_end TLV
@@ -1729,15 +1735,9 @@ QDF_STATUS hal_rx_mpdu_get_addr4(uint8_t *buf, uint8_t *mac_addr)
* Return: da index * Return: da index
*/ */
static inline uint16_t static inline uint16_t
hal_rx_msdu_end_da_idx_get(uint8_t *buf) hal_rx_msdu_end_da_idx_get(struct hal_soc *hal_soc, uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; return hal_soc->ops->hal_rx_msdu_end_da_idx_get(buf);
struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;
uint16_t da_idx;
da_idx = HAL_RX_MSDU_END_DA_IDX_GET(msdu_end);
return da_idx;
} }
#define HAL_RX_MSDU_END_DA_IS_VALID_GET(_rx_msdu_end) \ #define HAL_RX_MSDU_END_DA_IS_VALID_GET(_rx_msdu_end) \

6
hal/wifi3.0/hal_internal.h
View File

@@ -295,7 +295,7 @@ struct hal_hw_txrx_ops {
uint32_t (*hal_get_link_desc_size)(void); uint32_t (*hal_get_link_desc_size)(void);
uint32_t (*hal_rx_mpdu_start_tid_get)(uint8_t *buf); uint32_t (*hal_rx_mpdu_start_tid_get)(uint8_t *buf);
uint32_t (*hal_rx_msdu_start_reception_type_get)(uint8_t *buf); uint32_t (*hal_rx_msdu_start_reception_type_get)(uint8_t *buf);
uint16_t (*hal_rx_msdu_end_sa_idx_get)(uint8_t *buf); uint16_t (*hal_rx_msdu_end_da_idx_get)(uint8_t *buf);
}; };
/** /**
@@ -342,4 +342,8 @@ struct hal_soc {
int32_t *hal_hw_reg_offset; int32_t *hal_hw_reg_offset;
struct hal_hw_txrx_ops *ops; struct hal_hw_txrx_ops *ops;
}; };
void hal_qca6390_attach(struct hal_soc *hal_soc);
void hal_qca6290_attach(struct hal_soc *hal_soc);
void hal_qca8074_attach(struct hal_soc *hal_soc);
#endif /* _HAL_INTERNAL_H_ */ #endif /* _HAL_INTERNAL_H_ */

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

@@ -230,7 +230,7 @@ static void hal_target_based_configure(struct hal_soc *hal)
hal_qca6390_attach(hal); hal_qca6390_attach(hal);
break; break;
#endif #endif
#ifdef QCA_WIFI_QCA8074 #if defined(QCA_WIFI_QCA8074) && defined(CONFIG_WIN)
case TARGET_TYPE_QCA8074: case TARGET_TYPE_QCA8074:
hal_qca8074_attach(hal); hal_qca8074_attach(hal);
break; break;

33
hal/wifi3.0/qca6290/hal_6290_rx.h
View File

@@ -59,7 +59,7 @@
* @buf: pointer to the start of RX PKT TLV header * @buf: pointer to the start of RX PKT TLV header
* Return: uint32_t(nss) * Return: uint32_t(nss)
*/ */
uint32_t static uint32_t
hal_rx_msdu_start_nss_get_6290(uint8_t *buf) hal_rx_msdu_start_nss_get_6290(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
@@ -72,8 +72,6 @@ hal_rx_msdu_start_nss_get_6290(uint8_t *buf)
return qdf_get_hweight8(mimo_ss_bitmap); return qdf_get_hweight8(mimo_ss_bitmap);
} }
qdf_export_symbol(hal_rx_msdu_start_nss_get_6290);
/** /**
* hal_rx_mon_hw_desc_get_mpdu_status_6290(): Retrieve MPDU status * hal_rx_mon_hw_desc_get_mpdu_status_6290(): Retrieve MPDU status
* *
@@ -128,8 +126,6 @@ void hal_rx_mon_hw_desc_get_mpdu_status_6290(void *hw_desc_addr,
/* TODO: rs->beamformed should be set for SU beamforming also */ /* TODO: rs->beamformed should be set for SU beamforming also */
} }
qdf_export_symbol(hal_rx_mon_hw_desc_get_mpdu_status_6290);
#define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2) #define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2)
uint32_t hal_get_link_desc_size_6290(void) uint32_t hal_get_link_desc_size_6290(void)
@@ -137,7 +133,6 @@ uint32_t hal_get_link_desc_size_6290(void)
return LINK_DESC_SIZE; return LINK_DESC_SIZE;
} }
qdf_export_symbol(hal_get_link_desc_size_6290);
/* /*
* hal_rx_get_tlv_6290(): API to get the tlv * hal_rx_get_tlv_6290(): API to get the tlv
@@ -145,13 +140,11 @@ qdf_export_symbol(hal_get_link_desc_size_6290);
* @rx_tlv: TLV data extracted from the rx packet * @rx_tlv: TLV data extracted from the rx packet
* Return: uint8_t * Return: uint8_t
*/ */
uint8_t hal_rx_get_tlv_6290(void *rx_tlv) static uint8_t hal_rx_get_tlv_6290(void *rx_tlv)
{ {
return HAL_RX_GET(rx_tlv, PHYRX_RSSI_LEGACY_0, RECEIVE_BANDWIDTH); return HAL_RX_GET(rx_tlv, PHYRX_RSSI_LEGACY_0, RECEIVE_BANDWIDTH);
} }
qdf_export_symbol(hal_rx_get_tlv_6290);
/** /**
* hal_rx_proc_phyrx_other_receive_info_tlv_6290() * hal_rx_proc_phyrx_other_receive_info_tlv_6290()
* - process other receive info TLV * - process other receive info TLV
@@ -218,8 +211,6 @@ void hal_rx_proc_phyrx_other_receive_info_tlv_6290(void *rx_tlv_hdr,
} }
} }
qdf_export_symbol(hal_rx_proc_phyrx_other_receive_info_tlv_6290);
/** /**
* hal_rx_dump_msdu_start_tlv_6290() : dump RX msdu_start TLV in structured * hal_rx_dump_msdu_start_tlv_6290() : dump RX msdu_start TLV in structured
* human readable format. * human readable format.
@@ -228,7 +219,8 @@ qdf_export_symbol(hal_rx_proc_phyrx_other_receive_info_tlv_6290);
* *
* Return: void * Return: void
*/ */
void hal_rx_dump_msdu_start_tlv_6290(void *msdustart, uint8_t dbg_level) static void hal_rx_dump_msdu_start_tlv_6290(void *msdustart,
uint8_t dbg_level)
{ {
struct rx_msdu_start *msdu_start = (struct rx_msdu_start *)msdustart; struct rx_msdu_start *msdu_start = (struct rx_msdu_start *)msdustart;
@@ -294,8 +286,6 @@ void hal_rx_dump_msdu_start_tlv_6290(void *msdustart, uint8_t dbg_level)
msdu_start->sw_phy_meta_data); msdu_start->sw_phy_meta_data);
} }
qdf_export_symbol(hal_rx_dump_msdu_start_tlv_6290);
/** /**
* hal_rx_dump_msdu_end_tlv_6290: dump RX msdu_end TLV in structured * hal_rx_dump_msdu_end_tlv_6290: dump RX msdu_end TLV in structured
* human readable format. * human readable format.
@@ -304,8 +294,8 @@ qdf_export_symbol(hal_rx_dump_msdu_start_tlv_6290);
* *
* Return: void * Return: void
*/ */
void hal_rx_dump_msdu_end_tlv_6290(void *msduend, static void hal_rx_dump_msdu_end_tlv_6290(void *msduend,
uint8_t dbg_level) uint8_t dbg_level)
{ {
struct rx_msdu_end *msdu_end = (struct rx_msdu_end *)msduend; struct rx_msdu_end *msdu_end = (struct rx_msdu_end *)msduend;
@@ -405,7 +395,6 @@ void hal_rx_dump_msdu_end_tlv_6290(void *msduend,
msdu_end->sa_sw_peer_id); msdu_end->sa_sw_peer_id);
} }
qdf_export_symbol(hal_rx_dump_msdu_end_tlv_6290);
/* /*
* Get tid from RX_MPDU_START * Get tid from RX_MPDU_START
@@ -416,7 +405,7 @@ qdf_export_symbol(hal_rx_dump_msdu_end_tlv_6290);
RX_MPDU_INFO_3_TID_MASK, \ RX_MPDU_INFO_3_TID_MASK, \
RX_MPDU_INFO_3_TID_LSB)) RX_MPDU_INFO_3_TID_LSB))
uint32_t hal_rx_mpdu_start_tid_get_6290(uint8_t *buf) static uint32_t hal_rx_mpdu_start_tid_get_6290(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_mpdu_start *mpdu_start = struct rx_mpdu_start *mpdu_start =
@@ -428,8 +417,6 @@ uint32_t hal_rx_mpdu_start_tid_get_6290(uint8_t *buf)
return tid; return tid;
} }
qdf_export_symbol(hal_rx_mpdu_start_tid_get_6290);
#define HAL_RX_MSDU_START_RECEPTION_TYPE_GET(_rx_msdu_start) \ #define HAL_RX_MSDU_START_RECEPTION_TYPE_GET(_rx_msdu_start) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start), \ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start), \
RX_MSDU_START_5_RECEPTION_TYPE_OFFSET)), \ RX_MSDU_START_5_RECEPTION_TYPE_OFFSET)), \
@@ -443,7 +430,7 @@ qdf_export_symbol(hal_rx_mpdu_start_tid_get_6290);
* @buf: pointer to the start of RX PKT TLV header * @buf: pointer to the start of RX PKT TLV header
* Return: uint32_t(reception_type) * Return: uint32_t(reception_type)
*/ */
uint32_t hal_rx_msdu_start_reception_type_get_6290(uint8_t *buf) static uint32_t hal_rx_msdu_start_reception_type_get_6290(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_msdu_start *msdu_start = struct rx_msdu_start *msdu_start =
@@ -455,8 +442,6 @@ uint32_t hal_rx_msdu_start_reception_type_get_6290(uint8_t *buf)
return reception_type; return reception_type;
} }
qdf_export_symbol(hal_rx_msdu_start_reception_type_get_6290);
#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \ #define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_13_DA_IDX_OFFSET)), \ RX_MSDU_END_13_DA_IDX_OFFSET)), \
@@ -470,7 +455,7 @@ qdf_export_symbol(hal_rx_msdu_start_reception_type_get_6290);
* @ buf: pointer to the start of RX PKT TLV headers * @ buf: pointer to the start of RX PKT TLV headers
* Return: da index * Return: da index
*/ */
uint16_t hal_rx_msdu_end_da_idx_get_6290(uint8_t *buf) static uint16_t hal_rx_msdu_end_da_idx_get_6290(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;

9
hal/wifi3.0/qca6290/hal_6290_tx.h
View File

@@ -56,8 +56,6 @@ void hal_tx_desc_set_dscp_tid_table_id_6290(void *desc,
DSCP_TID_TABLE_NUM, id); DSCP_TID_TABLE_NUM, id);
} }
qdf_export_symbol(hal_tx_desc_set_dscp_tid_table_id_6290);
#define DSCP_TID_TABLE_SIZE 24 #define DSCP_TID_TABLE_SIZE 24
#define NUM_WORDS_PER_DSCP_TID_TABLE (DSCP_TID_TABLE_SIZE / 4) #define NUM_WORDS_PER_DSCP_TID_TABLE (DSCP_TID_TABLE_SIZE / 4)
@@ -129,8 +127,6 @@ void hal_tx_set_dscp_tid_map_6290(void *hal_soc, uint8_t *map,
HAL_REG_WRITE(soc, cmn_reg_addr, regval); HAL_REG_WRITE(soc, cmn_reg_addr, regval);
} }
qdf_export_symbol(hal_tx_set_dscp_tid_map_6290);
/** /**
* hal_tx_update_dscp_tid_6290() - Update the dscp tid map table as updated * hal_tx_update_dscp_tid_6290() - Update the dscp tid map table as updated
* by the user * by the user
@@ -164,8 +160,6 @@ void hal_tx_update_dscp_tid_6290(void *hal_soc, uint8_t tid,
HAL_REG_WRITE(soc, addr, (regval & HWIO_TCL_R0_DSCP_TID_MAP_n_RMSK)); HAL_REG_WRITE(soc, addr, (regval & HWIO_TCL_R0_DSCP_TID_MAP_n_RMSK));
} }
qdf_export_symbol(hal_tx_update_dscp_tid_6290);
/** /**
* hal_tx_desc_set_lmac_id - Set the lmac_id value * hal_tx_desc_set_lmac_id - Set the lmac_id value
* @desc: Handle to Tx Descriptor * @desc: Handle to Tx Descriptor
@@ -183,6 +177,3 @@ void hal_tx_desc_set_lmac_id_6290(void *desc,
HAL_SET_FLD(desc, TCL_DATA_CMD_4, LMAC_ID) |= HAL_SET_FLD(desc, TCL_DATA_CMD_4, LMAC_ID) |=
HAL_TX_SM(TCL_DATA_CMD_4, LMAC_ID, lmac_id); HAL_TX_SM(TCL_DATA_CMD_4, LMAC_ID, lmac_id);
} }
qdf_export_symbol(hal_tx_desc_set_lmac_id_6290);

31
hal/wifi3.0/qca6390/hal_6390_rx.h
View File

@@ -59,7 +59,7 @@
* @buf: pointer to the start of RX PKT TLV header * @buf: pointer to the start of RX PKT TLV header
* Return: uint32_t(nss) * Return: uint32_t(nss)
*/ */
uint32_t static uint32_t
hal_rx_msdu_start_nss_get_6390(uint8_t *buf) hal_rx_msdu_start_nss_get_6390(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
@@ -72,7 +72,6 @@ hal_rx_msdu_start_nss_get_6390(uint8_t *buf)
return qdf_get_hweight8(mimo_ss_bitmap); return qdf_get_hweight8(mimo_ss_bitmap);
} }
qdf_export_symbol(hal_rx_msdu_start_nss_get_6390);
/** /**
* hal_rx_mon_hw_desc_get_mpdu_status_6390(): Retrieve MPDU status * hal_rx_mon_hw_desc_get_mpdu_status_6390(): Retrieve MPDU status
* *
@@ -127,8 +126,6 @@ void hal_rx_mon_hw_desc_get_mpdu_status_6390(void *hw_desc_addr,
/* TODO: rs->beamformed should be set for SU beamforming also */ /* TODO: rs->beamformed should be set for SU beamforming also */
} }
qdf_export_symbol(hal_rx_mon_hw_desc_get_mpdu_status_6390);
#define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2) #define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2)
uint32_t hal_get_link_desc_size_6390(void) uint32_t hal_get_link_desc_size_6390(void)
@@ -136,21 +133,17 @@ uint32_t hal_get_link_desc_size_6390(void)
return LINK_DESC_SIZE; return LINK_DESC_SIZE;
} }
qdf_export_symbol(hal_get_link_desc_size_6390);
/* /*
* hal_rx_get_tlv_6390(): API to get the tlv * hal_rx_get_tlv_6390(): API to get the tlv
* *
* @rx_tlv: TLV data extracted from the rx packet * @rx_tlv: TLV data extracted from the rx packet
* Return: uint8_t * Return: uint8_t
*/ */
uint8_t hal_rx_get_tlv_6390(void *rx_tlv) static uint8_t hal_rx_get_tlv_6390(void *rx_tlv)
{ {
return HAL_RX_GET(rx_tlv, PHYRX_RSSI_LEGACY_0, RECEIVE_BANDWIDTH); return HAL_RX_GET(rx_tlv, PHYRX_RSSI_LEGACY_0, RECEIVE_BANDWIDTH);
} }
qdf_export_symbol(hal_rx_get_tlv_6390);
/** /**
* hal_rx_proc_phyrx_other_receive_info_tlv_6390() * hal_rx_proc_phyrx_other_receive_info_tlv_6390()
* - process other receive info TLV * - process other receive info TLV
@@ -167,9 +160,6 @@ void hal_rx_proc_phyrx_other_receive_info_tlv_6390(void *rx_tlv_hdr,
void *rx_tlv = (uint8_t *)rx_tlv_hdr + HAL_RX_TLV32_HDR_SIZE; void *rx_tlv = (uint8_t *)rx_tlv_hdr + HAL_RX_TLV32_HDR_SIZE;
void *other_tlv_hdr = NULL; void *other_tlv_hdr = NULL;
void *other_tlv = NULL; void *other_tlv = NULL;
uint32_t ru_details_channel_0;
struct hal_rx_ppdu_info *ppdu_info =
(struct hal_rx_ppdu_info *)ppdu_info_handle;
tlv_tag = HAL_RX_GET_USER_TLV32_TYPE(rx_tlv_hdr); tlv_tag = HAL_RX_GET_USER_TLV32_TYPE(rx_tlv_hdr);
tlv_len = HAL_RX_GET_USER_TLV32_LEN(rx_tlv_hdr); tlv_len = HAL_RX_GET_USER_TLV32_LEN(rx_tlv_hdr);
@@ -191,8 +181,6 @@ void hal_rx_proc_phyrx_other_receive_info_tlv_6390(void *rx_tlv_hdr,
} }
} }
qdf_export_symbol(hal_rx_proc_phyrx_other_receive_info_tlv_6390);
/** /**
* hal_rx_dump_msdu_start_tlv_6390() : dump RX msdu_start TLV in structured * hal_rx_dump_msdu_start_tlv_6390() : dump RX msdu_start TLV in structured
* human readable format. * human readable format.
@@ -267,8 +255,6 @@ void hal_rx_dump_msdu_start_tlv_6390(void *msdustart, uint8_t dbg_level)
msdu_start->sw_phy_meta_data); msdu_start->sw_phy_meta_data);
} }
qdf_export_symbol(hal_rx_dump_msdu_start_tlv_6390);
/** /**
* hal_rx_dump_msdu_end_tlv_6390: dump RX msdu_end TLV in structured * hal_rx_dump_msdu_end_tlv_6390: dump RX msdu_end TLV in structured
* human readable format. * human readable format.
@@ -277,8 +263,8 @@ qdf_export_symbol(hal_rx_dump_msdu_start_tlv_6390);
* *
* Return: void * Return: void
*/ */
void hal_rx_dump_msdu_end_tlv_6390(void *msduend, static void hal_rx_dump_msdu_end_tlv_6390(void *msduend,
uint8_t dbg_level) uint8_t dbg_level)
{ {
struct rx_msdu_end *msdu_end = (struct rx_msdu_end *)msduend; struct rx_msdu_end *msdu_end = (struct rx_msdu_end *)msduend;
@@ -378,7 +364,6 @@ void hal_rx_dump_msdu_end_tlv_6390(void *msduend,
msdu_end->sa_sw_peer_id); msdu_end->sa_sw_peer_id);
} }
qdf_export_symbol(hal_rx_dump_msdu_end_tlv_6390);
/* /*
* Get tid from RX_MPDU_START * Get tid from RX_MPDU_START
@@ -389,7 +374,7 @@ qdf_export_symbol(hal_rx_dump_msdu_end_tlv_6390);
RX_MPDU_INFO_3_TID_MASK, \ RX_MPDU_INFO_3_TID_MASK, \
RX_MPDU_INFO_3_TID_LSB)) RX_MPDU_INFO_3_TID_LSB))
uint32_t hal_rx_mpdu_start_tid_get_6390(uint8_t *buf) static uint32_t hal_rx_mpdu_start_tid_get_6390(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_mpdu_start *mpdu_start = struct rx_mpdu_start *mpdu_start =
@@ -401,8 +386,6 @@ uint32_t hal_rx_mpdu_start_tid_get_6390(uint8_t *buf)
return tid; return tid;
} }
qdf_export_symbol(hal_rx_mpdu_start_tid_get_6390);
#define HAL_RX_MSDU_START_RECEPTION_TYPE_GET(_rx_msdu_start) \ #define HAL_RX_MSDU_START_RECEPTION_TYPE_GET(_rx_msdu_start) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start), \ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start), \
RX_MSDU_START_5_RECEPTION_TYPE_OFFSET)), \ RX_MSDU_START_5_RECEPTION_TYPE_OFFSET)), \
@@ -416,6 +399,7 @@ qdf_export_symbol(hal_rx_mpdu_start_tid_get_6390);
* @buf: pointer to the start of RX PKT TLV header * @buf: pointer to the start of RX PKT TLV header
* Return: uint32_t(reception_type) * Return: uint32_t(reception_type)
*/ */
static
uint32_t hal_rx_msdu_start_reception_type_get_6390(uint8_t *buf) uint32_t hal_rx_msdu_start_reception_type_get_6390(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
@@ -428,8 +412,6 @@ uint32_t hal_rx_msdu_start_reception_type_get_6390(uint8_t *buf)
return reception_type; return reception_type;
} }
qdf_export_symbol(hal_rx_msdu_start_reception_type_get_6390);
#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \ #define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_13_DA_IDX_OR_SW_PEER_ID_OFFSET)), \ RX_MSDU_END_13_DA_IDX_OR_SW_PEER_ID_OFFSET)), \
@@ -443,6 +425,7 @@ qdf_export_symbol(hal_rx_msdu_start_reception_type_get_6390);
* @ buf: pointer to the start of RX PKT TLV headers * @ buf: pointer to the start of RX PKT TLV headers
* Return: da index * Return: da index
*/ */
static
uint16_t hal_rx_msdu_end_da_idx_get_6390(uint8_t *buf) uint16_t hal_rx_msdu_end_da_idx_get_6390(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;

7
hal/wifi3.0/qca6390/hal_6390_tx.h
View File

@@ -56,8 +56,6 @@ void hal_tx_desc_set_dscp_tid_table_id_6390(void *desc,
DSCP_TID_TABLE_NUM, id); DSCP_TID_TABLE_NUM, id);
} }
qdf_export_symbol(hal_tx_desc_set_dscp_tid_table_id_6390);
#define DSCP_TID_TABLE_SIZE 24 #define DSCP_TID_TABLE_SIZE 24
#define NUM_WORDS_PER_DSCP_TID_TABLE (DSCP_TID_TABLE_SIZE / 4) #define NUM_WORDS_PER_DSCP_TID_TABLE (DSCP_TID_TABLE_SIZE / 4)
@@ -129,8 +127,6 @@ void hal_tx_set_dscp_tid_map_6390(void *hal_soc, uint8_t *map,
HAL_REG_WRITE(soc, cmn_reg_addr, regval); HAL_REG_WRITE(soc, cmn_reg_addr, regval);
} }
qdf_export_symbol(hal_tx_set_dscp_tid_map_6390);
/** /**
* hal_tx_update_dscp_tid_6390() - Update the dscp tid map table as updated * hal_tx_update_dscp_tid_6390() - Update the dscp tid map table as updated
* by the user * by the user
@@ -164,8 +160,6 @@ void hal_tx_update_dscp_tid_6390(void *hal_soc, uint8_t tid,
HAL_REG_WRITE(soc, addr, (regval & HWIO_TCL_R0_DSCP_TID_MAP_n_RMSK)); HAL_REG_WRITE(soc, addr, (regval & HWIO_TCL_R0_DSCP_TID_MAP_n_RMSK));
} }
qdf_export_symbol(hal_tx_update_dscp_tid_6390);
/** /**
* hal_tx_desc_set_lmac_id - Set the lmac_id value * hal_tx_desc_set_lmac_id - Set the lmac_id value
* @desc: Handle to Tx Descriptor * @desc: Handle to Tx Descriptor
@@ -183,5 +177,4 @@ void hal_tx_desc_set_lmac_id_6390(void *desc,
HAL_SET_FLD(desc, TCL_DATA_CMD_4, LMAC_ID) |= HAL_SET_FLD(desc, TCL_DATA_CMD_4, LMAC_ID) |=
HAL_TX_SM(TCL_DATA_CMD_4, LMAC_ID, lmac_id); HAL_TX_SM(TCL_DATA_CMD_4, LMAC_ID, lmac_id);
} }
qdf_export_symbol(hal_tx_desc_set_lmac_id_6390);

36
hal/wifi3.0/qca8074/hal_8074_rx.h
View File

@@ -43,7 +43,7 @@
* @buf: pointer to the start of RX PKT TLV header * @buf: pointer to the start of RX PKT TLV header
* Return: uint32_t(nss) * Return: uint32_t(nss)
*/ */
uint32_t static uint32_t
hal_rx_msdu_start_nss_get_8074(uint8_t *buf) hal_rx_msdu_start_nss_get_8074(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
@@ -55,7 +55,6 @@ hal_rx_msdu_start_nss_get_8074(uint8_t *buf)
return nss; return nss;
} }
qdf_export_symbol(hal_rx_msdu_start_nss_get_8074);
/** /**
* hal_rx_mon_hw_desc_get_mpdu_status_8074(): Retrieve MPDU status * hal_rx_mon_hw_desc_get_mpdu_status_8074(): Retrieve MPDU status
* *
@@ -110,30 +109,23 @@ void hal_rx_mon_hw_desc_get_mpdu_status_8074(void *hw_desc_addr,
/* TODO: rs->beamformed should be set for SU beamforming also */ /* TODO: rs->beamformed should be set for SU beamforming also */
} }
qdf_export_symbol(hal_rx_mon_hw_desc_get_mpdu_status_8074);
#define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2) #define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2)
uint32_t hal_get_link_desc_size_8074(void) static uint32_t hal_get_link_desc_size_8074(void)
{ {
return LINK_DESC_SIZE; return LINK_DESC_SIZE;
} }
qdf_export_symbol(hal_get_link_desc_size_8074);
/* /*
* hal_rx_get_tlv_8074(): API to get the tlv * hal_rx_get_tlv_8074(): API to get the tlv
* *
* @rx_tlv: TLV data extracted from the rx packet * @rx_tlv: TLV data extracted from the rx packet
* Return: uint8_t * Return: uint8_t
*/ */
uint8_t hal_rx_get_tlv_8074(void *rx_tlv) static uint8_t hal_rx_get_tlv_8074(void *rx_tlv)
{ {
return HAL_RX_GET(rx_tlv, PHYRX_RSSI_LEGACY_35, RECEIVE_BANDWIDTH); return HAL_RX_GET(rx_tlv, PHYRX_RSSI_LEGACY_35, RECEIVE_BANDWIDTH);
} }
qdf_export_symbol(hal_rx_get_tlv_8074);
/** /**
* hal_rx_proc_phyrx_other_receive_info_tlv_8074() * hal_rx_proc_phyrx_other_receive_info_tlv_8074()
* -process other receive info TLV * -process other receive info TLV
@@ -147,7 +139,6 @@ void hal_rx_proc_phyrx_other_receive_info_tlv_8074(void *rx_tlv_hdr,
{ {
} }
qdf_export_symbol(hal_rx_proc_phyrx_other_receive_info_tlv_8074);
/** /**
* hal_rx_dump_msdu_start_tlv_8074() : dump RX msdu_start TLV in structured * hal_rx_dump_msdu_start_tlv_8074() : dump RX msdu_start TLV in structured
@@ -157,8 +148,8 @@ qdf_export_symbol(hal_rx_proc_phyrx_other_receive_info_tlv_8074);
* *
* Return: void * Return: void
*/ */
void hal_rx_dump_msdu_start_tlv_8074(void *msdustart, static void hal_rx_dump_msdu_start_tlv_8074(void *msdustart,
uint8_t dbg_level) uint8_t dbg_level)
{ {
struct rx_msdu_start *msdu_start = (struct rx_msdu_start *)msdustart; struct rx_msdu_start *msdu_start = (struct rx_msdu_start *)msdustart;
@@ -228,8 +219,6 @@ void hal_rx_dump_msdu_start_tlv_8074(void *msdustart,
msdu_start->sw_phy_meta_data); msdu_start->sw_phy_meta_data);
} }
qdf_export_symbol(hal_rx_dump_msdu_start_tlv_8074);
/** /**
* hal_rx_dump_msdu_end_tlv_8074: dump RX msdu_end TLV in structured * hal_rx_dump_msdu_end_tlv_8074: dump RX msdu_end TLV in structured
* human readable format. * human readable format.
@@ -238,8 +227,8 @@ qdf_export_symbol(hal_rx_dump_msdu_start_tlv_8074);
* *
* Return: void * Return: void
*/ */
void hal_rx_dump_msdu_end_tlv_8074(void *msduend, static void hal_rx_dump_msdu_end_tlv_8074(void *msduend,
uint8_t dbg_level) uint8_t dbg_level)
{ {
struct rx_msdu_end *msdu_end = (struct rx_msdu_end *)msduend; struct rx_msdu_end *msdu_end = (struct rx_msdu_end *)msduend;
@@ -339,7 +328,6 @@ void hal_rx_dump_msdu_end_tlv_8074(void *msduend,
msdu_end->sa_sw_peer_id); msdu_end->sa_sw_peer_id);
} }
qdf_export_symbol(hal_rx_dump_msdu_end_tlv_8074);
/* /*
* Get tid from RX_MPDU_START * Get tid from RX_MPDU_START
@@ -350,7 +338,7 @@ qdf_export_symbol(hal_rx_dump_msdu_end_tlv_8074);
RX_MPDU_INFO_3_TID_MASK, \ RX_MPDU_INFO_3_TID_MASK, \
RX_MPDU_INFO_3_TID_LSB)) RX_MPDU_INFO_3_TID_LSB))
uint32_t hal_rx_mpdu_start_tid_get_8074(uint8_t *buf) static uint32_t hal_rx_mpdu_start_tid_get_8074(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_mpdu_start *mpdu_start = struct rx_mpdu_start *mpdu_start =
@@ -362,8 +350,6 @@ uint32_t hal_rx_mpdu_start_tid_get_8074(uint8_t *buf)
return tid; return tid;
} }
qdf_export_symbol(hal_rx_mpdu_start_tid_get_8074);
#define HAL_RX_MSDU_START_RECEPTION_TYPE_GET(_rx_msdu_start) \ #define HAL_RX_MSDU_START_RECEPTION_TYPE_GET(_rx_msdu_start) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start), \ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start), \
RX_MSDU_START_5_RECEPTION_TYPE_OFFSET)), \ RX_MSDU_START_5_RECEPTION_TYPE_OFFSET)), \
@@ -377,7 +363,7 @@ qdf_export_symbol(hal_rx_mpdu_start_tid_get_8074);
* @buf: pointer to the start of RX PKT TLV header * @buf: pointer to the start of RX PKT TLV header
* Return: uint32_t(reception_type) * Return: uint32_t(reception_type)
*/ */
uint32_t hal_rx_msdu_start_reception_type_get_8074(uint8_t *buf) static uint32_t hal_rx_msdu_start_reception_type_get_8074(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_msdu_start *msdu_start = struct rx_msdu_start *msdu_start =
@@ -389,8 +375,6 @@ uint32_t hal_rx_msdu_start_reception_type_get_8074(uint8_t *buf)
return reception_type; return reception_type;
} }
qdf_export_symbol(hal_rx_msdu_start_reception_type_get_8074);
#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \ #define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_13_DA_IDX_OFFSET)), \ RX_MSDU_END_13_DA_IDX_OFFSET)), \
@@ -404,7 +388,7 @@ qdf_export_symbol(hal_rx_msdu_start_reception_type_get_8074);
* @ buf: pointer to the start of RX PKT TLV headers * @ buf: pointer to the start of RX PKT TLV headers
* Return: da index * Return: da index
*/ */
uint16_t hal_rx_msdu_end_da_idx_get_8074(uint8_t *buf) static uint16_t hal_rx_msdu_end_da_idx_get_8074(uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;

8
hal/wifi3.0/qca8074/hal_8074_tx.h
View File

@@ -54,8 +54,6 @@ void hal_tx_desc_set_dscp_tid_table_id_8074(void *desc,
DSCP_TO_TID_PRIORITY_TABLE_ID, id); DSCP_TO_TID_PRIORITY_TABLE_ID, id);
} }
qdf_export_symbol(hal_tx_desc_set_dscp_tid_table_id_8074);
/** /**
* hal_tx_set_dscp_tid_map_8074() - Configure default DSCP to TID map table * hal_tx_set_dscp_tid_map_8074() - Configure default DSCP to TID map table
* @soc: HAL SoC context * @soc: HAL SoC context
@@ -106,8 +104,6 @@ void hal_tx_set_dscp_tid_map_8074(void *hal_soc, uint8_t *map,
} }
} }
qdf_export_symbol(hal_tx_set_dscp_tid_map_8074);
/** /**
* hal_tx_update_dscp_tid_8074() - Update the dscp tid map table as * hal_tx_update_dscp_tid_8074() - Update the dscp tid map table as
updated by user updated by user
@@ -150,7 +146,6 @@ void hal_tx_update_dscp_tid_8074(void *hal_soc, uint8_t tid,
(regval & HWIO_TCL_R0_DSCP_TID1_MAP_1_RMSK)); (regval & HWIO_TCL_R0_DSCP_TID1_MAP_1_RMSK));
} }
qdf_export_symbol(hal_tx_update_dscp_tid_8074);
/** /**
* hal_tx_desc_set_lmac_id - Set the lmac_id value * hal_tx_desc_set_lmac_id - Set the lmac_id value
* @desc: Handle to Tx Descriptor * @desc: Handle to Tx Descriptor
@@ -166,6 +161,3 @@ void hal_tx_desc_set_lmac_id_8074(void *desc,
uint8_t lmac_id) uint8_t lmac_id)
{ {
} }
qdf_export_symbol(hal_tx_desc_set_lmac_id_8074);

2
hif/src/pcie/if_pci.c
View File

@@ -3793,7 +3793,9 @@ static bool hif_is_pld_based_target(int device_id)
switch (device_id) { switch (device_id) {
case QCA6290_DEVICE_ID: case QCA6290_DEVICE_ID:
case QCA6290_EMULATION_DEVICE_ID: case QCA6290_EMULATION_DEVICE_ID:
#ifdef QCA_WIFI_QCA6390
case QCA6390_DEVICE_ID: case QCA6390_DEVICE_ID:
#endif
case AR6320_DEVICE_ID: case AR6320_DEVICE_ID:
return true; return true;
} }