xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: qcom/emac: Use proper free methods during TX

Browse Source 
This patch fixes the warning messages/call traces seen if DMA debug is
enabled, In case of fragmented skb's memory was allocated using
dma_map_page but freed using dma_unmap_single. This patch modifies buffer
allocations in TX path to use dma_map_page in all the places and
dma_unmap_page while freeing the buffers.

Signed-off-by: Hemanth Puranik <hpuranik@codeaurora.org>
Acked-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hemanth Puranik
2018-03-06 08:18:06 +05:30
committed by David S. Miller
parent 9de506a547
commit cc5db3150e
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/qualcomm/emac/emac-mac.c
View File

@@ -1194,7 +1194,7 @@ void emac_mac_tx_process(struct emac_adapter *adpt, struct emac_tx_queue *tx_q)
while (tx_q->tpd.consume_idx != hw_consume_idx) { while (tx_q->tpd.consume_idx != hw_consume_idx) {
tpbuf = GET_TPD_BUFFER(tx_q, tx_q->tpd.consume_idx); tpbuf = GET_TPD_BUFFER(tx_q, tx_q->tpd.consume_idx);
if (tpbuf->dma_addr) { if (tpbuf->dma_addr) {
dma_unmap_single(adpt->netdev->dev.parent, dma_unmap_page(adpt->netdev->dev.parent,
tpbuf->dma_addr, tpbuf->length, tpbuf->dma_addr, tpbuf->length,
DMA_TO_DEVICE); DMA_TO_DEVICE);
tpbuf->dma_addr = 0; tpbuf->dma_addr = 0;
@@ -1353,8 +1353,10 @@ static void emac_tx_fill_tpd(struct emac_adapter *adpt,
tpbuf = GET_TPD_BUFFER(tx_q, tx_q->tpd.produce_idx); tpbuf = GET_TPD_BUFFER(tx_q, tx_q->tpd.produce_idx);
tpbuf->length = mapped_len; tpbuf->length = mapped_len;
tpbuf->dma_addr = dma_map_single(adpt->netdev->dev.parent, tpbuf->dma_addr = dma_map_page(adpt->netdev->dev.parent,
skb->data, tpbuf->length, virt_to_page(skb->data),
offset_in_page(skb->data),
tpbuf->length,
DMA_TO_DEVICE); DMA_TO_DEVICE);
ret = dma_mapping_error(adpt->netdev->dev.parent, ret = dma_mapping_error(adpt->netdev->dev.parent,
tpbuf->dma_addr); tpbuf->dma_addr);
@@ -1371,8 +1373,11 @@ static void emac_tx_fill_tpd(struct emac_adapter *adpt,
if (mapped_len < len) { if (mapped_len < len) {
tpbuf = GET_TPD_BUFFER(tx_q, tx_q->tpd.produce_idx); tpbuf = GET_TPD_BUFFER(tx_q, tx_q->tpd.produce_idx);
tpbuf->length = len - mapped_len; tpbuf->length = len - mapped_len;
tpbuf->dma_addr = dma_map_single(adpt->netdev->dev.parent, tpbuf->dma_addr = dma_map_page(adpt->netdev->dev.parent,
skb->data + mapped_len, virt_to_page(skb->data +
mapped_len),
offset_in_page(skb->data +
mapped_len),
tpbuf->length, DMA_TO_DEVICE); tpbuf->length, DMA_TO_DEVICE);
ret = dma_mapping_error(adpt->netdev->dev.parent, ret = dma_mapping_error(adpt->netdev->dev.parent,
tpbuf->dma_addr); tpbuf->dma_addr);