From: Kalle Valo <kvalo@codeaurora.org>
To: linux-wireless@vger.kernel.org
Cc: ath11k@lists.infradead.org
Subject: [PATCH 4/9] ath11k: fix vht guard interval mapping
Date: Thu, 28 Nov 2019 08:21:50 +0000 [thread overview]
Message-ID: <0101016eb11a212a-91838b15-bf0c-41df-ae5d-7fa19bf5d263-000000@us-west-2.amazonses.com> (raw)
In-Reply-To: <1574929300-31782-1-git-send-email-kvalo@codeaurora.org>
From: Manikanta Pubbisetty <mpubbise@codeaurora.org>
Guard interval value which comes from VHT_SIG_A TLV has a mapping
where value 0 corresponds to LGI, 1 and 3 corresponds to SGI.
Value 3 which is SGI(0.4us) in VHT was incorrectly mapped to a GI
of 3.2us(only applicable in HE) resulting in incorrect rx GI stats.
Fixing the mapping.
Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
drivers/net/wireless/ath/ath11k/hal_rx.c | 16 +++++++++++++---
drivers/net/wireless/ath/ath11k/hal_rx.h | 6 ++++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c
index 6168a4eb0c0b..9e0f8064e427 100644
--- a/drivers/net/wireless/ath/ath11k/hal_rx.c
+++ b/drivers/net/wireless/ath/ath11k/hal_rx.c
@@ -920,6 +920,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,
(struct hal_rx_vht_sig_a_info *)tlv_data;
u32 nsts;
u32 group_id;
+ u8 gi_setting;
info0 = __le32_to_cpu(vht_sig->info0);
info1 = __le32_to_cpu(vht_sig->info1);
@@ -928,9 +929,18 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,
info0);
ppdu_info->mcs = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_MCS,
info1);
- ppdu_info->gi =
- FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_GI_SETTING,
- info1);
+ gi_setting = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_GI_SETTING,
+ info1);
+ switch (gi_setting) {
+ case HAL_RX_VHT_SIG_A_NORMAL_GI:
+ ppdu_info->gi = HAL_RX_GI_0_8_US;
+ break;
+ case HAL_RX_VHT_SIG_A_SHORT_GI:
+ case HAL_RX_VHT_SIG_A_SHORT_GI_AMBIGUITY:
+ ppdu_info->gi = HAL_RX_GI_0_4_US;
+ break;
+ }
+
ppdu_info->is_stbc = info0 & HAL_RX_VHT_SIG_A_INFO_INFO0_STBC;
nsts = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO0_NSTS, info0);
if (ppdu_info->is_stbc && nsts > 0)
diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.h b/drivers/net/wireless/ath/ath11k/hal_rx.h
index 2271bf56183b..bb022c781c48 100644
--- a/drivers/net/wireless/ath/ath11k/hal_rx.h
+++ b/drivers/net/wireless/ath/ath11k/hal_rx.h
@@ -189,6 +189,12 @@ struct hal_rx_vht_sig_a_info {
__le32 info1;
} __packed;
+enum hal_rx_vht_sig_a_gi_setting {
+ HAL_RX_VHT_SIG_A_NORMAL_GI = 0,
+ HAL_RX_VHT_SIG_A_SHORT_GI = 1,
+ HAL_RX_VHT_SIG_A_SHORT_GI_AMBIGUITY = 3,
+};
+
#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_MCS GENMASK(6, 3)
#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_DCM BIT(7)
#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_BW GENMASK(20, 19)
--
2.7.4
next prev parent reply other threads:[~2019-11-28 8:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1574929300-31782-1-git-send-email-kvalo@codeaurora.org>
2019-11-28 8:21 ` [PATCH 1/9] ath11k: Update tx and rx chain count properly on drv_set_antenna Kalle Valo
2019-11-29 7:51 ` Kalle Valo
2019-11-28 8:21 ` [PATCH 2/9] ath11k: Advertise MPDU start spacing as no restriction Kalle Valo
2019-11-28 8:21 ` [PATCH 3/9] ath11k: fix memory leak in monitor mode Kalle Valo
2019-11-28 8:21 ` Kalle Valo [this message]
2019-11-28 8:21 ` [PATCH 5/9] ath11k: update tx duration in station info Kalle Valo
2019-11-28 8:21 ` [PATCH 6/9] ath11k: Skip update peer stats for management packets Kalle Valo
2019-11-28 8:21 ` [PATCH 7/9] ath11k: Move mac80211 hw allocation before wmi_init command Kalle Valo
2019-11-28 8:21 ` [PATCH 8/9] ath11k: Setup REO destination ring before sending " Kalle Valo
2019-11-28 8:22 ` [PATCH 9/9] ath11k: fix indentation in ath11k_mac_prepare_he_mode() Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0101016eb11a212a-91838b15-bf0c-41df-ae5d-7fa19bf5d263-000000@us-west-2.amazonses.com \
--to=kvalo@codeaurora.org \
--cc=ath11k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).