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

qcacmn: Add hal_rx_get_mpdu_mac_ad4_valid API

Browse Source 
Implement hal_rx_get_mpdu_mac_ad4_valid API
based on the chipset as the macro to retrieve
mac_ad4 value is chipset dependent.

Change-Id: I9d7cc90e798d4f0775e915fe6edcb1a1f5129490
CRs-Fixed: 2522133
This commit is contained in:
Venkata Sharath Chandra Manchala
2019-09-21 11:52:54 -07:00
committed by nshrivas
parent 55f2d92e61
commit 2a52d3426c
14 changed files with 146 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2081,7 +2081,8 @@ done:
if (qdf_unlikely(peer && (peer->nawds_enabled) && if (qdf_unlikely(peer && (peer->nawds_enabled) &&
(qdf_nbuf_is_da_mcbc(nbuf)) && (qdf_nbuf_is_da_mcbc(nbuf)) &&
(hal_rx_get_mpdu_mac_ad4_valid(rx_tlv_hdr) == (hal_rx_get_mpdu_mac_ad4_valid(soc->hal_soc,
rx_tlv_hdr) ==
false))) { false))) {
tid_stats->fail_cnt[NAWDS_MCAST_DROP]++; tid_stats->fail_cnt[NAWDS_MCAST_DROP]++;
DP_STATS_INC(peer, rx.nawds_mcast_drop, 1); DP_STATS_INC(peer, rx.nawds_mcast_drop, 1);

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

@@ -391,6 +391,7 @@ struct hal_hw_txrx_ops {
uint8_t (*hal_rx_msdu_end_first_msdu_get)(uint8_t *buf); uint8_t (*hal_rx_msdu_end_first_msdu_get)(uint8_t *buf);
uint8_t (*hal_rx_msdu_end_da_is_valid_get)(uint8_t *buf); uint8_t (*hal_rx_msdu_end_da_is_valid_get)(uint8_t *buf);
uint8_t (*hal_rx_msdu_end_last_msdu_get)(uint8_t *buf); uint8_t (*hal_rx_msdu_end_last_msdu_get)(uint8_t *buf);
bool (*hal_rx_get_mpdu_mac_ad4_valid)(uint8_t *buf);
}; };
/** /**

20
hal/wifi3.0/hal_rx.h
View File

@@ -2873,27 +2873,19 @@ uint8_t hal_rx_get_mpdu_frame_control_valid(uint8_t *buf)
return frm_ctrl_valid; return frm_ctrl_valid;
} }
#define HAL_RX_MPDU_GET_MAC_AD4_VALID(_rx_mpdu_info) \ /**
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_OFFSET)), \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_MASK, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_LSB))
/*
* hal_rx_get_mpdu_mac_ad4_valid(): Retrieves if mpdu 4th addr is valid * hal_rx_get_mpdu_mac_ad4_valid(): Retrieves if mpdu 4th addr is valid
* * @hal_soc_hdl: hal soc handle
* @nbuf: Network buffer * @nbuf: Network buffer
* Returns: value of mpdu 4th address valid field * Returns: value of mpdu 4th address valid field
*/ */
static inline static inline
bool hal_rx_get_mpdu_mac_ad4_valid(uint8_t *buf) bool hal_rx_get_mpdu_mac_ad4_valid(hal_soc_handle_t hal_soc_hdl,
uint8_t *buf)
{ {
struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf); struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl;
struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs);
bool ad4_valid = 0;
ad4_valid = HAL_RX_MPDU_GET_MAC_AD4_VALID(rx_mpdu_info); return hal_soc->ops->hal_rx_get_mpdu_mac_ad4_valid(buf);
return ad4_valid;
} }
/* /*

18
hal/wifi3.0/qca6290/hal_6290.c
View File

@@ -309,6 +309,23 @@ static uint8_t hal_rx_msdu_end_last_msdu_get_6290(uint8_t *buf)
return last_msdu; return last_msdu;
} }
/*
* hal_rx_get_mpdu_mac_ad4_valid_6290(): Retrieves if mpdu 4th addr is valid
*
* @nbuf: Network buffer
* Returns: value of mpdu 4th address valid field
*/
static bool hal_rx_get_mpdu_mac_ad4_valid_6290(uint8_t *buf)
{
struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf);
struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs);
bool ad4_valid = 0;
ad4_valid = HAL_RX_MPDU_GET_MAC_AD4_VALID(rx_mpdu_info);
return ad4_valid;
}
struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = { struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
/* init and setup */ /* init and setup */
hal_srng_dst_hw_init_generic, hal_srng_dst_hw_init_generic,
@@ -361,6 +378,7 @@ struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
hal_rx_msdu_end_first_msdu_get_6290, hal_rx_msdu_end_first_msdu_get_6290,
hal_rx_msdu_end_da_is_valid_get_6290, hal_rx_msdu_end_da_is_valid_get_6290,
hal_rx_msdu_end_last_msdu_get_6290, hal_rx_msdu_end_last_msdu_get_6290,
hal_rx_get_mpdu_mac_ad4_valid_6290,
}; };
struct hal_hw_srng_config hw_srng_table_6290[] = { struct hal_hw_srng_config hw_srng_table_6290[] = {

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

@@ -113,6 +113,12 @@
RX_MSDU_END_5_LAST_MSDU_MASK, \ RX_MSDU_END_5_LAST_MSDU_MASK, \
RX_MSDU_END_5_LAST_MSDU_LSB)) RX_MSDU_END_5_LAST_MSDU_LSB))
#define HAL_RX_MPDU_GET_MAC_AD4_VALID(_rx_mpdu_info) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_OFFSET)), \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_MASK, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_LSB))
#if defined(QCA_WIFI_QCA6290_11AX) #if defined(QCA_WIFI_QCA6290_11AX)
#define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_rx_msdu_start)\ #define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_rx_msdu_start)\
(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\

17
hal/wifi3.0/qca6390/hal_6390.c
View File

@@ -308,6 +308,22 @@ static uint8_t hal_rx_msdu_end_last_msdu_get_6390(uint8_t *buf)
return last_msdu; return last_msdu;
} }
/*
* hal_rx_get_mpdu_mac_ad4_valid_6390(): Retrieves if mpdu 4th addr is valid
*
* @nbuf: Network buffer
* Returns: value of mpdu 4th address valid field
*/
static bool hal_rx_get_mpdu_mac_ad4_valid_6390(uint8_t *buf)
{
struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf);
struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs);
bool ad4_valid = 0;
ad4_valid = HAL_RX_MPDU_GET_MAC_AD4_VALID(rx_mpdu_info);
return ad4_valid;
}
struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = { struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
/* init and setup */ /* init and setup */
hal_srng_dst_hw_init_generic, hal_srng_dst_hw_init_generic,
@@ -360,6 +376,7 @@ struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
hal_rx_msdu_end_first_msdu_get_6390, hal_rx_msdu_end_first_msdu_get_6390,
hal_rx_msdu_end_da_is_valid_get_6390, hal_rx_msdu_end_da_is_valid_get_6390,
hal_rx_msdu_end_last_msdu_get_6390, hal_rx_msdu_end_last_msdu_get_6390,
hal_rx_get_mpdu_mac_ad4_valid_6390,
}; };
struct hal_hw_srng_config hw_srng_table_6390[] = { struct hal_hw_srng_config hw_srng_table_6390[] = {

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

@@ -113,6 +113,12 @@
RX_MSDU_END_5_LAST_MSDU_MASK, \ RX_MSDU_END_5_LAST_MSDU_MASK, \
RX_MSDU_END_5_LAST_MSDU_LSB)) RX_MSDU_END_5_LAST_MSDU_LSB))
#define HAL_RX_MPDU_GET_MAC_AD4_VALID(_rx_mpdu_info) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_OFFSET)), \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_MASK, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_LSB))
#define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_rx_msdu_start)\ #define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_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_MIMO_SS_BITMAP_OFFSET)), \ RX_MSDU_START_5_MIMO_SS_BITMAP_OFFSET)), \

18
hal/wifi3.0/qca6490/hal_6490.c
View File

@@ -214,6 +214,23 @@ static uint8_t hal_rx_msdu_end_last_msdu_get_6490(uint8_t *buf)
return last_msdu; return last_msdu;
} }
/*
* hal_rx_get_mpdu_mac_ad4_valid_6490(): Retrieves if mpdu 4th addr is valid
*
* @nbuf: Network buffer
* Returns: value of mpdu 4th address valid field
*/
static bool hal_rx_get_mpdu_mac_ad4_valid_6490(uint8_t *buf)
{
struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf);
struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs);
bool ad4_valid = 0;
ad4_valid = HAL_RX_MPDU_GET_MAC_AD4_VALID(rx_mpdu_info);
return ad4_valid;
}
struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = { struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
/* rx */ /* rx */
hal_rx_get_rx_fragment_number_6490, hal_rx_get_rx_fragment_number_6490,
@@ -226,4 +243,5 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
hal_rx_msdu_end_first_msdu_get_6490, hal_rx_msdu_end_first_msdu_get_6490,
hal_rx_msdu_end_da_is_valid_get_6490, hal_rx_msdu_end_da_is_valid_get_6490,
hal_rx_msdu_end_last_msdu_get_6490, hal_rx_msdu_end_last_msdu_get_6490,
hal_rx_get_mpdu_mac_ad4_valid_6490,
}; };

6
hal/wifi3.0/qca6490/hal_6490_rx.h
View File

@@ -93,3 +93,9 @@
RX_MSDU_END_10_LAST_MSDU_OFFSET)), \ RX_MSDU_END_10_LAST_MSDU_OFFSET)), \
RX_MSDU_END_10_LAST_MSDU_MASK, \ RX_MSDU_END_10_LAST_MSDU_MASK, \
RX_MSDU_END_10_LAST_MSDU_LSB)) RX_MSDU_END_10_LAST_MSDU_LSB))
#define HAL_RX_MPDU_GET_MAC_AD4_VALID(_rx_mpdu_info) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
RX_MPDU_INFO_11_MAC_ADDR_AD4_VALID_OFFSET)), \
RX_MPDU_INFO_11_MAC_ADDR_AD4_VALID_MASK, \
RX_MPDU_INFO_11_MAC_ADDR_AD4_VALID_LSB))

18
hal/wifi3.0/qca8074v1/hal_8074v1.c
View File

@@ -304,6 +304,23 @@ static uint8_t hal_rx_msdu_end_last_msdu_get_8074v1(uint8_t *buf)
return last_msdu; return last_msdu;
} }
/*
* hal_rx_get_mpdu_mac_ad4_valid_8074v1(): Retrieves if mpdu 4th addr is valid
*
* @nbuf: Network buffer
* Returns: value of mpdu 4th address valid field
*/
static bool hal_rx_get_mpdu_mac_ad4_valid_8074v1(uint8_t *buf)
{
struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf);
struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs);
bool ad4_valid = 0;
ad4_valid = HAL_RX_MPDU_GET_MAC_AD4_VALID(rx_mpdu_info);
return ad4_valid;
}
struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = { struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
/* init and setup */ /* init and setup */
@@ -357,6 +374,7 @@ struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
hal_rx_msdu_end_first_msdu_get_8074v1, hal_rx_msdu_end_first_msdu_get_8074v1,
hal_rx_msdu_end_da_is_valid_get_8074v1, hal_rx_msdu_end_da_is_valid_get_8074v1,
hal_rx_msdu_end_last_msdu_get_8074v1, hal_rx_msdu_end_last_msdu_get_8074v1,
hal_rx_get_mpdu_mac_ad4_valid_8074v1,
}; };
struct hal_hw_srng_config hw_srng_table_8074[] = { struct hal_hw_srng_config hw_srng_table_8074[] = {

6
hal/wifi3.0/qca8074v1/hal_8074v1_rx.h
View File

@@ -101,6 +101,12 @@
RX_MSDU_END_5_LAST_MSDU_OFFSET)), \ RX_MSDU_END_5_LAST_MSDU_OFFSET)), \
RX_MSDU_END_5_LAST_MSDU_MASK, \ RX_MSDU_END_5_LAST_MSDU_MASK, \
RX_MSDU_END_5_LAST_MSDU_LSB)) RX_MSDU_END_5_LAST_MSDU_LSB))
#define HAL_RX_MPDU_GET_MAC_AD4_VALID(_rx_mpdu_info) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_OFFSET)), \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_MASK, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_LSB))
/* /*
* hal_rx_msdu_start_nss_get_8074(): API to get the NSS * hal_rx_msdu_start_nss_get_8074(): API to get the NSS
* Interval from rx_msdu_start * Interval from rx_msdu_start

18
hal/wifi3.0/qca8074v2/hal_8074v2.c
View File

@@ -303,6 +303,23 @@ static uint8_t hal_rx_msdu_end_last_msdu_get_8074v2(uint8_t *buf)
return last_msdu; return last_msdu;
} }
/*
* hal_rx_get_mpdu_mac_ad4_valid_8074v2(): Retrieves if mpdu 4th addr is valid
*
* @nbuf: Network buffer
* Returns: value of mpdu 4th address valid field
*/
static bool hal_rx_get_mpdu_mac_ad4_valid_8074v2(uint8_t *buf)
{
struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf);
struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs);
bool ad4_valid = 0;
ad4_valid = HAL_RX_MPDU_GET_MAC_AD4_VALID(rx_mpdu_info);
return ad4_valid;
}
struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = { struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
/* init and setup */ /* init and setup */
@@ -356,6 +373,7 @@ struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
hal_rx_msdu_end_first_msdu_get_8074v2, hal_rx_msdu_end_first_msdu_get_8074v2,
hal_rx_msdu_end_da_is_valid_get_8074v2, hal_rx_msdu_end_da_is_valid_get_8074v2,
hal_rx_msdu_end_last_msdu_get_8074v2, hal_rx_msdu_end_last_msdu_get_8074v2,
hal_rx_get_mpdu_mac_ad4_valid_8074v2,
}; };
struct hal_hw_srng_config hw_srng_table_8074v2[] = { struct hal_hw_srng_config hw_srng_table_8074v2[] = {

6
hal/wifi3.0/qca8074v2/hal_8074v2_rx.h
View File

@@ -110,6 +110,12 @@
RX_MSDU_END_5_LAST_MSDU_OFFSET)), \ RX_MSDU_END_5_LAST_MSDU_OFFSET)), \
RX_MSDU_END_5_LAST_MSDU_MASK, \ RX_MSDU_END_5_LAST_MSDU_MASK, \
RX_MSDU_END_5_LAST_MSDU_LSB)) RX_MSDU_END_5_LAST_MSDU_LSB))
#define HAL_RX_MPDU_GET_MAC_AD4_VALID(_rx_mpdu_info) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_OFFSET)), \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_MASK, \
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_LSB))
/* /*
* hal_rx_msdu_start_nss_get_8074v2(): API to get the NSS * hal_rx_msdu_start_nss_get_8074v2(): API to get the NSS
* Interval from rx_msdu_start * Interval from rx_msdu_start

18
hal/wifi3.0/qcn9000/hal_9000.c
View File

@@ -312,6 +312,23 @@ static uint8_t hal_rx_msdu_end_last_msdu_get_9000(uint8_t *buf)
return last_msdu; return last_msdu;
} }
/*
* hal_rx_get_mpdu_mac_ad4_valid(): Retrieves if mpdu 4th addr is valid
*
* @nbuf: Network buffer
* Returns: value of mpdu 4th address valid field
*/
inline bool hal_rx_get_mpdu_mac_ad4_valid_9000(uint8_t *buf)
{
struct rx_pkt_tlvs *pkt_tlvs = hal_rx_get_pkt_tlvs(buf);
struct rx_mpdu_info *rx_mpdu_info = hal_rx_get_mpdu_info(pkt_tlvs);
bool ad4_valid = 0;
ad4_valid = HAL_RX_MPDU_GET_MAC_AD4_VALID(rx_mpdu_info);
return ad4_valid;
}
struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = { struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
/* init and setup */ /* init and setup */
@@ -365,6 +382,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
hal_rx_msdu_end_first_msdu_get_9000, hal_rx_msdu_end_first_msdu_get_9000,
hal_rx_msdu_end_da_is_valid_get_9000, hal_rx_msdu_end_da_is_valid_get_9000,
hal_rx_msdu_end_last_msdu_get_9000, hal_rx_msdu_end_last_msdu_get_9000,
hal_rx_get_mpdu_mac_ad4_valid_9000,
}; };
struct hal_hw_srng_config hw_srng_table_9000[] = { struct hal_hw_srng_config hw_srng_table_9000[] = {