qcacmn: Add hal_rx_mpdu_get_addr2 API
Implement hal_rx_mpdu_get_addr2 API based on the chipset as the macro to retrieve addr2 value is chipset dependent. Change-Id: I4026db892d4f2f41db72c50f780ba898b8a17fa7 CRs-Fixed: 2522133
This commit is contained in:

committed by
nshrivas

parent
e3ae3193f9
commit
a81a2fed42
@@ -641,7 +641,8 @@ QDF_STATUS dp_rx_filter_mesh_packets(struct dp_vdev *vdev, qdf_nbuf_t nbuf,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (vdev->mesh_rx_filter & MESH_FILTER_OUT_TA) {
|
if (vdev->mesh_rx_filter & MESH_FILTER_OUT_TA) {
|
||||||
if (hal_rx_mpdu_get_addr2(rx_tlv_hdr,
|
if (hal_rx_mpdu_get_addr2(soc->hal_soc,
|
||||||
|
rx_tlv_hdr,
|
||||||
&mac_addr.raw[0]))
|
&mac_addr.raw[0]))
|
||||||
return QDF_STATUS_E_FAILURE;
|
return QDF_STATUS_E_FAILURE;
|
||||||
|
|
||||||
|
@@ -946,7 +946,7 @@ dp_rx_defrag_nwifi_to_8023(struct dp_soc *soc,
|
|||||||
&mac_addr.raw[0]);
|
&mac_addr.raw[0]);
|
||||||
qdf_mem_copy(eth_hdr->dest_addr, &mac_addr.raw[0],
|
qdf_mem_copy(eth_hdr->dest_addr, &mac_addr.raw[0],
|
||||||
QDF_MAC_ADDR_SIZE);
|
QDF_MAC_ADDR_SIZE);
|
||||||
hal_rx_mpdu_get_addr2(rx_desc_info,
|
hal_rx_mpdu_get_addr2(soc->hal_soc, rx_desc_info,
|
||||||
&mac_addr.raw[0]);
|
&mac_addr.raw[0]);
|
||||||
qdf_mem_copy(eth_hdr->src_addr, &mac_addr.raw[0],
|
qdf_mem_copy(eth_hdr->src_addr, &mac_addr.raw[0],
|
||||||
QDF_MAC_ADDR_SIZE);
|
QDF_MAC_ADDR_SIZE);
|
||||||
@@ -956,7 +956,7 @@ dp_rx_defrag_nwifi_to_8023(struct dp_soc *soc,
|
|||||||
&mac_addr.raw[0]);
|
&mac_addr.raw[0]);
|
||||||
qdf_mem_copy(eth_hdr->dest_addr, &mac_addr.raw[0],
|
qdf_mem_copy(eth_hdr->dest_addr, &mac_addr.raw[0],
|
||||||
QDF_MAC_ADDR_SIZE);
|
QDF_MAC_ADDR_SIZE);
|
||||||
hal_rx_mpdu_get_addr2(rx_desc_info,
|
hal_rx_mpdu_get_addr2(soc->hal_soc, rx_desc_info,
|
||||||
&mac_addr.raw[0]);
|
&mac_addr.raw[0]);
|
||||||
qdf_mem_copy(eth_hdr->src_addr, &mac_addr.raw[0],
|
qdf_mem_copy(eth_hdr->src_addr, &mac_addr.raw[0],
|
||||||
QDF_MAC_ADDR_SIZE);
|
QDF_MAC_ADDR_SIZE);
|
||||||
|
@@ -398,6 +398,8 @@ struct hal_hw_txrx_ops {
|
|||||||
uint8_t (*hal_rx_get_mpdu_frame_control_valid)(uint8_t *buf);
|
uint8_t (*hal_rx_get_mpdu_frame_control_valid)(uint8_t *buf);
|
||||||
QDF_STATUS
|
QDF_STATUS
|
||||||
(*hal_rx_mpdu_get_addr1)(uint8_t *buf, uint8_t *mac_addr);
|
(*hal_rx_mpdu_get_addr1)(uint8_t *buf, uint8_t *mac_addr);
|
||||||
|
QDF_STATUS
|
||||||
|
(*hal_rx_mpdu_get_addr2)(uint8_t *buf, uint8_t *mac_addr);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -1509,11 +1509,6 @@ hal_rx_mpdu_get_fr_ds(hal_soc_handle_t hal_soc_hdl, uint8_t *buf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(_rx_mpdu_info) \
|
|
||||||
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
|
||||||
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_OFFSET)), \
|
|
||||||
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_MASK, \
|
|
||||||
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_LSB))
|
|
||||||
|
|
||||||
#define HAL_RX_MPDU_MAC_ADDR_AD3_VALID_GET(_rx_mpdu_info) \
|
#define HAL_RX_MPDU_MAC_ADDR_AD3_VALID_GET(_rx_mpdu_info) \
|
||||||
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
@@ -1527,19 +1522,6 @@ hal_rx_mpdu_get_fr_ds(hal_soc_handle_t hal_soc_hdl, uint8_t *buf)
|
|||||||
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_MASK, \
|
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_MASK, \
|
||||||
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_LSB))
|
RX_MPDU_INFO_2_MAC_ADDR_AD4_VALID_LSB))
|
||||||
|
|
||||||
|
|
||||||
#define HAL_RX_MPDU_AD2_15_0_GET(_rx_mpdu_info) \
|
|
||||||
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_OFFSET)), \
|
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_MASK, \
|
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_LSB))
|
|
||||||
|
|
||||||
#define HAL_RX_MPDU_AD2_47_16_GET(_rx_mpdu_info) \
|
|
||||||
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
|
||||||
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_OFFSET)), \
|
|
||||||
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_MASK, \
|
|
||||||
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_LSB))
|
|
||||||
|
|
||||||
#define HAL_RX_MPDU_AD3_31_0_GET(_rx_mpdu_info) \
|
#define HAL_RX_MPDU_AD3_31_0_GET(_rx_mpdu_info) \
|
||||||
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
RX_MPDU_INFO_18_MAC_ADDR_AD3_31_0_OFFSET)), \
|
RX_MPDU_INFO_18_MAC_ADDR_AD3_31_0_OFFSET)), \
|
||||||
@@ -1584,36 +1566,19 @@ QDF_STATUS hal_rx_mpdu_get_addr1(hal_soc_handle_t hal_soc_hdl,
|
|||||||
/*
|
/*
|
||||||
* hal_rx_mpdu_get_addr2(): API to check get address2 of the mpdu
|
* hal_rx_mpdu_get_addr2(): API to check get address2 of the mpdu
|
||||||
* in the packet
|
* in the packet
|
||||||
*
|
* @hal_soc_hdl: hal soc handle
|
||||||
* @buf: pointer to the start of RX PKT TLV header
|
* @buf: pointer to the start of RX PKT TLV header
|
||||||
* @mac_addr: pointer to mac address
|
* @mac_addr: pointer to mac address
|
||||||
|
*
|
||||||
* Return: success/failure
|
* Return: success/failure
|
||||||
*/
|
*/
|
||||||
static inline
|
static inline
|
||||||
QDF_STATUS hal_rx_mpdu_get_addr2(uint8_t *buf, uint8_t *mac_addr)
|
QDF_STATUS hal_rx_mpdu_get_addr2(hal_soc_handle_t hal_soc_hdl,
|
||||||
|
uint8_t *buf, uint8_t *mac_addr)
|
||||||
{
|
{
|
||||||
struct __attribute__((__packed__)) hal_addr2 {
|
struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl;
|
||||||
uint16_t ad2_15_0;
|
|
||||||
uint32_t ad2_47_16;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
|
return hal_soc->ops->hal_rx_mpdu_get_addr2(buf, mac_addr);
|
||||||
struct rx_mpdu_start *mpdu_start =
|
|
||||||
&pkt_tlvs->mpdu_start_tlv.rx_mpdu_start;
|
|
||||||
|
|
||||||
struct rx_mpdu_info *mpdu_info = &mpdu_start->rx_mpdu_info_details;
|
|
||||||
struct hal_addr2 *addr = (struct hal_addr2 *)mac_addr;
|
|
||||||
uint32_t mac_addr_ad2_valid;
|
|
||||||
|
|
||||||
mac_addr_ad2_valid = HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(mpdu_info);
|
|
||||||
|
|
||||||
if (mac_addr_ad2_valid) {
|
|
||||||
addr->ad2_15_0 = HAL_RX_MPDU_AD2_15_0_GET(mpdu_info);
|
|
||||||
addr->ad2_47_16 = HAL_RX_MPDU_AD2_47_16_GET(mpdu_info);
|
|
||||||
return QDF_STATUS_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
return QDF_STATUS_E_FAILURE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -426,6 +426,41 @@ static QDF_STATUS hal_rx_mpdu_get_addr1_6290(uint8_t *buf, uint8_t *mac_addr)
|
|||||||
|
|
||||||
return QDF_STATUS_E_FAILURE;
|
return QDF_STATUS_E_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* hal_rx_mpdu_get_addr2_6290(): API to check get address2 of the mpdu
|
||||||
|
* in the packet
|
||||||
|
*
|
||||||
|
* @buf: pointer to the start of RX PKT TLV header
|
||||||
|
* @mac_addr: pointer to mac address
|
||||||
|
* Return: success/failure
|
||||||
|
*/
|
||||||
|
static QDF_STATUS hal_rx_mpdu_get_addr2_6290(uint8_t *buf,
|
||||||
|
uint8_t *mac_addr)
|
||||||
|
{
|
||||||
|
struct __attribute__((__packed__)) hal_addr2 {
|
||||||
|
uint16_t ad2_15_0;
|
||||||
|
uint32_t ad2_47_16;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
|
||||||
|
struct rx_mpdu_start *mpdu_start =
|
||||||
|
&pkt_tlvs->mpdu_start_tlv.rx_mpdu_start;
|
||||||
|
|
||||||
|
struct rx_mpdu_info *mpdu_info = &mpdu_start->rx_mpdu_info_details;
|
||||||
|
struct hal_addr2 *addr = (struct hal_addr2 *)mac_addr;
|
||||||
|
uint32_t mac_addr_ad2_valid;
|
||||||
|
|
||||||
|
mac_addr_ad2_valid = HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(mpdu_info);
|
||||||
|
|
||||||
|
if (mac_addr_ad2_valid) {
|
||||||
|
addr->ad2_15_0 = HAL_RX_MPDU_AD2_15_0_GET(mpdu_info);
|
||||||
|
addr->ad2_47_16 = HAL_RX_MPDU_AD2_47_16_GET(mpdu_info);
|
||||||
|
return QDF_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QDF_STATUS_E_FAILURE;
|
||||||
|
}
|
||||||
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,
|
||||||
@@ -484,6 +519,7 @@ struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
|
|||||||
hal_rx_mpdu_get_fr_ds_6290,
|
hal_rx_mpdu_get_fr_ds_6290,
|
||||||
hal_rx_get_mpdu_frame_control_valid_6290,
|
hal_rx_get_mpdu_frame_control_valid_6290,
|
||||||
hal_rx_mpdu_get_addr1_6290,
|
hal_rx_mpdu_get_addr1_6290,
|
||||||
|
hal_rx_mpdu_get_addr2_6290,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct hal_hw_srng_config hw_srng_table_6290[] = {
|
struct hal_hw_srng_config hw_srng_table_6290[] = {
|
||||||
|
@@ -161,6 +161,24 @@
|
|||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_MASK, \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_15_0_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_MASK, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_47_16_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_MASK, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_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),\
|
||||||
|
@@ -424,6 +424,41 @@ static QDF_STATUS hal_rx_mpdu_get_addr1_6390(uint8_t *buf, uint8_t *mac_addr)
|
|||||||
|
|
||||||
return QDF_STATUS_E_FAILURE;
|
return QDF_STATUS_E_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* hal_rx_mpdu_get_addr2_6390(): API to check get address2 of the mpdu
|
||||||
|
* in the packet
|
||||||
|
*
|
||||||
|
* @buf: pointer to the start of RX PKT TLV header
|
||||||
|
* @mac_addr: pointer to mac address
|
||||||
|
* Return: success/failure
|
||||||
|
*/
|
||||||
|
static QDF_STATUS hal_rx_mpdu_get_addr2_6390(uint8_t *buf,
|
||||||
|
uint8_t *mac_addr)
|
||||||
|
{
|
||||||
|
struct __attribute__((__packed__)) hal_addr2 {
|
||||||
|
uint16_t ad2_15_0;
|
||||||
|
uint32_t ad2_47_16;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
|
||||||
|
struct rx_mpdu_start *mpdu_start =
|
||||||
|
&pkt_tlvs->mpdu_start_tlv.rx_mpdu_start;
|
||||||
|
|
||||||
|
struct rx_mpdu_info *mpdu_info = &mpdu_start->rx_mpdu_info_details;
|
||||||
|
struct hal_addr2 *addr = (struct hal_addr2 *)mac_addr;
|
||||||
|
uint32_t mac_addr_ad2_valid;
|
||||||
|
|
||||||
|
mac_addr_ad2_valid = HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(mpdu_info);
|
||||||
|
|
||||||
|
if (mac_addr_ad2_valid) {
|
||||||
|
addr->ad2_15_0 = HAL_RX_MPDU_AD2_15_0_GET(mpdu_info);
|
||||||
|
addr->ad2_47_16 = HAL_RX_MPDU_AD2_47_16_GET(mpdu_info);
|
||||||
|
return QDF_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QDF_STATUS_E_FAILURE;
|
||||||
|
}
|
||||||
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,
|
||||||
@@ -482,6 +517,7 @@ struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
|
|||||||
hal_rx_mpdu_get_fr_ds_6390,
|
hal_rx_mpdu_get_fr_ds_6390,
|
||||||
hal_rx_get_mpdu_frame_control_valid_6390,
|
hal_rx_get_mpdu_frame_control_valid_6390,
|
||||||
hal_rx_mpdu_get_addr1_6390,
|
hal_rx_mpdu_get_addr1_6390,
|
||||||
|
hal_rx_mpdu_get_addr2_6390,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct hal_hw_srng_config hw_srng_table_6390[] = {
|
struct hal_hw_srng_config hw_srng_table_6390[] = {
|
||||||
|
@@ -161,6 +161,24 @@
|
|||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_MASK, \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_15_0_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_MASK, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_47_16_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_MASK, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_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)), \
|
||||||
|
@@ -330,6 +330,41 @@ static QDF_STATUS hal_rx_mpdu_get_addr1_6490(uint8_t *buf, uint8_t *mac_addr)
|
|||||||
|
|
||||||
return QDF_STATUS_E_FAILURE;
|
return QDF_STATUS_E_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* hal_rx_mpdu_get_addr2_6490(): API to check get address2 of the mpdu
|
||||||
|
* in the packet
|
||||||
|
*
|
||||||
|
* @buf: pointer to the start of RX PKT TLV header
|
||||||
|
* @mac_addr: pointer to mac address
|
||||||
|
* Return: success/failure
|
||||||
|
*/
|
||||||
|
static QDF_STATUS hal_rx_mpdu_get_addr2_6490(uint8_t *buf,
|
||||||
|
uint8_t *mac_addr)
|
||||||
|
{
|
||||||
|
struct __attribute__((__packed__)) hal_addr2 {
|
||||||
|
uint16_t ad2_15_0;
|
||||||
|
uint32_t ad2_47_16;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
|
||||||
|
struct rx_mpdu_start *mpdu_start =
|
||||||
|
&pkt_tlvs->mpdu_start_tlv.rx_mpdu_start;
|
||||||
|
|
||||||
|
struct rx_mpdu_info *mpdu_info = &mpdu_start->rx_mpdu_info_details;
|
||||||
|
struct hal_addr2 *addr = (struct hal_addr2 *)mac_addr;
|
||||||
|
uint32_t mac_addr_ad2_valid;
|
||||||
|
|
||||||
|
mac_addr_ad2_valid = HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(mpdu_info);
|
||||||
|
|
||||||
|
if (mac_addr_ad2_valid) {
|
||||||
|
addr->ad2_15_0 = HAL_RX_MPDU_AD2_15_0_GET(mpdu_info);
|
||||||
|
addr->ad2_47_16 = HAL_RX_MPDU_AD2_47_16_GET(mpdu_info);
|
||||||
|
return QDF_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QDF_STATUS_E_FAILURE;
|
||||||
|
}
|
||||||
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,
|
||||||
@@ -348,4 +383,5 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
|
|||||||
hal_rx_mpdu_get_fr_ds_6490,
|
hal_rx_mpdu_get_fr_ds_6490,
|
||||||
hal_rx_get_mpdu_frame_control_valid_6490,
|
hal_rx_get_mpdu_frame_control_valid_6490,
|
||||||
hal_rx_mpdu_get_addr1_6490,
|
hal_rx_mpdu_get_addr1_6490,
|
||||||
|
hal_rx_mpdu_get_addr2_6490,
|
||||||
};
|
};
|
||||||
|
@@ -141,3 +141,21 @@
|
|||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_OFFSET)), \
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_OFFSET)), \
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_11_MAC_ADDR_AD2_VALID_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_11_MAC_ADDR_AD2_VALID_MASK, \
|
||||||
|
RX_MPDU_INFO_11_MAC_ADDR_AD2_VALID_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_15_0_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_MASK, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_47_16_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_MASK, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_LSB))
|
||||||
|
@@ -422,6 +422,40 @@ static QDF_STATUS hal_rx_mpdu_get_addr1_8074v1(uint8_t *buf,
|
|||||||
|
|
||||||
return QDF_STATUS_E_FAILURE;
|
return QDF_STATUS_E_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* hal_rx_mpdu_get_addr2_8074v1(): API to check get address2 of the mpdu
|
||||||
|
* in the packet
|
||||||
|
*
|
||||||
|
* @buf: pointer to the start of RX PKT TLV header
|
||||||
|
* @mac_addr: pointer to mac address
|
||||||
|
* Return: success/failure
|
||||||
|
*/
|
||||||
|
static QDF_STATUS hal_rx_mpdu_get_addr2_8074v1(uint8_t *buf, uint8_t *mac_addr)
|
||||||
|
{
|
||||||
|
struct __attribute__((__packed__)) hal_addr2 {
|
||||||
|
uint16_t ad2_15_0;
|
||||||
|
uint32_t ad2_47_16;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
|
||||||
|
struct rx_mpdu_start *mpdu_start =
|
||||||
|
&pkt_tlvs->mpdu_start_tlv.rx_mpdu_start;
|
||||||
|
|
||||||
|
struct rx_mpdu_info *mpdu_info = &mpdu_start->rx_mpdu_info_details;
|
||||||
|
struct hal_addr2 *addr = (struct hal_addr2 *)mac_addr;
|
||||||
|
uint32_t mac_addr_ad2_valid;
|
||||||
|
|
||||||
|
mac_addr_ad2_valid = HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(mpdu_info);
|
||||||
|
|
||||||
|
if (mac_addr_ad2_valid) {
|
||||||
|
addr->ad2_15_0 = HAL_RX_MPDU_AD2_15_0_GET(mpdu_info);
|
||||||
|
addr->ad2_47_16 = HAL_RX_MPDU_AD2_47_16_GET(mpdu_info);
|
||||||
|
return QDF_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QDF_STATUS_E_FAILURE;
|
||||||
|
}
|
||||||
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 */
|
||||||
@@ -481,6 +515,7 @@ struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
|
|||||||
hal_rx_mpdu_get_fr_ds_8074v1,
|
hal_rx_mpdu_get_fr_ds_8074v1,
|
||||||
hal_rx_get_mpdu_frame_control_valid_8074v1,
|
hal_rx_get_mpdu_frame_control_valid_8074v1,
|
||||||
hal_rx_mpdu_get_addr1_8074v1,
|
hal_rx_mpdu_get_addr1_8074v1,
|
||||||
|
hal_rx_mpdu_get_addr2_8074v1,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct hal_hw_srng_config hw_srng_table_8074[] = {
|
struct hal_hw_srng_config hw_srng_table_8074[] = {
|
||||||
|
@@ -149,6 +149,24 @@
|
|||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_OFFSET)), \
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_OFFSET)), \
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_MASK, \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_15_0_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_MASK, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_47_16_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_MASK, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_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
|
||||||
|
@@ -420,6 +420,39 @@ static QDF_STATUS hal_rx_mpdu_get_addr1_8074v2(uint8_t *buf, uint8_t *mac_addr)
|
|||||||
return QDF_STATUS_E_FAILURE;
|
return QDF_STATUS_E_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* hal_rx_mpdu_get_addr2_8074v2(): API to check get address2 of the mpdu
|
||||||
|
* in the packet
|
||||||
|
*
|
||||||
|
* @buf: pointer to the start of RX PKT TLV header
|
||||||
|
* @mac_addr: pointer to mac address
|
||||||
|
* Return: success/failure
|
||||||
|
*/
|
||||||
|
static QDF_STATUS hal_rx_mpdu_get_addr2_8074v2(uint8_t *buf, uint8_t *mac_addr)
|
||||||
|
{
|
||||||
|
struct __attribute__((__packed__)) hal_addr2 {
|
||||||
|
uint16_t ad2_15_0;
|
||||||
|
uint32_t ad2_47_16;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
|
||||||
|
struct rx_mpdu_start *mpdu_start =
|
||||||
|
&pkt_tlvs->mpdu_start_tlv.rx_mpdu_start;
|
||||||
|
|
||||||
|
struct rx_mpdu_info *mpdu_info = &mpdu_start->rx_mpdu_info_details;
|
||||||
|
struct hal_addr2 *addr = (struct hal_addr2 *)mac_addr;
|
||||||
|
uint32_t mac_addr_ad2_valid;
|
||||||
|
|
||||||
|
mac_addr_ad2_valid = HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(mpdu_info);
|
||||||
|
|
||||||
|
if (mac_addr_ad2_valid) {
|
||||||
|
addr->ad2_15_0 = HAL_RX_MPDU_AD2_15_0_GET(mpdu_info);
|
||||||
|
addr->ad2_47_16 = HAL_RX_MPDU_AD2_47_16_GET(mpdu_info);
|
||||||
|
return QDF_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QDF_STATUS_E_FAILURE;
|
||||||
|
}
|
||||||
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 */
|
||||||
@@ -479,6 +512,7 @@ struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
|
|||||||
hal_rx_mpdu_get_fr_ds_8074v2,
|
hal_rx_mpdu_get_fr_ds_8074v2,
|
||||||
hal_rx_get_mpdu_frame_control_valid_8074v2,
|
hal_rx_get_mpdu_frame_control_valid_8074v2,
|
||||||
hal_rx_mpdu_get_addr1_8074v2,
|
hal_rx_mpdu_get_addr1_8074v2,
|
||||||
|
hal_rx_mpdu_get_addr2_8074v2,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct hal_hw_srng_config hw_srng_table_8074v2[] = {
|
struct hal_hw_srng_config hw_srng_table_8074v2[] = {
|
||||||
|
@@ -158,6 +158,24 @@
|
|||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_OFFSET)), \
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_OFFSET)), \
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_MASK, \
|
||||||
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
RX_MPDU_INFO_16_MAC_ADDR_AD1_47_32_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_MASK, \
|
||||||
|
RX_MPDU_INFO_2_MAC_ADDR_AD2_VALID_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_15_0_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_MASK, \
|
||||||
|
RX_MPDU_INFO_16_MAC_ADDR_AD2_15_0_LSB))
|
||||||
|
|
||||||
|
#define HAL_RX_MPDU_AD2_47_16_GET(_rx_mpdu_info) \
|
||||||
|
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_OFFSET)), \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_MASK, \
|
||||||
|
RX_MPDU_INFO_17_MAC_ADDR_AD2_47_16_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
|
||||||
|
@@ -430,6 +430,40 @@ static QDF_STATUS hal_rx_mpdu_get_addr1_9000(uint8_t *buf,
|
|||||||
return QDF_STATUS_E_FAILURE;
|
return QDF_STATUS_E_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* hal_rx_mpdu_get_addr2_9000(): API to check get address2 of the mpdu
|
||||||
|
* in the packet
|
||||||
|
*
|
||||||
|
* @buf: pointer to the start of RX PKT TLV header
|
||||||
|
* @mac_addr: pointer to mac address
|
||||||
|
* Return: success/failure
|
||||||
|
*/
|
||||||
|
static QDF_STATUS hal_rx_mpdu_get_addr2_9000(uint8_t *buf, uint8_t *mac_addr)
|
||||||
|
{
|
||||||
|
struct __attribute__((__packed__)) hal_addr2 {
|
||||||
|
uint16_t ad2_15_0;
|
||||||
|
uint32_t ad2_47_16;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
|
||||||
|
struct rx_mpdu_start *mpdu_start =
|
||||||
|
&pkt_tlvs->mpdu_start_tlv.rx_mpdu_start;
|
||||||
|
|
||||||
|
struct rx_mpdu_info *mpdu_info = &mpdu_start->rx_mpdu_info_details;
|
||||||
|
struct hal_addr2 *addr = (struct hal_addr2 *)mac_addr;
|
||||||
|
uint32_t mac_addr_ad2_valid;
|
||||||
|
|
||||||
|
mac_addr_ad2_valid = HAL_RX_MPDU_MAC_ADDR_AD2_VALID_GET(mpdu_info);
|
||||||
|
|
||||||
|
if (mac_addr_ad2_valid) {
|
||||||
|
addr->ad2_15_0 = HAL_RX_MPDU_AD2_15_0_GET(mpdu_info);
|
||||||
|
addr->ad2_47_16 = HAL_RX_MPDU_AD2_47_16_GET(mpdu_info);
|
||||||
|
return QDF_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QDF_STATUS_E_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
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 */
|
||||||
@@ -489,6 +523,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
|
|||||||
hal_rx_mpdu_get_fr_ds_9000,
|
hal_rx_mpdu_get_fr_ds_9000,
|
||||||
hal_rx_get_mpdu_frame_control_valid_9000,
|
hal_rx_get_mpdu_frame_control_valid_9000,
|
||||||
hal_rx_mpdu_get_addr1_9000,
|
hal_rx_mpdu_get_addr1_9000,
|
||||||
|
hal_rx_mpdu_get_addr2_9000,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct hal_hw_srng_config hw_srng_table_9000[] = {
|
struct hal_hw_srng_config hw_srng_table_9000[] = {
|
||||||
|
Reference in New Issue
Block a user