From: greearb@candelatech.com
To: linux-wireless@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [PATCH v5 03/11] mt76: mt7915: move TXS parsing to its own method
Date: Wed, 4 Aug 2021 06:44:57 -0700 [thread overview]
Message-ID: <20210804134505.3208-3-greearb@candelatech.com> (raw)
In-Reply-To: <20210804134505.3208-1-greearb@candelatech.com>
From: Ben Greear <greearb@candelatech.com>
This will allow us to also parse TXS when we have no skb on
the status callback list in future patches.
Explicitly cache short_gi and he_gi in wcid, don't try to store
it in the wcid.rate object. Slightly less confusing and less fragile
when TXS starts parsing lots of frames.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
drivers/net/wireless/mediatek/mt76/mt76.h | 5 +
.../net/wireless/mediatek/mt76/mt7915/mac.c | 122 ++++++++++--------
2 files changed, 74 insertions(+), 53 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 016f563fec39..0cbb4940f590 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -252,7 +252,12 @@ struct mt76_wcid {
struct ewma_signal rssi;
int inactive_count;
+ /* cached rate, updated from mac_sta_poll() and from TXS callback logic, in 7915
+ * at least.
+ */
struct rate_info rate;
+ bool rate_short_gi; /* cached HT/VHT short_gi, from mac_sta_poll() */
+ u8 rate_he_gi; /* cached HE GI, from mac_sta_poll() */
struct sk_buff *skb_status_array[MT_PACKET_ID_MAX + 1];
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index b568d6baa768..6f92e207680f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -205,12 +205,17 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)
u8 offs = 24 + 2 * bw;
rate->he_gi = (val & (0x3 << offs)) >> offs;
+ msta->wcid.rate_he_gi = rate->he_gi; /* cache for later */
} else if (rate->flags & RATE_INFO_FLAGS_VHT_MCS) {
- if (val & BIT(12 + bw))
+ if (val & BIT(12 + bw)) {
rate->flags |= RATE_INFO_FLAGS_SHORT_GI;
- else
+ msta->wcid.rate_short_gi = 1;
+ } else {
rate->flags &= ~RATE_INFO_FLAGS_SHORT_GI;
+ msta->wcid.rate_short_gi = 0;
+ }
}
+ /* TODO: Deal with HT_MCS */
}
rcu_read_unlock();
@@ -1302,30 +1307,19 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)
}
}
-static bool
-mt7915_mac_add_txs_skb(struct mt7915_dev *dev, struct mt76_wcid *wcid, int pid,
- __le32 *txs_data, struct mt7915_sta_stats *stats)
+static void
+mt7915_mac_parse_txs(struct mt7915_dev *dev, struct mt76_wcid *wcid,
+ __le32 *txs_data, struct mt7915_sta_stats *stats,
+ struct rate_info *rate,
+ struct ieee80211_tx_info *info)
{
struct ieee80211_supported_band *sband;
- struct mt76_dev *mdev = &dev->mt76;
struct mt76_phy *mphy;
- struct ieee80211_tx_info *info;
- struct sk_buff_head list;
- struct rate_info rate = {};
- struct sk_buff *skb;
- bool cck = false;
u32 txrate, txs, mode;
-
- mt76_tx_status_lock(mdev, &list);
- skb = mt76_tx_status_skb_get(mdev, wcid, pid, &list);
-
- /* TODO: Gather stats anyway, even if we are not matching on an skb. */
- if (!skb)
- goto out_no_skb;
+ bool cck = false;
txs = le32_to_cpu(txs_data[0]);
- info = IEEE80211_SKB_CB(skb);
if (!(txs & MT_TXS0_ACK_ERROR_MASK))
info->flags |= IEEE80211_TX_STAT_ACK;
@@ -1337,18 +1331,18 @@ mt7915_mac_add_txs_skb(struct mt7915_dev *dev, struct mt76_wcid *wcid, int pid,
txrate = FIELD_GET(MT_TXS0_TX_RATE, txs);
- rate.mcs = FIELD_GET(MT_TX_RATE_IDX, txrate);
- rate.nss = FIELD_GET(MT_TX_RATE_NSS, txrate) + 1;
+ rate->mcs = FIELD_GET(MT_TX_RATE_IDX, txrate);
+ rate->nss = FIELD_GET(MT_TX_RATE_NSS, txrate) + 1;
- stats->tx_nss[rate.nss - 1]++;
+ stats->tx_nss[rate->nss - 1]++;
/* It appears that rate.mcs even for HT may be small, considering in HT
* code below it is multiplied... but not certain on that,
* so code safely.
*/
- if (rate.mcs >= ARRAY_SIZE(stats->tx_mcs))
+ if (rate->mcs >= ARRAY_SIZE(stats->tx_mcs))
stats->tx_mcs[ARRAY_SIZE(stats->tx_mcs) - 1]++;
else
- stats->tx_mcs[rate.mcs]++;
+ stats->tx_mcs[rate->mcs]++;
mode = FIELD_GET(MT_TX_RATE_MODE, txrate);
switch (mode) {
@@ -1365,73 +1359,95 @@ mt7915_mac_add_txs_skb(struct mt7915_dev *dev, struct mt76_wcid *wcid, int pid,
else
sband = &mphy->sband_2g.sband;
- rate.mcs = mt76_get_rate(mphy->dev, sband, rate.mcs, cck);
- rate.legacy = sband->bitrates[rate.mcs].bitrate;
+ rate->mcs = mt76_get_rate(mphy->dev, sband, rate->mcs, cck);
+ rate->legacy = sband->bitrates[rate->mcs].bitrate;
break;
case MT_PHY_TYPE_HT:
case MT_PHY_TYPE_HT_GF:
- rate.mcs += (rate.nss - 1) * 8;
- if (rate.mcs > 31)
- goto out;
+ rate->mcs += (rate->nss - 1) * 8;
+ if (rate->mcs > 31)
+ break;
- rate.flags = RATE_INFO_FLAGS_MCS;
- if (wcid->rate.flags & RATE_INFO_FLAGS_SHORT_GI)
- rate.flags |= RATE_INFO_FLAGS_SHORT_GI;
+ rate->flags = RATE_INFO_FLAGS_MCS;
+ if (wcid->rate_short_gi)
+ rate->flags |= RATE_INFO_FLAGS_SHORT_GI;
break;
case MT_PHY_TYPE_VHT:
- if (rate.mcs > 9)
- goto out;
+ if (rate->mcs > 9)
+ break;
- rate.flags = RATE_INFO_FLAGS_VHT_MCS;
+ rate->flags = RATE_INFO_FLAGS_VHT_MCS;
+ if (wcid->rate_short_gi)
+ rate->flags |= RATE_INFO_FLAGS_SHORT_GI;
break;
case MT_PHY_TYPE_HE_SU:
case MT_PHY_TYPE_HE_EXT_SU:
case MT_PHY_TYPE_HE_TB:
case MT_PHY_TYPE_HE_MU:
- if (rate.mcs > 11)
- goto out;
+ if (rate->mcs > 11)
+ break;
- rate.he_gi = wcid->rate.he_gi;
- rate.he_dcm = FIELD_GET(MT_TX_RATE_DCM, txrate);
- rate.flags = RATE_INFO_FLAGS_HE_MCS;
+ rate->he_gi = wcid->rate_he_gi;
+ rate->he_dcm = FIELD_GET(MT_TX_RATE_DCM, txrate);
+ rate->flags = RATE_INFO_FLAGS_HE_MCS;
break;
default:
- goto out;
+ WARN_ON_ONCE(true);
+ mode = 0;
}
stats->tx_mode[mode]++;
switch (FIELD_GET(MT_TXS0_BW, txs)) {
case IEEE80211_STA_RX_BW_160:
- rate.bw = RATE_INFO_BW_160;
+ rate->bw = RATE_INFO_BW_160;
stats->tx_bw[3]++;
break;
case IEEE80211_STA_RX_BW_80:
- rate.bw = RATE_INFO_BW_80;
+ rate->bw = RATE_INFO_BW_80;
stats->tx_bw[2]++;
break;
case IEEE80211_STA_RX_BW_40:
- rate.bw = RATE_INFO_BW_40;
+ rate->bw = RATE_INFO_BW_40;
stats->tx_bw[1]++;
break;
default:
- rate.bw = RATE_INFO_BW_20;
+ rate->bw = RATE_INFO_BW_20;
stats->tx_bw[0]++;
break;
}
+}
- /* Cache rate for packets that don't get a TXS callback for some
- * reason.
+static void
+mt7915_mac_add_txs_skb(struct mt7915_dev *dev, struct mt76_wcid *wcid, int pid,
+ __le32 *txs_data, struct mt7915_sta_stats *stats)
+{
+ struct mt76_dev *mdev = &dev->mt76;
+ struct ieee80211_tx_info *info;
+ struct ieee80211_tx_info info_stack;
+ struct sk_buff_head list;
+ /* rate is cached in wcid->rate for skbs that do not request to be
+ * paired with TXS data. This is normal datapath.
*/
- wcid->rate = rate;
+ struct rate_info *rate = &wcid->rate;
+ struct sk_buff *skb;
-out:
- mt76_tx_status_skb_done(mdev, skb, &list, wcid);
+ mt76_tx_status_lock(mdev, &list);
+ skb = mt76_tx_status_skb_get(mdev, wcid, pid, &list);
-out_no_skb:
- mt76_tx_status_unlock(mdev, &list);
+ memset(rate, 0, sizeof(*rate));
- return !!skb;
+ if (skb)
+ info = IEEE80211_SKB_CB(skb);
+ else
+ info = &info_stack;
+
+ mt7915_mac_parse_txs(dev, wcid, txs_data, stats, rate, info);
+
+ if (skb)
+ mt76_tx_status_skb_done(mdev, skb, &list, wcid);
+
+ mt76_tx_status_unlock(mdev, &list);
}
static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)
--
2.20.1
next prev parent reply other threads:[~2021-08-04 13:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 13:44 [PATCH v5 01/11] mt76: add hash lookup for skb on TXS status_list greearb
2021-08-04 13:44 ` [PATCH v5 02/11] mt76: mt7915: fix potential NPE in TXS processing greearb
2021-08-04 13:44 ` greearb [this message]
2021-08-04 13:44 ` [PATCH v5 04/11] mt76: mt7915: allow processing TXS for 'NO_SKB' pkt-ids greearb
2021-08-13 17:13 ` Felix Fietkau
2021-08-04 13:44 ` [PATCH v5 05/11] mt76: mt7915: debugfs hook to enable TXS for NO_SKB pkt-ids greearb
2021-08-13 17:16 ` Felix Fietkau
2021-08-19 16:06 ` Kalle Valo
2021-08-19 16:08 ` Ben Greear
2021-10-11 9:28 ` Kalle Valo
2021-10-11 14:12 ` Ben Greear
2021-08-04 13:45 ` [PATCH v5 06/11] mt76: mt7915: add note about TXSFM 0x2 greearb
2021-08-04 13:45 ` [PATCH v5 07/11] mt76: mt7915: add support for tx-overrides greearb
2021-08-19 15:08 ` Kalle Valo
2021-08-19 16:16 ` Ben Greear
2021-08-04 13:45 ` [PATCH v5 08/11] mt76: mt7915: fix SGI reporting when using tx-overrides greearb
2021-08-04 13:45 ` [PATCH v5 09/11] mt76: mt7915: txfree status to show txcount instead of latency greearb
2021-08-04 13:45 ` [PATCH v5 10/11] mt76: mt7915: report tx-retries greearb
2021-08-04 13:45 ` [PATCH v5 11/11] mt76: mt7915: add a missing HT flag for GI parsing greearb
2021-08-13 16:50 ` [PATCH v5 01/11] mt76: add hash lookup for skb on TXS status_list Felix Fietkau
2021-08-13 17:28 ` Ben Greear
2021-08-13 17:46 ` Felix Fietkau
2021-08-13 18:01 ` Ben Greear
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=20210804134505.3208-3-greearb@candelatech.com \
--to=greearb@candelatech.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.