iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mt76: add unlikely() for dma_mapping_error() check

Browse Source 
In the tx/rx fastpath, the funciton dma_map_single() rarely fails.
This adds unlikely() optimization to this error check conditional.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Ryder Lee
2019-04-01 15:16:42 +08:00
committed by Felix Fietkau
parent 04b8e65922
commit 6edf07478d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/mediatek/mt76/dma.c
View File

@ -272,7 +272,7 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,
addr = dma_map_single(dev->dev, skb->data, skb->len, addr = dma_map_single(dev->dev, skb->data, skb->len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (dma_mapping_error(dev->dev, addr)) if (unlikely(dma_mapping_error(dev->dev, addr)))
return -ENOMEM; return -ENOMEM;
buf.addr = addr; buf.addr = addr;
@ -315,7 +315,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
len = skb_headlen(skb); len = skb_headlen(skb);
addr = dma_map_single(dev->dev, skb->data, len, DMA_TO_DEVICE); addr = dma_map_single(dev->dev, skb->data, len, DMA_TO_DEVICE);
if (dma_mapping_error(dev->dev, addr)) if (unlikely(dma_mapping_error(dev->dev, addr)))
goto free; goto free;
tx_info.buf[n].addr = t->dma_addr; tx_info.buf[n].addr = t->dma_addr;
@ -329,7 +329,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
addr = dma_map_single(dev->dev, iter->data, iter->len, addr = dma_map_single(dev->dev, iter->data, iter->len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (dma_mapping_error(dev->dev, addr)) if (unlikely(dma_mapping_error(dev->dev, addr)))
goto unmap; goto unmap;
tx_info.buf[n].addr = addr; tx_info.buf[n].addr = addr;
@ -386,7 +386,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q)
break; break;
addr = dma_map_single(dev->dev, buf, len, DMA_FROM_DEVICE); addr = dma_map_single(dev->dev, buf, len, DMA_FROM_DEVICE);
if (dma_mapping_error(dev->dev, addr)) { if (unlikely(dma_mapping_error(dev->dev, addr))) {
skb_free_frag(buf); skb_free_frag(buf);
break; break;
} }