On Fri, 2019-07-19 at 15:05 +0800, Roy Luo wrote:
>
>
>
> On Fri, Jul 19, 2019 at 2:55 PM Ryder Lee <[email protected]>
> 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 <[email protected]>
> ---
> 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 ...
>
>