| From d5e534db95352e78dd449058a31aad734a36afeb Mon Sep 17 00:00:00 2001 |
| From: Bo Jiao <Bo.Jiao@mediatek.com> |
| Date: Tue, 21 Nov 2023 09:55:46 +0800 |
| Subject: [PATCH 033/193] mtk: mt76: mt7996: add SER overlap handle |
| |
| Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com> |
| --- |
| mt7996/mac.c | 11 +++++++++++ |
| mt7996/mcu.c | 8 ++++++++ |
| mt7996/mt7996.h | 2 ++ |
| 3 files changed, 21 insertions(+) |
| |
| diff --git a/mt7996/mac.c b/mt7996/mac.c |
| index 3c9ee0c..2ce9e83 100644 |
| --- a/mt7996/mac.c |
| +++ b/mt7996/mac.c |
| @@ -1906,6 +1906,7 @@ void mt7996_mac_reset_work(struct work_struct *work) |
| if (!(READ_ONCE(dev->recovery.state) & MT_MCU_CMD_STOP_DMA)) |
| return; |
| |
| + dev->recovery.l1_reset_last = dev->recovery.l1_reset; |
| dev_info(dev->mt76.dev,"\n%s L1 SER recovery start.", |
| wiphy_name(dev->mt76.hw->wiphy)); |
| |
| @@ -1923,6 +1924,10 @@ void mt7996_mac_reset_work(struct work_struct *work) |
| |
| set_bit(MT76_RESET, &dev->mphy.state); |
| set_bit(MT76_MCU_RESET, &dev->mphy.state); |
| + if (phy2) |
| + set_bit(MT76_RESET, &phy2->mt76->state); |
| + if (phy3) |
| + set_bit(MT76_RESET, &phy3->mt76->state); |
| wake_up(&dev->mt76.mcu.wait); |
| |
| mt76_worker_disable(&dev->mt76.tx_worker); |
| @@ -2118,6 +2123,9 @@ void mt7996_coredump(struct mt7996_dev *dev, u8 state) |
| |
| void mt7996_reset(struct mt7996_dev *dev) |
| { |
| + dev_info(dev->mt76.dev, "%s SER recovery state: 0x%08x\n", |
| + wiphy_name(dev->mt76.hw->wiphy), READ_ONCE(dev->recovery.state)); |
| + |
| if (!dev->recovery.hw_init_done) |
| return; |
| |
| @@ -2137,6 +2145,9 @@ void mt7996_reset(struct mt7996_dev *dev) |
| return; |
| } |
| |
| + if ((READ_ONCE(dev->recovery.state) & MT_MCU_CMD_STOP_DMA)) |
| + dev->recovery.l1_reset++; |
| + |
| queue_work(dev->mt76.wq, &dev->reset_work); |
| wake_up(&dev->reset_wait); |
| } |
| diff --git a/mt7996/mcu.c b/mt7996/mcu.c |
| index 77567d5..a5b4b84 100644 |
| --- a/mt7996/mcu.c |
| +++ b/mt7996/mcu.c |
| @@ -256,6 +256,14 @@ mt7996_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, |
| u32 val; |
| u8 seq; |
| |
| + if (dev->recovery.l1_reset_last != dev->recovery.l1_reset) { |
| + dev_info(dev->mt76.dev,"\n%s L1 SER recovery overlap, drop message %08x.", |
| + wiphy_name(dev->mt76.hw->wiphy), cmd); |
| + |
| + dev_kfree_skb(skb); |
| + return -EPERM; |
| + } |
| + |
| mdev->mcu.timeout = 20 * HZ; |
| |
| seq = ++dev->mt76.mcu.msg_seq & 0xf; |
| diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h |
| index 7bc5504..22d4454 100644 |
| --- a/mt7996/mt7996.h |
| +++ b/mt7996/mt7996.h |
| @@ -406,6 +406,8 @@ struct mt7996_dev { |
| wait_queue_head_t reset_wait; |
| struct { |
| u32 state; |
| + u32 l1_reset; |
| + u32 l1_reset_last; |
| u32 wa_reset_count; |
| u32 wm_reset_count; |
| bool hw_full_reset:1; |
| -- |
| 2.45.2 |
| |