Revert "qcacmn: Add manual ulofdma trigger bit in rx ppdu user stats"

This reverts commit I2a697f91e572f88a36f96085d15c90c679deaf0c.
Original change was added to support manual ulofdma trigger but it
needs to be reverted here due to a small tweak in design approach.
New design to be integrated and hence reverting this one.

Change-Id: I4c358db48298666c753aa89166a31adbba067e36
CRs-Fixed: 3429084
这个提交包含在:
Narayan Subramhanyan
2023-03-09 15:10:15 +05:30
提交者 Madan Koyyalamudi
父节点 c1d7a3b4dc
当前提交 ff85561570
修改 3 个文件,包含 2 行新增29 行删除

查看文件

@@ -2497,7 +2497,6 @@ struct cdp_tx_completion_msdu {
* @ofdma_ru_width: size of RU in units of 1(26tone)RU * @ofdma_ru_width: size of RU in units of 1(26tone)RU
* @nss: NSS 1,2, ...8 * @nss: NSS 1,2, ...8
* @mcs: MCS index * @mcs: MCS index
* @is_manual_ulofdma_trig: manual ulofdma trig or not?
* @user_index: user ID in multi-user case * @user_index: user ID in multi-user case
* @is_bss_peer: is bss peer check * @is_bss_peer: is bss peer check
* @ast_index: ast index in multi-user case * @ast_index: ast index in multi-user case
@@ -2536,13 +2535,7 @@ struct cdp_rx_stats_ppdu_user {
ofdma_ru_start_index:7, ofdma_ru_start_index:7,
ofdma_ru_width:7, ofdma_ru_width:7,
nss:4, nss:4,
mcs:4, mcs:4;
#ifdef QCA_MANUAL_TRIGGERED_ULOFDMA
is_manual_ulofdma_trig:1,
reserved:8;
#else
reserved:9;
#endif
/* user id */ /* user id */
uint8_t user_index; uint8_t user_index;
uint8_t is_bss_peer; uint8_t is_bss_peer;

查看文件

@@ -398,23 +398,6 @@ dp_rx_inc_rusize_cnt(struct dp_pdev *pdev,
return is_data; return is_data;
} }
#ifdef QCA_MANUAL_TRIGGERED_ULOFDMA
static inline void
dp_rx_update_manual_ulofdma_trig(struct mon_rx_user_status *rx_user_status,
struct cdp_rx_stats_ppdu_user *user)
{
user->is_manual_ulofdma_trig =
HTT_UL_OFDMA_USER_INFO_V0_W0_MANUAL_ULOFDMA_TRIG_GET(
rx_user_status->mu_ul_user_v0_word0);
}
#else
static inline void
dp_rx_update_manual_ulofdma_trig(struct mon_rx_user_status *rx_user_status,
struct cdp_rx_stats_ppdu_user *user)
{
}
#endif
/** /**
* dp_rx_populate_cdp_indication_ppdu_user() - Populate per user cdp indication * dp_rx_populate_cdp_indication_ppdu_user() - Populate per user cdp indication
* @pdev: pdev ctx * @pdev: pdev ctx
@@ -519,9 +502,6 @@ dp_rx_populate_cdp_indication_ppdu_user(struct dp_pdev *pdev,
rx_stats_peruser->vdev_id = peer->vdev->vdev_id; rx_stats_peruser->vdev_id = peer->vdev->vdev_id;
rx_stats_peruser->mu_ul_info_valid = 0; rx_stats_peruser->mu_ul_info_valid = 0;
dp_rx_update_manual_ulofdma_trig(rx_user_status,
rx_stats_peruser);
mon_ops = dp_mon_ops_get(soc); mon_ops = dp_mon_ops_get(soc);
if (mon_ops && mon_ops->mon_rx_populate_ppdu_usr_info) if (mon_ops && mon_ops->mon_rx_populate_ppdu_usr_info)
mon_ops->mon_rx_populate_ppdu_usr_info(rx_user_status, mon_ops->mon_rx_populate_ppdu_usr_info(rx_user_status,

查看文件

@@ -746,7 +746,7 @@ hal_be_get_mon_dest_status(hal_soc_handle_t hal_soc,
} }
#endif #endif
#if defined(RX_PPDU_END_USER_STATS_SW_RESPONSE_REFERENCE_PTR_OFFSET) && \ #if defined(RX_PPDU_END_USER_STATS_OFDMA_INFO_VALID_OFFSET) && \
defined(RX_PPDU_END_USER_STATS_SW_RESPONSE_REFERENCE_PTR_EXT_OFFSET) defined(RX_PPDU_END_USER_STATS_SW_RESPONSE_REFERENCE_PTR_EXT_OFFSET)
static inline void static inline void