From: Ryder Lee <ryder.lee@mediatek.com>
To: Roy Luo <royluo@google.com>
Cc: Felix Fietkau <nbd@nbd.name>,
Lorenzo Bianconi <lorenzo.bianconi@redhat.com>,
YF Luo <yf.luo@mediatek.com>,
Yiwei Chung <yiwei.chung@mediatek.com>,
Sean Wang <sean.wang@mediatek.com>,
<linux-wireless@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/3] mt76: mt7615: add 4 WMM sets support
Date: Fri, 19 Jul 2019 15:27:14 +0800 [thread overview]
Message-ID: <1563521234.8090.4.camel@mtkswgap22> (raw)
In-Reply-To: <CA+zupgwyz2hdVRmnGr+4vzeEfvTfxYkLmu6jD_jFNjrPAdbvCQ@mail.gmail.com>
On Fri, 2019-07-19 at 15:05 +0800, Roy Luo wrote:
>
>
>
> On Fri, Jul 19, 2019 at 2:55 PM Ryder Lee <ryder.lee@mediatek.com>
> wrote:
>
> MT7615 hardware supoorts 4 WMM sets, so this patch adds them
> accordingly.
> Also remove incorrect queue mapping in .conf_tx
>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
> drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 5 +++--
> drivers/net/wireless/mediatek/mt76/mt7615/main.c | 16
> ++++++----------
> .../net/wireless/mediatek/mt76/mt7615/mt7615.h | 1 +
> 3 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> index 8f9a2bb68ded..d85b3904f33a 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> @@ -314,7 +314,7 @@ int mt7615_mac_write_txwi(struct
> mt7615_dev *dev, __le32 *txwi,
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr
> *)skb->data;
> struct ieee80211_vif *vif = info->control.vif;
> int tx_count = 8;
> - u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx = 0;
> + u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx = 0,
> wmm_idx = 0;
> __le16 fc = hdr->frame_control;
> u16 seqno = 0;
> u32 val;
> @@ -323,6 +323,7 @@ int mt7615_mac_write_txwi(struct
> mt7615_dev *dev, __le32 *txwi,
> struct mt7615_vif *mvif = (struct mt7615_vif
> *)vif->drv_priv;
>
> omac_idx = mvif->omac_idx;
> + wmm_idx = mvif->wmm_idx;
> }
>
> if (sta) {
> @@ -335,7 +336,7 @@ int mt7615_mac_write_txwi(struct
> mt7615_dev *dev, __le32 *txwi,
> fc_stype = (le16_to_cpu(fc) & IEEE80211_FCTL_STYPE) >>
> 4;
>
> if (ieee80211_is_data(fc) ||
> ieee80211_is_bufferable_mmpdu(fc)) {
> - q_idx = skb_get_queue_mapping(skb);
> + q_idx = skb_get_queue_mapping(skb) + wmm_idx *
> MT7615_MAX_WMM_SETS;
> p_fmt = MT_TX_TYPE_CT;
> } else if (ieee80211_is_beacon(fc)) {
> q_idx = MT_LMAC_BCN0;
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
> b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
> index 2c702b31d55f..ea48dcdb65c0 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
> @@ -85,9 +85,9 @@ static int mt7615_add_interface(struct
> ieee80211_hw *hw,
> }
> mvif->omac_idx = idx;
>
> - /* TODO: DBDC support. Use band 0 and wmm 0 for now */
> + /* TODO: DBDC support. Use band 0 for now */
> mvif->band_idx = 0;
> - mvif->wmm_idx = 0;
> + mvif->wmm_idx = mvif->idx % MT7615_MAX_WMM_SETS;
>
>
>
> IIUC, vifs with the same wmm_idx will share the same WMM HW, thus the
> same WMM parameter.
> Shouldn't we assign wmm_idx based on that?
I think that's what I did here. vif0 <-> wmm0, vif1 <->wmm1 ...
>
>
next prev parent reply other threads:[~2019-07-19 7:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-19 6:55 [PATCH 1/3] mt76: fix checkpatch warnings and errors Ryder Lee
2019-07-19 6:55 ` [PATCH 2/3] mt76: mt7615: add 4 WMM sets support Ryder Lee
[not found] ` <CA+zupgwyz2hdVRmnGr+4vzeEfvTfxYkLmu6jD_jFNjrPAdbvCQ@mail.gmail.com>
2019-07-19 7:27 ` Ryder Lee [this message]
2019-07-19 6:55 ` [PATCH 3/3] mt76: mt7615: add cwmin/cwmax initial values Ryder Lee
2019-07-19 10:17 ` Ryder Lee
2019-07-21 10:28 ` Kalle Valo
2019-07-21 10:26 ` [PATCH 1/3] mt76: fix checkpatch warnings and errors Kalle Valo
2019-07-21 16:56 ` Joe Perches
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=1563521234.8090.4.camel@mtkswgap22 \
--to=ryder.lee@mediatek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=nbd@nbd.name \
--cc=royluo@google.com \
--cc=sean.wang@mediatek.com \
--cc=yf.luo@mediatek.com \
--cc=yiwei.chung@mediatek.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;
as well as URLs for NNTP newsgroup(s).