qcacmn: Parse U-SIG header from PHY tlv
Add support to parse the U-SIG header from the PHY TLV for EHT data traffic. Change-Id: Icba9550795f87bb8ec7aa03af135ea05eb040ded CRs-Fixed: 3093086
This commit is contained in:
Rakesh Pillai
committed by
Madan Koyyalamudi
Madan Koyyalamudi
parent
dad3ff5afa
commit
1e6e99702a
@@ -391,6 +391,147 @@ hal_get_mac_addr1(uint8_t *rx_mpdu_start,
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline uint32_t
|
||||
hal_rx_parse_u_sig_cmn(struct hal_soc *hal_soc, void *rx_tlv,
|
||||
struct hal_rx_ppdu_info *ppdu_info)
|
||||
{
|
||||
struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
|
||||
struct hal_mon_usig_cmn *usig_1 = &usig->usig_1;
|
||||
uint8_t bad_usig_crc;
|
||||
|
||||
bad_usig_crc = HAL_RX_MON_USIG_GET_RX_INTEGRITY_CHECK_PASSED(rx_tlv) ?
|
||||
0 : 1;
|
||||
ppdu_info->rx_status.usig_common |=
|
||||
QDF_MON_STATUS_USIG_PHY_VERSION_KNOWN |
|
||||
QDF_MON_STATUS_USIG_BW_KNOWN |
|
||||
QDF_MON_STATUS_USIG_UL_DL_KNOWN |
|
||||
QDF_MON_STATUS_USIG_BSS_COLOR_KNOWN |
|
||||
QDF_MON_STATUS_USIG_TXOP_KNOWN;
|
||||
|
||||
ppdu_info->rx_status.usig_common |= (usig_1->phy_version <<
|
||||
QDF_MON_STATUS_USIG_PHY_VERSION_SHIFT);
|
||||
ppdu_info->rx_status.usig_common |= (usig_1->bw <<
|
||||
QDF_MON_STATUS_USIG_BW_SHIFT);
|
||||
ppdu_info->rx_status.usig_common |= (usig_1->ul_dl <<
|
||||
QDF_MON_STATUS_USIG_UL_DL_SHIFT);
|
||||
ppdu_info->rx_status.usig_common |= (usig_1->bss_color <<
|
||||
QDF_MON_STATUS_USIG_BSS_COLOR_SHIFT);
|
||||
ppdu_info->rx_status.usig_common |= (usig_1->txop <<
|
||||
QDF_MON_STATUS_USIG_TXOP_SHIFT);
|
||||
ppdu_info->rx_status.usig_common |= bad_usig_crc;
|
||||
|
||||
ppdu_info->u_sig_info.ul_dl = usig_1->ul_dl;
|
||||
ppdu_info->u_sig_info.bw = usig_1->bw;
|
||||
|
||||
return HAL_TLV_STATUS_PPDU_NOT_DONE;
|
||||
}
|
||||
|
||||
static inline uint32_t
|
||||
hal_rx_parse_u_sig_tb(struct hal_soc *hal_soc, void *rx_tlv,
|
||||
struct hal_rx_ppdu_info *ppdu_info)
|
||||
{
|
||||
struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
|
||||
struct hal_mon_usig_tb *usig_tb = &usig->usig_2.tb;
|
||||
|
||||
ppdu_info->rx_status.usig_mask |=
|
||||
QDF_MON_STATUS_USIG_DISREGARD_KNOWN |
|
||||
QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_KNOWN |
|
||||
QDF_MON_STATUS_USIG_VALIDATE_KNOWN |
|
||||
QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_1_KNOWN |
|
||||
QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_2_KNOWN |
|
||||
QDF_MON_STATUS_USIG_TB_DISREGARD1_KNOWN |
|
||||
QDF_MON_STATUS_USIG_CRC_KNOWN |
|
||||
QDF_MON_STATUS_USIG_TAIL_KNOWN;
|
||||
|
||||
ppdu_info->rx_status.usig_value |= (0x3F <<
|
||||
QDF_MON_STATUS_USIG_DISREGARD_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_tb->ppdu_type_comp_mode <<
|
||||
QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (0x1 <<
|
||||
QDF_MON_STATUS_USIG_VALIDATE_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_tb->spatial_reuse_1 <<
|
||||
QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_1_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_tb->spatial_reuse_2 <<
|
||||
QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_2_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (0x1F <<
|
||||
QDF_MON_STATUS_USIG_TB_DISREGARD1_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_tb->crc <<
|
||||
QDF_MON_STATUS_USIG_CRC_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_tb->tail <<
|
||||
QDF_MON_STATUS_USIG_TAIL_SHIFT);
|
||||
|
||||
ppdu_info->u_sig_info.ppdu_type_comp_mode =
|
||||
usig_tb->ppdu_type_comp_mode;
|
||||
|
||||
return HAL_TLV_STATUS_PPDU_NOT_DONE;
|
||||
}
|
||||
|
||||
static inline uint32_t
|
||||
hal_rx_parse_u_sig_mu(struct hal_soc *hal_soc, void *rx_tlv,
|
||||
struct hal_rx_ppdu_info *ppdu_info)
|
||||
{
|
||||
struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
|
||||
struct hal_mon_usig_mu *usig_mu = &usig->usig_2.mu;
|
||||
|
||||
ppdu_info->rx_status.usig_mask |=
|
||||
QDF_MON_STATUS_USIG_DISREGARD_KNOWN |
|
||||
QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_KNOWN |
|
||||
QDF_MON_STATUS_USIG_VALIDATE_KNOWN |
|
||||
QDF_MON_STATUS_USIG_MU_VALIDATE1_SHIFT |
|
||||
QDF_MON_STATUS_USIG_MU_PUNCTURE_CH_INFO_KNOWN |
|
||||
QDF_MON_STATUS_USIG_MU_VALIDATE2_SHIFT |
|
||||
QDF_MON_STATUS_USIG_MU_EHT_SIG_MCS_KNOWN |
|
||||
QDF_MON_STATUS_USIG_MU_NUM_EHT_SIG_SYM_KNOWN |
|
||||
QDF_MON_STATUS_USIG_CRC_KNOWN |
|
||||
QDF_MON_STATUS_USIG_TAIL_KNOWN;
|
||||
|
||||
ppdu_info->rx_status.usig_value |= (0x1F <<
|
||||
QDF_MON_STATUS_USIG_DISREGARD_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (0x1 <<
|
||||
QDF_MON_STATUS_USIG_MU_VALIDATE1_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_mu->ppdu_type_comp_mode <<
|
||||
QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (0x1 <<
|
||||
QDF_MON_STATUS_USIG_VALIDATE_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_mu->punc_ch_info <<
|
||||
QDF_MON_STATUS_USIG_MU_PUNCTURE_CH_INFO_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (0x1 <<
|
||||
QDF_MON_STATUS_USIG_MU_VALIDATE2_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_mu->eht_sig_mcs <<
|
||||
QDF_MON_STATUS_USIG_MU_EHT_SIG_MCS_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_mu->num_eht_sig_sym <<
|
||||
QDF_MON_STATUS_USIG_MU_NUM_EHT_SIG_SYM_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_mu->crc <<
|
||||
QDF_MON_STATUS_USIG_CRC_SHIFT);
|
||||
ppdu_info->rx_status.usig_value |= (usig_mu->tail <<
|
||||
QDF_MON_STATUS_USIG_TAIL_SHIFT);
|
||||
|
||||
ppdu_info->u_sig_info.ppdu_type_comp_mode =
|
||||
usig_mu->ppdu_type_comp_mode;
|
||||
ppdu_info->u_sig_info.eht_sig_mcs = usig_mu->eht_sig_mcs;
|
||||
ppdu_info->u_sig_info.num_eht_sig_sym = usig_mu->num_eht_sig_sym;
|
||||
|
||||
return HAL_TLV_STATUS_PPDU_NOT_DONE;
|
||||
}
|
||||
|
||||
static inline uint32_t
|
||||
hal_rx_parse_u_sig_hdr(struct hal_soc *hal_soc, void *rx_tlv,
|
||||
struct hal_rx_ppdu_info *ppdu_info)
|
||||
{
|
||||
struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
|
||||
struct hal_mon_usig_cmn *usig_1 = &usig->usig_1;
|
||||
|
||||
ppdu_info->rx_status.usig_flags = 1;
|
||||
|
||||
hal_rx_parse_u_sig_cmn(hal_soc, rx_tlv, ppdu_info);
|
||||
|
||||
if (HAL_RX_MON_USIG_GET_PPDU_TYPE_N_COMP_MODE(rx_tlv) == 0 &&
|
||||
usig_1->ul_dl == 1)
|
||||
return hal_rx_parse_u_sig_tb(hal_soc, rx_tlv, ppdu_info);
|
||||
else
|
||||
return hal_rx_parse_u_sig_mu(hal_soc, rx_tlv, ppdu_info);
|
||||
}
|
||||
|
||||
/**
|
||||
* hal_rx_status_get_tlv_info() - process receive info TLV
|
||||
* @rx_tlv_hdr: pointer to TLV header
|
||||
@@ -1379,6 +1520,9 @@ hal_rx_status_get_tlv_info_generic_be(void *rx_tlv_hdr, void *ppduinfo,
|
||||
hal_rx_proc_phyrx_other_receive_info_tlv(hal, rx_tlv_hdr,
|
||||
ppdu_info);
|
||||
break;
|
||||
case WIFIPHYRX_GENERIC_U_SIG_E:
|
||||
hal_rx_parse_u_sig_hdr(hal, rx_tlv, ppdu_info);
|
||||
break;
|
||||
case WIFIRX_HEADER_E:
|
||||
{
|
||||
struct hal_rx_ppdu_common_info *com_info = &ppdu_info->com_info;
|
||||
|
||||
@@ -691,6 +691,78 @@ struct hal_rx_frm_type_info {
|
||||
struct hal_rx_frm_type_info {};
|
||||
#endif
|
||||
|
||||
struct hal_mon_usig_cmn {
|
||||
uint32_t phy_version : 3,
|
||||
bw : 3,
|
||||
ul_dl : 1,
|
||||
bss_color : 6,
|
||||
txop : 7,
|
||||
disregard : 5,
|
||||
validate_0 : 1,
|
||||
reserved : 6;
|
||||
};
|
||||
|
||||
struct hal_mon_usig_tb {
|
||||
uint32_t ppdu_type_comp_mode : 2,
|
||||
validate_1 : 1,
|
||||
spatial_reuse_1 : 4,
|
||||
spatial_reuse_2 : 4,
|
||||
disregard_1 : 5,
|
||||
crc : 4,
|
||||
tail : 6,
|
||||
reserved : 5,
|
||||
rx_integrity_check_passed : 1;
|
||||
};
|
||||
|
||||
struct hal_mon_usig_mu {
|
||||
uint32_t ppdu_type_comp_mode : 2,
|
||||
validate_1 : 1,
|
||||
punc_ch_info : 5,
|
||||
validate_2 : 1,
|
||||
eht_sig_mcs : 2,
|
||||
num_eht_sig_sym : 5,
|
||||
crc : 4,
|
||||
tail : 6,
|
||||
reserved : 5,
|
||||
rx_integrity_check_passed : 1;
|
||||
};
|
||||
|
||||
/**
|
||||
* union hal_mon_usig_non_cmn: Version dependent USIG fields
|
||||
* @tb: trigger based frame USIG header
|
||||
* @mu: MU frame USIG header
|
||||
*/
|
||||
union hal_mon_usig_non_cmn {
|
||||
struct hal_mon_usig_tb tb;
|
||||
struct hal_mon_usig_mu mu;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct hal_mon_usig_hdr: U-SIG header for EHT (and subsequent) frames
|
||||
* @usig_1: USIG common header fields
|
||||
* @usig_2: USIG version dependent fields
|
||||
*/
|
||||
struct hal_mon_usig_hdr {
|
||||
struct hal_mon_usig_cmn usig_1;
|
||||
union hal_mon_usig_non_cmn usig_2;
|
||||
};
|
||||
|
||||
#define HAL_RX_MON_USIG_PPDU_TYPE_N_COMP_MODE_MASK 0x0000000300000000
|
||||
#define HAL_RX_MON_USIG_PPDU_TYPE_N_COMP_MODE_LSB 32
|
||||
|
||||
#define HAL_RX_MON_USIG_GET_PPDU_TYPE_N_COMP_MODE(usig_tlv_ptr) \
|
||||
((*((uint64_t *)(usig_tlv_ptr)) & \
|
||||
HAL_RX_MON_USIG_PPDU_TYPE_N_COMP_MODE_MASK) >> \
|
||||
HAL_RX_MON_USIG_PPDU_TYPE_N_COMP_MODE_LSB)
|
||||
|
||||
#define HAL_RX_MON_USIG_RX_INTEGRITY_CHECK_PASSED_MASK 0x8000000000000000
|
||||
#define HAL_RX_MON_USIG_RX_INTEGRITY_CHECK_PASSED_LSB 63
|
||||
|
||||
#define HAL_RX_MON_USIG_GET_RX_INTEGRITY_CHECK_PASSED(usig_tlv_ptr) \
|
||||
((*((uint64_t *)(usig_tlv_ptr)) & \
|
||||
HAL_RX_MON_USIG_RX_INTEGRITY_CHECK_PASSED_MASK) >> \
|
||||
HAL_RX_MON_USIG_RX_INTEGRITY_CHECK_PASSED_LSB)
|
||||
|
||||
#define HAL_RX_MON_MAX_AGGR_SIZE 128
|
||||
|
||||
/**
|
||||
@@ -708,8 +780,25 @@ struct hal_rx_tlv_aggr_info {
|
||||
uint8_t buf[HAL_RX_MON_MAX_AGGR_SIZE];
|
||||
};
|
||||
|
||||
/* struct hal_rx_u_sig_info - Certain fields from U-SIG header which are used
|
||||
* for other header field parsing.
|
||||
* @ul_dl: UL or DL
|
||||
* @bw: EHT BW
|
||||
* @ppdu_type_comp_mode: PPDU TYPE
|
||||
* @eht_sig_mcs: EHT SIG MCS
|
||||
* @num_eht_sig_sym: Number of EHT SIG symbols
|
||||
*/
|
||||
struct hal_rx_u_sig_info {
|
||||
uint32_t ul_dl : 1,
|
||||
bw : 3,
|
||||
ppdu_type_comp_mode : 2,
|
||||
eht_sig_mcs : 2,
|
||||
num_eht_sig_sym : 5;
|
||||
};
|
||||
|
||||
struct hal_rx_ppdu_info {
|
||||
struct hal_rx_ppdu_common_info com_info;
|
||||
struct hal_rx_u_sig_info u_sig_info;
|
||||
struct mon_rx_status rx_status;
|
||||
struct mon_rx_user_status rx_user_status[HAL_MAX_UL_MU_USERS];
|
||||
struct mon_rx_info rx_info;
|
||||
|
||||
Reference in New Issue
Block a user