Skip to content
Snippets Groups Projects
Commit 188dfc47 authored by Sean Wang's avatar Sean Wang Committed by Greg Kroah-Hartman
Browse files

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


[ Upstream commit 455ae5aa ]

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

Fixes: 1522ff73 ("mt76: mt7663s: introduce sdio tx aggregation")
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bf08637d
No related branches found
No related tags found
No related merge requests found
...@@ -195,6 +195,7 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, enum mt76_txq_id qid) ...@@ -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; int err, nframes = 0, len = 0, pse_sz = 0, ple_sz = 0;
struct mt76_queue *q = dev->q_tx[qid]; struct mt76_queue *q = dev->q_tx[qid];
struct mt76_sdio *sdio = &dev->sdio; struct mt76_sdio *sdio = &dev->sdio;
u8 pad;
while (q->first != q->head) { while (q->first != q->head) {
struct mt76_queue_entry *e = &q->entry[q->first]; 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) ...@@ -210,7 +211,8 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, enum mt76_txq_id qid)
goto next; 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; break;
if (mt7663s_tx_pick_quota(sdio, qid, e->buf_sz, &pse_sz, 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) ...@@ -228,6 +230,11 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, enum mt76_txq_id qid)
len += iter->len; len += iter->len;
nframes++; nframes++;
} }
if (unlikely(pad)) {
memset(sdio->xmit_buf[qid] + len, 0, pad);
len += pad;
}
next: next:
q->first = (q->first + 1) % q->ndesc; q->first = (q->first + 1) % q->ndesc;
e->done = true; e->done = true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment