nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails

Browse source 
Do not increment queue head if mt76_dma_add_buf fails for Wireless
Ethernet Dispatcher rx queues.

Fixes: cd372b8c99 ("wifi: mt76: add WED RX support to mt76_dma_{add,get}_buf")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2022-12-07 22:49:31 +01:00 committed by Felix Fietkau
parent 12a88d4d30
commit fe13dad899
1 changed files with 5 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/wireless/mediatek/mt76/dma.c
View file

@ -212,14 +212,14 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,
{ {
struct mt76_queue_entry *entry; struct mt76_queue_entry *entry;
struct mt76_desc *desc; struct mt76_desc *desc;
u32 ctrl;
int i, idx = -1; int i, idx = -1;
u32 ctrl, next;
for (i = 0; i < nbufs; i += 2, buf += 2) { for (i = 0; i < nbufs; i += 2, buf += 2) {
u32 buf0 = buf[0].addr, buf1 = 0; u32 buf0 = buf[0].addr, buf1 = 0;
idx = q->head; idx = q->head;
q->head = (q->head + 1) % q->ndesc; next = (q->head + 1) % q->ndesc;
desc = &q->desc[idx]; desc = &q->desc[idx];
entry = &q->entry[idx]; entry = &q->entry[idx];
@ -239,8 +239,8 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,
MT_DMA_CTL_TO_HOST; MT_DMA_CTL_TO_HOST;
} else { } else {
if (txwi) { if (txwi) {
q->entry[q->head].txwi = DMA_DUMMY_DATA; q->entry[next].txwi = DMA_DUMMY_DATA;
q->entry[q->head].skip_buf0 = true; q->entry[next].skip_buf0 = true;
} }
if (buf[0].skip_unmap) if (buf[0].skip_unmap)
@ -271,6 +271,7 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,
WRITE_ONCE(desc->info, cpu_to_le32(info)); WRITE_ONCE(desc->info, cpu_to_le32(info));
WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl)); WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl));
q->head = next;
q->queued++; q->queued++;
} }