lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 473/917] mt76: mt7921: fix firmware usage of RA info using legacy rates
    Date
    From: Sean Wang <sean.wang@mediatek.com>

    [ Upstream commit 99b8e195994d9d77de3bfe0cb403c44a57c2cf79 ]

    According to the firmware usage, OFDM rates should fill out bit 6 - 13
    while CCK rates should fill out bit 0 - 3 in legacy field of RA info to
    make the rate adaption runs propertly. Otherwise, a unicast frame might be
    picking up the unsupported rate to send out.

    Fixes: 1c099ab44727 ("mt76: mt7921: add MCU support")
    Reported-by: Joshua Emele <jemele@chromium.org>
    Co-developed-by: YN Chen <YN.Chen@mediatek.com>
    Signed-off-by: YN Chen <YN.Chen@mediatek.com>
    Signed-off-by: Sean Wang <sean.wang@mediatek.com>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 11 ++++++++++-
    drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 ++
    2 files changed, 12 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
    index f57f047fce99c..98d233e24afcc 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
    @@ -719,6 +719,7 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
    struct sta_rec_state *state;
    struct sta_rec_phy *phy;
    struct tlv *tlv;
    + u16 supp_rates;

    /* starec ht */
    if (sta->ht_cap.ht_supported) {
    @@ -767,7 +768,15 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,

    tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra_info));
    ra_info = (struct sta_rec_ra_info *)tlv;
    - ra_info->legacy = cpu_to_le16((u16)sta->supp_rates[band]);
    +
    + supp_rates = sta->supp_rates[band];
    + if (band == NL80211_BAND_2GHZ)
    + supp_rates = FIELD_PREP(RA_LEGACY_OFDM, supp_rates >> 4) |
    + FIELD_PREP(RA_LEGACY_CCK, supp_rates & 0xf);
    + else
    + supp_rates = FIELD_PREP(RA_LEGACY_OFDM, supp_rates);
    +
    + ra_info->legacy = cpu_to_le16(supp_rates);

    if (sta->ht_cap.ht_supported)
    memcpy(ra_info->rx_mcs_bitmask, sta->ht_cap.mcs.rx_mask,
    diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    index 4bcd728ff97c5..77d4435e4581e 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    @@ -124,6 +124,8 @@ struct sta_rec_state {
    u8 rsv[1];
    } __packed;

    +#define RA_LEGACY_OFDM GENMASK(13, 6)
    +#define RA_LEGACY_CCK GENMASK(3, 0)
    #define HT_MCS_MASK_NUM 10
    struct sta_rec_ra_info {
    __le16 tag;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:52    [W:2.794 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site