lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 474/601] mt76: mt7663s: fix the possible device hang in high traffic
    Date
    From: Sean Wang <sean.wang@mediatek.com>

    [ Upstream commit 45247a85614b49b07b9dc59a4e6783b17e766ff2 ]

    Use the additional memory barrier to ensure the skb list up-to-date
    between the skb producer and consumer to avoid the invalid skb content
    written into sdio controller and then cause device hang due to mcu assert
    caught by WR_TIMEOUT_INT.

    Fixes: 1522ff731f84 ("mt76: mt7663s: introduce sdio tx aggregation")
    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/mt7615/sdio_txrx.c | 2 ++
    drivers/net/wireless/mediatek/mt76/sdio.c | 3 +++
    2 files changed, 5 insertions(+)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
    index 37fe65ced4fd..4393dd21ebbb 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
    @@ -225,6 +225,8 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
    struct mt76_queue_entry *e = &q->entry[q->first];
    struct sk_buff *iter;

    + smp_rmb();
    +
    if (!test_bit(MT76_STATE_MCU_RUNNING, &dev->phy.state)) {
    __skb_put_zero(e->skb, 4);
    err = __mt7663s_xmit_queue(dev, e->skb->data,
    diff --git a/drivers/net/wireless/mediatek/mt76/sdio.c b/drivers/net/wireless/mediatek/mt76/sdio.c
    index 0b6facb17ff7..a18d2896ee1f 100644
    --- a/drivers/net/wireless/mediatek/mt76/sdio.c
    +++ b/drivers/net/wireless/mediatek/mt76/sdio.c
    @@ -256,6 +256,9 @@ mt76s_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,

    q->entry[q->head].skb = tx_info.skb;
    q->entry[q->head].buf_sz = len;
    +
    + smp_wmb();
    +
    q->head = (q->head + 1) % q->ndesc;
    q->queued++;

    --
    2.30.2


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