lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0485/1157] mt76: mt7915: fix incorrect testmode ipg on band 1 caused by wmm_idx
    Date
    From: Shayne Chen <shayne.chen@mediatek.com>

    [ Upstream commit 6e744cfeee02c2d8676eb55d5b3720808812f41f ]

    Fix the issue that the measured inter packet gap didn't fit its
    setting value.

    Fixes: c2d3b1926f30 ("mt76: mt7915: add support for ipg in testmode")
    Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7915/testmode.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
    index 20f63644e929..0f5c1e5bffe1 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
    @@ -168,13 +168,14 @@ mt7915_tm_set_tam_arb(struct mt7915_phy *phy, bool enable, bool mu)
    }

    static int
    -mt7915_tm_set_wmm_qid(struct mt7915_dev *dev, u8 qid, u8 aifs, u8 cw_min,
    +mt7915_tm_set_wmm_qid(struct mt7915_phy *phy, u8 qid, u8 aifs, u8 cw_min,
    u16 cw_max, u16 txop)
    {
    + struct mt7915_vif *mvif = (struct mt7915_vif *)phy->monitor_vif->drv_priv;
    struct mt7915_mcu_tx req = { .total = 1 };
    struct edca *e = &req.edca[0];

    - e->queue = qid;
    + e->queue = qid + mvif->mt76.wmm_idx * MT76_CONNAC_MAX_WMM_SETS;
    e->set = WMM_PARAM_SET;

    e->aifs = aifs;
    @@ -182,7 +183,7 @@ mt7915_tm_set_wmm_qid(struct mt7915_dev *dev, u8 qid, u8 aifs, u8 cw_min,
    e->cw_max = cpu_to_le16(cw_max);
    e->txop = cpu_to_le16(txop);

    - return mt7915_mcu_update_edca(dev, &req);
    + return mt7915_mcu_update_edca(phy->dev, &req);
    }

    static int
    @@ -244,7 +245,7 @@ mt7915_tm_set_ipg_params(struct mt7915_phy *phy, u32 ipg, u8 mode)

    mt7915_tm_set_slot_time(phy, slot_time, sifs);

    - return mt7915_tm_set_wmm_qid(dev,
    + return mt7915_tm_set_wmm_qid(phy,
    mt76_connac_lmac_mapping(IEEE80211_AC_BE),
    aifsn, cw, cw, 0);
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 02:06    [W:3.299 / U:4.552 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site