mt76: mt7663s: make all of packets 4-bytes aligned in sdio tx aggregation

[ Upstream commit 455ae5aabcc72fed7e5c803d59d122415500dc08 ]

Each packet should be padded with the additional zero to become 4-bytes
alignment in sdio tx aggregation.

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>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
index 595519c..2c269fe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
@@ -195,6 +195,7 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, enum mt76_txq_id qid)
        int err, nframes = 0, len = 0, pse_sz = 0, ple_sz = 0;
        struct mt76_queue *q = dev->q_tx[qid];
        struct mt76_sdio *sdio = &dev->sdio;
+       u8 pad;
 
        while (q->first != q->head) {
                struct mt76_queue_entry *e = &q->entry[q->first];
@@ -210,7 +211,8 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, enum mt76_txq_id qid)
                        goto next;
                }
 
-               if (len + e->skb->len + 4 > MT76S_XMIT_BUF_SZ)
+               pad = roundup(e->skb->len, 4) - e->skb->len;
+               if (len + e->skb->len + pad + 4 > MT76S_XMIT_BUF_SZ)
                        break;
 
                if (mt7663s_tx_pick_quota(sdio, qid, e->buf_sz, &pse_sz,
@@ -228,6 +230,11 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, enum mt76_txq_id qid)
                        len += iter->len;
                        nframes++;
                }
+
+               if (unlikely(pad)) {
+                       memset(sdio->xmit_buf[qid] + len, 0, pad);
+                       len += pad;
+               }
 next:
                q->first = (q->first + 1) % q->ndesc;
                e->done = true;