e1000: remove use of skb_dma_map from e1000 driver
Remove the use of skb_dma_map from the e1000 driver in order to avoid issues when HW iommu are in use. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
03b1320dfc
commit
602c0554d7
|
@ -167,6 +167,7 @@ struct e1000_buffer {
|
|||
unsigned long time_stamp;
|
||||
u16 length;
|
||||
u16 next_to_watch;
|
||||
u16 mapped_as_page;
|
||||
};
|
||||
|
||||
struct e1000_tx_ring {
|
||||
|
|
|
@ -1839,10 +1839,17 @@ void e1000_free_all_tx_resources(struct e1000_adapter *adapter)
|
|||
static void e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,
|
||||
struct e1000_buffer *buffer_info)
|
||||
{
|
||||
buffer_info->dma = 0;
|
||||
if (buffer_info->dma) {
|
||||
if (buffer_info->mapped_as_page)
|
||||
pci_unmap_page(adapter->pdev, buffer_info->dma,
|
||||
buffer_info->length, PCI_DMA_TODEVICE);
|
||||
else
|
||||
pci_unmap_single(adapter->pdev, buffer_info->dma,
|
||||
buffer_info->length,
|
||||
PCI_DMA_TODEVICE);
|
||||
buffer_info->dma = 0;
|
||||
}
|
||||
if (buffer_info->skb) {
|
||||
skb_dma_unmap(&adapter->pdev->dev, buffer_info->skb,
|
||||
DMA_TO_DEVICE);
|
||||
dev_kfree_skb_any(buffer_info->skb);
|
||||
buffer_info->skb = NULL;
|
||||
}
|
||||
|
@ -2683,22 +2690,14 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
|
|||
unsigned int mss)
|
||||
{
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
struct pci_dev *pdev = adapter->pdev;
|
||||
struct e1000_buffer *buffer_info;
|
||||
unsigned int len = skb_headlen(skb);
|
||||
unsigned int offset, size, count = 0, i;
|
||||
unsigned int offset = 0, size, count = 0, i;
|
||||
unsigned int f;
|
||||
dma_addr_t *map;
|
||||
|
||||
i = tx_ring->next_to_use;
|
||||
|
||||
if (skb_dma_map(&adapter->pdev->dev, skb, DMA_TO_DEVICE)) {
|
||||
dev_err(&adapter->pdev->dev, "TX DMA map failed\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
map = skb_shinfo(skb)->dma_maps;
|
||||
offset = 0;
|
||||
|
||||
while (len) {
|
||||
buffer_info = &tx_ring->buffer_info[i];
|
||||
size = min(len, max_per_txd);
|
||||
|
@ -2735,7 +2734,11 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
|
|||
buffer_info->length = size;
|
||||
/* set time_stamp *before* dma to help avoid a possible race */
|
||||
buffer_info->time_stamp = jiffies;
|
||||
buffer_info->dma = skb_shinfo(skb)->dma_head + offset;
|
||||
buffer_info->mapped_as_page = false;
|
||||
buffer_info->dma = pci_map_single(pdev, skb->data + offset,
|
||||
size, PCI_DMA_TODEVICE);
|
||||
if (pci_dma_mapping_error(pdev, buffer_info->dma))
|
||||
goto dma_error;
|
||||
buffer_info->next_to_watch = i;
|
||||
|
||||
len -= size;
|
||||
|
@ -2753,7 +2756,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
|
|||
|
||||
frag = &skb_shinfo(skb)->frags[f];
|
||||
len = frag->size;
|
||||
offset = 0;
|
||||
offset = frag->page_offset;
|
||||
|
||||
while (len) {
|
||||
i++;
|
||||
|
@ -2777,7 +2780,12 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
|
|||
|
||||
buffer_info->length = size;
|
||||
buffer_info->time_stamp = jiffies;
|
||||
buffer_info->dma = map[f] + offset;
|
||||
buffer_info->mapped_as_page = true;
|
||||
buffer_info->dma = pci_map_page(pdev, frag->page,
|
||||
offset, size,
|
||||
PCI_DMA_TODEVICE);
|
||||
if (pci_dma_mapping_error(pdev, buffer_info->dma))
|
||||
goto dma_error;
|
||||
buffer_info->next_to_watch = i;
|
||||
|
||||
len -= size;
|
||||
|
@ -2790,6 +2798,22 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
|
|||
tx_ring->buffer_info[first].next_to_watch = i;
|
||||
|
||||
return count;
|
||||
|
||||
dma_error:
|
||||
dev_err(&pdev->dev, "TX DMA map failed\n");
|
||||
buffer_info->dma = 0;
|
||||
count--;
|
||||
|
||||
while (count >= 0) {
|
||||
count--;
|
||||
i--;
|
||||
if (i < 0)
|
||||
i += tx_ring->count;
|
||||
buffer_info = &tx_ring->buffer_info[i];
|
||||
e1000_unmap_and_free_tx_resource(adapter, buffer_info);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void e1000_tx_queue(struct e1000_adapter *adapter,
|
||||
|
|
Loading…
Reference in a new issue