lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 435/700] mt76: connac: fix WoW with disconnetion and bitmap pattern
    Date
    From: YN Chen <yn.chen@mediatek.com>

    [ Upstream commit 193e5f22eeb2a9661bff8bc0d8519e6ded48c807 ]

    Update MCU command usage to fix WoW configuration with disconnection
    and bitmap pattern and to avoid magic number.

    Fixes: ffa1bf97425b ("mt76: mt7921: introduce PM support")
    Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>
    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 | 8 ++++++++
    2 files changed, 15 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
    index cefd33b74a87..280aee1aa299 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
    @@ -1732,7 +1732,7 @@ mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev,
    ptlv->index = index;

    memcpy(ptlv->pattern, pattern->pattern, pattern->pattern_len);
    - memcpy(ptlv->mask, pattern->mask, pattern->pattern_len / 8);
    + memcpy(ptlv->mask, pattern->mask, DIV_ROUND_UP(pattern->pattern_len, 8));

    return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD_SUSPEND, true);
    }
    @@ -1767,14 +1767,17 @@ mt76_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif,
    };

    if (wowlan->magic_pkt)
    - req.wow_ctrl_tlv.trigger |= BIT(0);
    + req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_MAGIC;
    if (wowlan->disconnect)
    - req.wow_ctrl_tlv.trigger |= BIT(2);
    + req.wow_ctrl_tlv.trigger |= (UNI_WOW_DETECT_TYPE_DISCONNECT |
    + UNI_WOW_DETECT_TYPE_BCN_LOST);
    if (wowlan->nd_config) {
    mt76_connac_mcu_sched_scan_req(phy, vif, wowlan->nd_config);
    - req.wow_ctrl_tlv.trigger |= BIT(5);
    + req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT;
    mt76_connac_mcu_sched_scan_enable(phy, vif, suspend);
    }
    + if (wowlan->n_patterns)
    + req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_BITMAP;

    if (mt76_is_mmio(dev))
    req.wow_ctrl_tlv.wakeup_hif = WOW_PCIE;
    diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    index c1e1df5f7cd7..eea121101b5e 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    @@ -589,6 +589,14 @@ enum {
    UNI_OFFLOAD_OFFLOAD_BMC_RPY_DETECT,
    };

    +#define UNI_WOW_DETECT_TYPE_MAGIC BIT(0)
    +#define UNI_WOW_DETECT_TYPE_ANY BIT(1)
    +#define UNI_WOW_DETECT_TYPE_DISCONNECT BIT(2)
    +#define UNI_WOW_DETECT_TYPE_GTK_REKEY_FAIL BIT(3)
    +#define UNI_WOW_DETECT_TYPE_BCN_LOST BIT(4)
    +#define UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT BIT(5)
    +#define UNI_WOW_DETECT_TYPE_BITMAP BIT(6)
    +
    enum {
    UNI_SUSPEND_MODE_SETTING,
    UNI_SUSPEND_WOW_CTRL,
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:10    [W:4.941 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site