lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0603/1126] mt76: mt7915: fix the muru tlv issue
    Date
    From: MeiChia Chiu <meichia.chiu@mediatek.com>

    [ Upstream commit d98a72725bc96c98f68eac12e5a91ec349322c88 ]

    The muru enable/disable are only set after the first station connection.
    Without this patch, the firmware couldn't enable muru
    if the first connected station is non-HE type.

    Fixes: 16bff457dd33a ("mt76: mt7915: rework mt7915_mcu_sta_muru_tlv()")
    Reviewed-by: Ryder Lee <ryder.lee@mediatek.com>
    Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 12 +++++-------
    1 file changed, 5 insertions(+), 7 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
    index 8ff2402c4817..31634d7ed173 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
    @@ -1516,9 +1516,6 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
    vif->type != NL80211_IFTYPE_AP)
    return;

    - if (!sta->vht_cap.vht_supported)
    - return;
    -
    tlv = mt7915_mcu_add_tlv(skb, STA_REC_MURU, sizeof(*muru));

    muru = (struct sta_rec_muru *)tlv;
    @@ -1526,9 +1523,12 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
    muru->cfg.mimo_dl_en = mvif->cap.he_mu_ebfer ||
    mvif->cap.vht_mu_ebfer ||
    mvif->cap.vht_mu_ebfee;
    + muru->cfg.mimo_ul_en = true;
    + muru->cfg.ofdma_dl_en = true;

    - muru->mimo_dl.vht_mu_bfee =
    - !!(sta->vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);
    + if (sta->vht_cap.vht_supported)
    + muru->mimo_dl.vht_mu_bfee =
    + !!(sta->vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);

    if (!sta->he_cap.has_he)
    return;
    @@ -1536,13 +1536,11 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
    muru->mimo_dl.partial_bw_dl_mimo =
    HE_PHY(CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO, elem->phy_cap_info[6]);

    - muru->cfg.mimo_ul_en = true;
    muru->mimo_ul.full_ul_mimo =
    HE_PHY(CAP2_UL_MU_FULL_MU_MIMO, elem->phy_cap_info[2]);
    muru->mimo_ul.partial_ul_mimo =
    HE_PHY(CAP2_UL_MU_PARTIAL_MU_MIMO, elem->phy_cap_info[2]);

    - muru->cfg.ofdma_dl_en = true;
    muru->ofdma_dl.punc_pream_rx =
    HE_PHY(CAP1_PREAMBLE_PUNC_RX_MASK, elem->phy_cap_info[1]);
    muru->ofdma_dl.he_20m_in_40m_2g =
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 11:10    [W:3.947 / U:0.856 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site