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.13 499/800] mt76: mt7921: avoid unnecessary consecutive WiFi resets
    Date
    From: Sean Wang <sean.wang@mediatek.com>

    [ Upstream commit f07ac384b4579f294bb1e0380ed501156219ed71 ]

    Avoid unnecessary consecutive WiFi resets by dropping reset
    request when reset work is working.

    Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
    Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
    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/mt7921/mac.c | 5 ++++-
    drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 1 +
    2 files changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
    index 9bb88b2e28a9..4eac7c3206f9 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
    @@ -1272,6 +1272,7 @@ void mt7921_mac_reset_work(struct work_struct *work)
    hw = mt76_hw(dev);

    dev_err(dev->mt76.dev, "chip reset\n");
    + dev->hw_full_reset = true;
    ieee80211_stop_queues(hw);

    cancel_delayed_work_sync(&dev->mphy.mac_work);
    @@ -1296,6 +1297,7 @@ void mt7921_mac_reset_work(struct work_struct *work)
    ieee80211_scan_completed(dev->mphy.hw, &info);
    }

    + dev->hw_full_reset = false;
    ieee80211_wake_queues(hw);
    ieee80211_iterate_active_interfaces(hw,
    IEEE80211_IFACE_ITER_RESUME_ALL,
    @@ -1306,7 +1308,8 @@ void mt7921_reset(struct mt76_dev *mdev)
    {
    struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);

    - queue_work(dev->mt76.wq, &dev->reset_work);
    + if (!dev->hw_full_reset)
    + queue_work(dev->mt76.wq, &dev->reset_work);
    }

    static void
    diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
    index 59862ea4951c..4cc8a372b277 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
    +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
    @@ -156,6 +156,7 @@ struct mt7921_dev {
    u16 chainmask;

    struct work_struct reset_work;
    + bool hw_full_reset;

    struct list_head sta_poll_list;
    spinlock_t sta_poll_lock;
    --
    2.30.2


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