From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org,
Gregory Greenman <gregory.greenman@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 07/13] iwlwifi: rs: consider LDPC capability in case of HE
Date: Wed, 3 Apr 2019 12:22:18 +0300 [thread overview]
Message-ID: <20190403092224.815-8-luca@coelho.fi> (raw)
In-Reply-To: <20190403092224.815-1-luca@coelho.fi>
From: Gregory Greenman <gregory.greenman@intel.com>
When building TLC configuration command, consider in case of HE,
if LDPC support is turned on in our capabilities.
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
index 79f9eaf8dd1b..3ffdbfdb37c0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
@@ -116,8 +116,9 @@ static u8 rs_fw_sgi_cw_support(struct ieee80211_sta *sta)
return supp;
}
-static u16 rs_fw_set_config_flags(struct iwl_mvm *mvm,
- struct ieee80211_sta *sta)
+static u16 rs_fw_get_config_flags(struct iwl_mvm *mvm,
+ struct ieee80211_sta *sta,
+ struct ieee80211_supported_band *sband)
{
struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;
@@ -147,6 +148,12 @@ static u16 rs_fw_set_config_flags(struct iwl_mvm *mvm,
(vht_ena && (vht_cap->cap & IEEE80211_VHT_CAP_RXLDPC))))
flags |= IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;
+ /* consider our LDPC support in case of HE */
+ if (sband->iftype_data && sband->iftype_data->he_cap.has_he &&
+ !(sband->iftype_data->he_cap.he_cap_elem.phy_cap_info[1] &
+ IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))
+ flags &= ~IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;
+
if (he_cap && he_cap->has_he &&
(he_cap->he_cap_elem.phy_cap_info[3] &
IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK))
@@ -383,13 +390,13 @@ void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
struct iwl_lq_sta_rs_fw *lq_sta = &mvmsta->lq_sta.rs_fw;
u32 cmd_id = iwl_cmd_id(TLC_MNG_CONFIG_CMD, DATA_PATH_GROUP, 0);
- struct ieee80211_supported_band *sband;
+ struct ieee80211_supported_band *sband = hw->wiphy->bands[band];
u16 max_amsdu_len = rs_fw_get_max_amsdu_len(sta);
struct iwl_tlc_config_cmd cfg_cmd = {
.sta_id = mvmsta->sta_id,
.max_ch_width = update ?
rs_fw_bw_from_sta_bw(sta) : RATE_MCS_CHAN_WIDTH_20,
- .flags = cpu_to_le16(rs_fw_set_config_flags(mvm, sta)),
+ .flags = cpu_to_le16(rs_fw_get_config_flags(mvm, sta, sband)),
.chains = rs_fw_set_active_chains(iwl_mvm_get_valid_tx_ant(mvm)),
.sgi_ch_width_supp = rs_fw_sgi_cw_support(sta),
.max_mpdu_len = cpu_to_le16(max_amsdu_len),
@@ -402,7 +409,6 @@ void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
#ifdef CONFIG_IWLWIFI_DEBUGFS
iwl_mvm_reset_frame_stats(mvm);
#endif
- sband = hw->wiphy->bands[band];
rs_fw_set_supp_rates(sta, sband, &cfg_cmd);
/*
--
2.20.1
next prev parent reply other threads:[~2019-04-03 9:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 9:22 [PATCH 00/13] iwlwifi: updates intended for v5.2 2019-04-03 Luca Coelho
2019-04-03 9:22 ` [PATCH 01/13] iwlwifi: bump FW API to 47 for 22000 series Luca Coelho
2019-04-03 9:22 ` [PATCH 02/13] iwlwifi: mvm: set 512 TX queue slots for AX210 devices Luca Coelho
2019-04-03 9:22 ` [PATCH 03/13] iwlwifi: unite macros with same meaning Luca Coelho
2019-04-03 9:22 ` [PATCH 04/13] iwlwifi: dbg_ini: support notification and dhc regions type parsing Luca Coelho
2019-04-03 9:22 ` [PATCH 05/13] iwlwifi: add FW_INFO debug level Luca Coelho
2019-04-03 9:22 ` [PATCH 06/13] iwlwifi: dbg_ini: add debug prints to the ini flows Luca Coelho
2019-04-04 8:58 ` [PATCH v2 " Luca Coelho
2019-04-03 9:22 ` Luca Coelho [this message]
2019-04-03 9:22 ` [PATCH 08/13] iwlwifi: dbg: add periphery memory dumping support to ax210 device family Luca Coelho
2019-04-03 9:22 ` [PATCH 09/13] iwlwifi: dbg: add lmac and umac PC registers to periphery dump Luca Coelho
2019-04-03 9:22 ` [PATCH 10/13] iwlwifi: mvm: support rtt confidence indication Luca Coelho
2019-04-03 9:22 ` [PATCH 11/13] iwlwifi: remove unused 0x40C0 PCI device IDs Luca Coelho
2019-04-03 9:22 ` [PATCH 12/13] iwlwifi: mvm: Change an 'else if' into an 'else' in iwl_mvm_send_add_bcast_sta Luca Coelho
2019-04-03 9:22 ` [PATCH 13/13] iwlwifi: dbg_ini: set dump bit only when trigger collection is certain Luca Coelho
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=20190403092224.815-8-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=gregory.greenman@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
/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