Skip to content

Commit

Permalink
qede: Fix DMA address APIs usage
Browse files Browse the repository at this point in the history
Driver incorrectly uses dma_unmap_addr_set() to set
a variable which is in truth a dma_addr_t
[i.e not defined using DEFINE_DMA_UNMAP_ADDR()] and is
being used by the driver flows other than unmapping
physical addresses. This patch fixes driver fastpath
where CONFIG_NEED_DMA_MAP_STATE is not set.

Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Manish Chopra authored and David S. Miller committed May 20, 2016
1 parent 1968a0b commit 09ec8e7
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/net/ethernet/qlogic/qede/qede_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1076,8 +1076,7 @@ static void qede_tpa_start(struct qede_dev *edev,
* start until its over and we don't want to risk allocation failing
* here, so re-allocate when aggregation will be over.
*/
dma_unmap_addr_set(sw_rx_data_prod, mapping,
dma_unmap_addr(replace_buf, mapping));
sw_rx_data_prod->mapping = replace_buf->mapping;

sw_rx_data_prod->data = replace_buf->data;
rx_bd_prod->addr.hi = cpu_to_le32(upper_32_bits(mapping));
Expand Down Expand Up @@ -2655,7 +2654,7 @@ static void qede_free_sge_mem(struct qede_dev *edev,

if (replace_buf->data) {
dma_unmap_page(&edev->pdev->dev,
dma_unmap_addr(replace_buf, mapping),
replace_buf->mapping,
PAGE_SIZE, DMA_FROM_DEVICE);
__free_page(replace_buf->data);
}
Expand Down Expand Up @@ -2755,7 +2754,7 @@ static int qede_alloc_sge_mem(struct qede_dev *edev,
goto err;
}

dma_unmap_addr_set(replace_buf, mapping, mapping);
replace_buf->mapping = mapping;
tpa_info->replace_buf.page_offset = 0;

tpa_info->replace_buf_mapping = mapping;
Expand Down

0 comments on commit 09ec8e7

Please sign in to comment.