dma-mapping: add the device argument to dma_mapping_error()

Add per-device dma_mapping_ops support for CONFIG_X86_64 as POWER
architecture does:

This enables us to cleanly fix the Calgary IOMMU issue that some devices
are not behind the IOMMU (http://lkml.org/lkml/2008/5/8/423).

I think that per-device dma_mapping_ops support would be also helpful for
KVM people to support PCI passthrough but Andi thinks that this makes it
difficult to support the PCI passthrough (see the above thread).  So I
CC'ed this to KVM camp.  Comments are appreciated.

A pointer to dma_mapping_ops to struct dev_archdata is added.  If the
pointer is non NULL, DMA operations in asm/dma-mapping.h use it.  If it's
NULL, the system-wide dma_ops pointer is used as before.

If it's useful for KVM people, I plan to implement a mechanism to register
a hook called when a new pci (or dma capable) device is created (it works
with hot plugging).  It enables IOMMUs to set up an appropriate
dma_mapping_ops per device.

The major obstacle is that dma_mapping_error doesn't take a pointer to the
device unlike other DMA operations.  So x86 can't have dma_mapping_ops per
device.  Note all the POWER IOMMUs use the same dma_mapping_error function
so this is not a problem for POWER but x86 IOMMUs use different
dma_mapping_error functions.

The first patch adds the device argument to dma_mapping_error.  The patch
is trivial but large since it touches lots of drivers and dma-mapping.h in
all the architecture.

This patch:

dma_mapping_error() doesn't take a pointer to the device unlike other DMA
operations.  So we can't have dma_mapping_ops per device.

Note that POWER already has dma_mapping_ops per device but all the POWER
IOMMUs use the same dma_mapping_error function.  x86 IOMMUs use device
argument.

[akpm@linux-foundation.org: fix sge]
[akpm@linux-foundation.org: fix svc_rdma]
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: fix bnx2x]
[akpm@linux-foundation.org: fix s2io]
[akpm@linux-foundation.org: fix pasemi_mac]
[akpm@linux-foundation.org: fix sdhci]
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: fix sparc]
[akpm@linux-foundation.org: fix ibmvscsi]
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

17 files changed, 85 insertions, 75 deletions

diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 7a14980f3472..18d3eeb7eab2 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -482,7 +482,7 @@ static int ep93xx_alloc_buffers(struct ep93xx_priv *ep)
                         goto err;
 
                 d = dma_map_single(NULL, page, PAGE_SIZE, DMA_FROM_DEVICE);
-                if (dma_mapping_error(d)) {
+                if (dma_mapping_error(NULL, d)) {
                         free_page((unsigned long)page);
                         goto err;
                 }
@@ -505,7 +505,7 @@ static int ep93xx_alloc_buffers(struct ep93xx_priv *ep)
                         goto err;
 
                 d = dma_map_single(NULL, page, PAGE_SIZE, DMA_TO_DEVICE);
-                if (dma_mapping_error(d)) {
+                if (dma_mapping_error(NULL, d)) {
                         free_page((unsigned long)page);
                         goto err;
                 }
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 0263bef9cc6d..c7cc760a1777 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -1020,7 +1020,7 @@ static inline int bnx2x_alloc_rx_sge(struct bnx2x *bp,
 
         mapping = pci_map_page(bp->pdev, page, 0, BCM_PAGE_SIZE*PAGES_PER_SGE,
                                PCI_DMA_FROMDEVICE);
-        if (unlikely(dma_mapping_error(mapping))) {
+        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
                 __free_pages(page, PAGES_PER_SGE_SHIFT);
                 return -ENOMEM;
         }
@@ -1048,7 +1048,7 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
 
         mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_use_size,
                                  PCI_DMA_FROMDEVICE);
-        if (unlikely(dma_mapping_error(mapping))) {
+        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
                 dev_kfree_skb(skb);
                 return -ENOMEM;
         }
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index a96331c875e6..1b0861d73ab7 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -386,7 +386,7 @@ static inline int add_one_rx_buf(void *va, unsigned int len,
         dma_addr_t mapping;
 
         mapping = pci_map_single(pdev, va, len, PCI_DMA_FROMDEVICE);
-        if (unlikely(pci_dma_mapping_error(mapping)))
+        if (unlikely(pci_dma_mapping_error(pdev, mapping)))
                 return -ENOMEM;
 
         pci_unmap_addr_set(sd, dma_addr, mapping);
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 1037b1332312..19d32a227be1 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1790,7 +1790,7 @@ static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
         rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data,
                 RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
 
-        if (pci_dma_mapping_error(rx->dma_addr)) {
+        if (pci_dma_mapping_error(nic->pdev, rx->dma_addr)) {
                 dev_kfree_skb_any(rx->skb);
                 rx->skb = NULL;
                 rx->dma_addr = 0;
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index a14561f40db0..9350564065e7 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1090,7 +1090,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 tx_ring->buffer_info[i].dma =
                         pci_map_single(pdev, skb->data, skb->len,
                                        PCI_DMA_TODEVICE);
-                if (pci_dma_mapping_error(tx_ring->buffer_info[i].dma)) {
+                if (pci_dma_mapping_error(pdev, tx_ring->buffer_info[i].dma)) {
                         ret_val = 4;
                         goto err_nomem;
                 }
@@ -1153,7 +1153,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 rx_ring->buffer_info[i].dma =
                         pci_map_single(pdev, skb->data, 2048,
                                        PCI_DMA_FROMDEVICE);
-                if (pci_dma_mapping_error(rx_ring->buffer_info[i].dma)) {
+                if (pci_dma_mapping_error(pdev, rx_ring->buffer_info[i].dma)) {
                         ret_val = 8;
                         goto err_nomem;
                 }
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 9c0f56b3c518..d13677899767 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -195,7 +195,7 @@ map_skb:
                 buffer_info->dma = pci_map_single(pdev, skb->data,
                                                   adapter->rx_buffer_len,
                                                   PCI_DMA_FROMDEVICE);
-                if (pci_dma_mapping_error(buffer_info->dma)) {
+                if (pci_dma_mapping_error(pdev, buffer_info->dma)) {
                         dev_err(&pdev->dev, "RX DMA map failed\n");
                         adapter->rx_dma_failed++;
                         break;
@@ -265,7 +265,7 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                                                    ps_page->page,
                                                    0, PAGE_SIZE,
                                                    PCI_DMA_FROMDEVICE);
-                                if (pci_dma_mapping_error(ps_page->dma)) {
+                                if (pci_dma_mapping_error(pdev, ps_page->dma)) {
                                         dev_err(&adapter->pdev->dev,
                                           "RX DMA page map failed\n");
                                         adapter->rx_dma_failed++;
@@ -300,7 +300,7 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                 buffer_info->dma = pci_map_single(pdev, skb->data,
                                                   adapter->rx_ps_bsize0,
                                                   PCI_DMA_FROMDEVICE);
-                if (pci_dma_mapping_error(buffer_info->dma)) {
+                if (pci_dma_mapping_error(pdev, buffer_info->dma)) {
                         dev_err(&pdev->dev, "RX DMA map failed\n");
                         adapter->rx_dma_failed++;
                         /* cleanup skb */
@@ -3344,7 +3344,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
                                 skb->data + offset,
                                 size,
                                 PCI_DMA_TODEVICE);
-                if (pci_dma_mapping_error(buffer_info->dma)) {
+                if (pci_dma_mapping_error(adapter->pdev, buffer_info->dma)) {
                         dev_err(&adapter->pdev->dev, "TX DMA map failed\n");
                         adapter->tx_dma_failed++;
                         return -1;
@@ -3382,7 +3382,8 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
                                         offset,
                                         size,
                                         PCI_DMA_TODEVICE);
-                        if (pci_dma_mapping_error(buffer_info->dma)) {
+                        if (pci_dma_mapping_error(adapter->pdev,
+                                                  buffer_info->dma)) {
                                 dev_err(&adapter->pdev->dev,
                                         "TX DMA page map failed\n");
                                 adapter->tx_dma_failed++;
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index e5a6e2e84540..91ec9fdc7184 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -260,7 +260,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
                 dma_addr = dma_map_single(&adapter->vdev->dev, skb->data,
                                 pool->buff_size, DMA_FROM_DEVICE);
 
-                if (dma_mapping_error(dma_addr))
+                if (dma_mapping_error((&adapter->vdev->dev, dma_addr))
                         goto failure;
 
                 pool->free_map[free_index] = IBM_VETH_INVALID_MAP;
@@ -294,7 +294,7 @@ failure:
                 pool->consumer_index = pool->size - 1;
         else
                 pool->consumer_index--;
-        if (!dma_mapping_error(dma_addr))
+        if (!dma_mapping_error((&adapter->vdev->dev, dma_addr))
                 dma_unmap_single(&adapter->vdev->dev,
                                  pool->dma_addr[index], pool->buff_size,
                                  DMA_FROM_DEVICE);
@@ -448,11 +448,11 @@ static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
 static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
 {
         int i;
+        struct device *dev = &adapter->vdev->dev;
 
         if(adapter->buffer_list_addr != NULL) {
-                if(!dma_mapping_error(adapter->buffer_list_dma)) {
-                        dma_unmap_single(&adapter->vdev->dev,
-                                        adapter->buffer_list_dma, 4096,
+                if (!dma_mapping_error(dev, adapter->buffer_list_dma)) {
+                        dma_unmap_single(dev, adapter->buffer_list_dma, 4096,
                                         DMA_BIDIRECTIONAL);
                         adapter->buffer_list_dma = DMA_ERROR_CODE;
                 }
@@ -461,9 +461,8 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
         }
 
         if(adapter->filter_list_addr != NULL) {
-                if(!dma_mapping_error(adapter->filter_list_dma)) {
-                        dma_unmap_single(&adapter->vdev->dev,
-                                        adapter->filter_list_dma, 4096,
+                if (!dma_mapping_error(dev, adapter->filter_list_dma)) {
+                        dma_unmap_single(dev, adapter->filter_list_dma, 4096,
                                         DMA_BIDIRECTIONAL);
                         adapter->filter_list_dma = DMA_ERROR_CODE;
                 }
@@ -472,8 +471,8 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
         }
 
         if(adapter->rx_queue.queue_addr != NULL) {
-                if(!dma_mapping_error(adapter->rx_queue.queue_dma)) {
-                        dma_unmap_single(&adapter->vdev->dev,
+                if (!dma_mapping_error(dev, adapter->rx_queue.queue_dma)) {
+                        dma_unmap_single(dev,
                                         adapter->rx_queue.queue_dma,
                                         adapter->rx_queue.queue_len,
                                         DMA_BIDIRECTIONAL);
@@ -535,6 +534,7 @@ static int ibmveth_open(struct net_device *netdev)
         int rc;
         union ibmveth_buf_desc rxq_desc;
         int i;
+        struct device *dev;
 
         ibmveth_debug_printk("open starting\n");
 
@@ -563,17 +563,19 @@ static int ibmveth_open(struct net_device *netdev)
                 return -ENOMEM;
         }
 
-        adapter->buffer_list_dma = dma_map_single(&adapter->vdev->dev,
+        dev = &adapter->vdev->dev;
+
+        adapter->buffer_list_dma = dma_map_single(dev,
                         adapter->buffer_list_addr, 4096, DMA_BIDIRECTIONAL);
-        adapter->filter_list_dma = dma_map_single(&adapter->vdev->dev,
+        adapter->filter_list_dma = dma_map_single(dev,
                         adapter->filter_list_addr, 4096, DMA_BIDIRECTIONAL);
-        adapter->rx_queue.queue_dma = dma_map_single(&adapter->vdev->dev,
+        adapter->rx_queue.queue_dma = dma_map_single(dev,
                         adapter->rx_queue.queue_addr,
                         adapter->rx_queue.queue_len, DMA_BIDIRECTIONAL);
 
-        if((dma_mapping_error(adapter->buffer_list_dma) ) ||
-           (dma_mapping_error(adapter->filter_list_dma)) ||
-           (dma_mapping_error(adapter->rx_queue.queue_dma))) {
+        if ((dma_mapping_error(dev, adapter->buffer_list_dma)) ||
+            (dma_mapping_error(dev, adapter->filter_list_dma)) ||
+            (dma_mapping_error(dev, adapter->rx_queue.queue_dma))) {
                 ibmveth_error_printk("unable to map filter or buffer list pages\n");
                 ibmveth_cleanup(adapter);
                 napi_disable(&adapter->napi);
@@ -645,7 +647,7 @@ static int ibmveth_open(struct net_device *netdev)
         adapter->bounce_buffer_dma =
             dma_map_single(&adapter->vdev->dev, adapter->bounce_buffer,
                            netdev->mtu + IBMVETH_BUFF_OH, DMA_BIDIRECTIONAL);
-        if (dma_mapping_error(adapter->bounce_buffer_dma)) {
+        if (dma_mapping_error(dev, adapter->bounce_buffer_dma)) {
                 ibmveth_error_printk("unable to map bounce buffer\n");
                 ibmveth_cleanup(adapter);
                 napi_disable(&adapter->napi);
@@ -922,7 +924,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                 buf[1] = 0;
         }
 
-        if (dma_mapping_error(data_dma_addr)) {
+        if (dma_mapping_error((&adapter->vdev->dev, data_dma_addr)) {
                 if (!firmware_has_feature(FW_FEATURE_CMO))
                         ibmveth_error_printk("tx: unable to map xmit buffer\n");
                 skb_copy_from_linear_data(skb, adapter->bounce_buffer,
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index b8d0639c1cdf..c46864d626b2 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1128,7 +1128,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
         msg->data.addr[0] = dma_map_single(port->dev, skb->data,
                                 skb->len, DMA_TO_DEVICE);
 
-        if (dma_mapping_error(msg->data.addr[0]))
+        if (dma_mapping_error(port->dev, msg->data.addr[0]))
                 goto recycle_and_drop;
 
         msg->dev = port->dev;
@@ -1226,7 +1226,7 @@ static void veth_recycle_msg(struct veth_lpar_connection *cnx,
                 dma_address = msg->data.addr[0];
                 dma_length = msg->data.len[0];
 
-                if (!dma_mapping_error(dma_address))
+                if (!dma_mapping_error(msg->dev, dma_address))
                         dma_unmap_single(msg->dev, dma_address, dma_length,
                                         DMA_TO_DEVICE);
 
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c
index ea3a09aaa844..7df928d3a3d8 100644
--- a/drivers/net/mlx4/eq.c
+++ b/drivers/net/mlx4/eq.c
@@ -526,7 +526,7 @@ int mlx4_map_eq_icm(struct mlx4_dev *dev, u64 icm_virt)
                 return -ENOMEM;
         priv->eq_table.icm_dma  = pci_map_page(dev->pdev, priv->eq_table.icm_page, 0,
                                                PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
-        if (pci_dma_mapping_error(priv->eq_table.icm_dma)) {
+        if (pci_dma_mapping_error(dev->pdev, priv->eq_table.icm_dma)) {
                 __free_page(priv->eq_table.icm_page);
                 return -ENOMEM;
         }
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 993d87c9296f..edc0fd588985 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -650,7 +650,7 @@ static void pasemi_mac_replenish_rx_ring(const struct net_device *dev,
                                      mac->bufsz - LOCAL_SKB_ALIGN,
                                      PCI_DMA_FROMDEVICE);
 
-                if (unlikely(dma_mapping_error(dma))) {
+                if (unlikely(pci_dma_mapping_error(mac->dma_pdev, dma))) {
                         dev_kfree_skb_irq(info->skb);
                         break;
                 }
@@ -1519,7 +1519,7 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
         map[0] = pci_map_single(mac->dma_pdev, skb->data, skb_headlen(skb),
                                 PCI_DMA_TODEVICE);
         map_size[0] = skb_headlen(skb);
-        if (dma_mapping_error(map[0]))
+        if (pci_dma_mapping_error(mac->dma_pdev, map[0]))
                 goto out_err_nolock;
 
         for (i = 0; i < nfrags; i++) {
@@ -1529,7 +1529,7 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
                                         frag->page_offset, frag->size,
                                         PCI_DMA_TODEVICE);
                 map_size[i+1] = frag->size;
-                if (dma_mapping_error(map[i+1])) {
+                if (pci_dma_mapping_error(mac->dma_pdev, map[i+1])) {
                         nfrags = i;
                         goto out_err_nolock;
                 }
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index e7d48a352beb..e82b37bbd6c3 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -328,7 +328,7 @@ static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev,
                                              qdev->lrg_buffer_len -
                                              QL_HEADER_SPACE,
                                              PCI_DMA_FROMDEVICE);
-                        err = pci_dma_mapping_error(map);
+                        err = pci_dma_mapping_error(qdev->pdev, map);
                         if(err) {
                                 printk(KERN_ERR "%s: PCI mapping failed with error: %d\n",
                                        qdev->ndev->name, err);
@@ -1919,7 +1919,7 @@ static int ql_populate_free_queue(struct ql3_adapter *qdev)
                                                      QL_HEADER_SPACE,
                                                      PCI_DMA_FROMDEVICE);
 
-                                err = pci_dma_mapping_error(map);
+                                err = pci_dma_mapping_error(qdev->pdev, map);
                                 if(err) {
                                         printk(KERN_ERR "%s: PCI mapping failed with error: %d\n",
                                                qdev->ndev->name, err);
@@ -2454,7 +2454,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
          */
         map = pci_map_single(qdev->pdev, skb->data, len, PCI_DMA_TODEVICE);
 
-        err = pci_dma_mapping_error(map);
+        err = pci_dma_mapping_error(qdev->pdev, map);
         if(err) {
                 printk(KERN_ERR "%s: PCI mapping failed with error: %d\n",
                        qdev->ndev->name, err);
@@ -2487,7 +2487,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
                                                      sizeof(struct oal),
                                                      PCI_DMA_TODEVICE);
 
-                                err = pci_dma_mapping_error(map);
+                                err = pci_dma_mapping_error(qdev->pdev, map);
                                 if(err) {
 
                                         printk(KERN_ERR "%s: PCI mapping outbound address list with error: %d\n",
@@ -2514,7 +2514,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
                                          frag->page_offset, frag->size,
                                          PCI_DMA_TODEVICE);
 
-                        err = pci_dma_mapping_error(map);
+                        err = pci_dma_mapping_error(qdev->pdev, map);
                         if(err) {
                                 printk(KERN_ERR "%s: PCI mapping frags failed with error: %d\n",
                                        qdev->ndev->name, err);
@@ -2916,7 +2916,7 @@ static int ql_alloc_large_buffers(struct ql3_adapter *qdev)
                                              QL_HEADER_SPACE,
                                              PCI_DMA_FROMDEVICE);
 
-                        err = pci_dma_mapping_error(map);
+                        err = pci_dma_mapping_error(qdev->pdev, map);
                         if(err) {
                                 printk(KERN_ERR "%s: PCI mapping failed with error: %d\n",
                                        qdev->ndev->name, err);
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 9dae40ccf048..86d77d05190a 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2512,8 +2512,8 @@ static void stop_nic(struct s2io_nic *nic)
  *   Return Value:
  *  SUCCESS on success or an appropriate -ve value on failure.
  */
-
-static int fill_rx_buffers(struct ring_info *ring, int from_card_up)
+static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
+                                int from_card_up)
 {
         struct sk_buff *skb;
         struct RxD_t *rxdp;
@@ -2602,7 +2602,8 @@ static int fill_rx_buffers(struct ring_info *ring, int from_card_up)
                         rxdp1->Buffer0_ptr = pci_map_single
                             (ring->pdev, skb->data, size - NET_IP_ALIGN,
                                 PCI_DMA_FROMDEVICE);
-                        if(pci_dma_mapping_error(rxdp1->Buffer0_ptr))
+                        if (pci_dma_mapping_error(nic->pdev,
+                                                rxdp1->Buffer0_ptr))
                                 goto pci_map_failed;
 
                         rxdp->Control_2 =
@@ -2636,7 +2637,8 @@ static int fill_rx_buffers(struct ring_info *ring, int from_card_up)
                                 rxdp3->Buffer0_ptr =
                                    pci_map_single(ring->pdev, ba->ba_0,
                                         BUF0_LEN, PCI_DMA_FROMDEVICE);
-                                if (pci_dma_mapping_error(rxdp3->Buffer0_ptr))
+                        if (pci_dma_mapping_error(nic->pdev,
+                                                rxdp3->Buffer0_ptr))
                                         goto pci_map_failed;
                         } else
                                 pci_dma_sync_single_for_device(ring->pdev,
@@ -2655,7 +2657,8 @@ static int fill_rx_buffers(struct ring_info *ring, int from_card_up)
                                 (ring->pdev, skb->data, ring->mtu + 4,
                                                 PCI_DMA_FROMDEVICE);
 
-                                if (pci_dma_mapping_error(rxdp3->Buffer2_ptr))
+                                if (pci_dma_mapping_error(nic->pdev,
+                                                        rxdp3->Buffer2_ptr))
                                         goto pci_map_failed;
 
                                 if (from_card_up) {
@@ -2664,8 +2667,8 @@ static int fill_rx_buffers(struct ring_info *ring, int from_card_up)
                                                 ba->ba_1, BUF1_LEN,
                                                 PCI_DMA_FROMDEVICE);
 
-                                        if (pci_dma_mapping_error
-                                                (rxdp3->Buffer1_ptr)) {
+                                        if (pci_dma_mapping_error(nic->pdev,
+                                                rxdp3->Buffer1_ptr)) {
                                                 pci_unmap_single
                                                         (ring->pdev,
                                                     (dma_addr_t)(unsigned long)
@@ -2806,9 +2809,9 @@ static void free_rx_buffers(struct s2io_nic *sp)
         }
 }
 
-static int s2io_chk_rx_buffers(struct ring_info *ring)
+static int s2io_chk_rx_buffers(struct s2io_nic *nic, struct ring_info *ring)
 {
-        if (fill_rx_buffers(ring, 0) == -ENOMEM) {
+        if (fill_rx_buffers(nic, ring, 0) == -ENOMEM) {
                 DBG_PRINT(INFO_DBG, "%s:Out of memory", ring->dev->name);
                 DBG_PRINT(INFO_DBG, " in Rx Intr!!\n");
         }
@@ -2848,7 +2851,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
                 return 0;
 
         pkts_processed = rx_intr_handler(ring, budget);
-        s2io_chk_rx_buffers(ring);
+        s2io_chk_rx_buffers(nic, ring);
 
         if (pkts_processed < budget_org) {
                 netif_rx_complete(dev, napi);
@@ -2882,7 +2885,7 @@ static int s2io_poll_inta(struct napi_struct *napi, int budget)
         for (i = 0; i < config->rx_ring_num; i++) {
                 ring = &mac_control->rings[i];
                 ring_pkts_processed = rx_intr_handler(ring, budget);
-                s2io_chk_rx_buffers(ring);
+                s2io_chk_rx_buffers(nic, ring);
                 pkts_processed += ring_pkts_processed;
                 budget -= ring_pkts_processed;
                 if (budget <= 0)
@@ -2939,7 +2942,8 @@ static void s2io_netpoll(struct net_device *dev)
                 rx_intr_handler(&mac_control->rings[i], 0);
 
         for (i = 0; i < config->rx_ring_num; i++) {
-                if (fill_rx_buffers(&mac_control->rings[i], 0) == -ENOMEM) {
+                if (fill_rx_buffers(nic, &mac_control->rings[i], 0) ==
+                                -ENOMEM) {
                         DBG_PRINT(INFO_DBG, "%s:Out of memory", dev->name);
                         DBG_PRINT(INFO_DBG, " in Rx Netpoll!!\n");
                         break;
@@ -4235,14 +4239,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                 txdp->Buffer_Pointer = pci_map_single(sp->pdev,
                                         fifo->ufo_in_band_v,
                                         sizeof(u64), PCI_DMA_TODEVICE);
-                if (pci_dma_mapping_error(txdp->Buffer_Pointer))
+                if (pci_dma_mapping_error(sp->pdev, txdp->Buffer_Pointer))
                         goto pci_map_failed;
                 txdp++;
         }
 
         txdp->Buffer_Pointer = pci_map_single
             (sp->pdev, skb->data, frg_len, PCI_DMA_TODEVICE);
-        if (pci_dma_mapping_error(txdp->Buffer_Pointer))
+        if (pci_dma_mapping_error(sp->pdev, txdp->Buffer_Pointer))
                 goto pci_map_failed;
 
         txdp->Host_Control = (unsigned long) skb;
@@ -4345,7 +4349,7 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
                 netif_rx_schedule(dev, &ring->napi);
         } else {
                 rx_intr_handler(ring, 0);
-                s2io_chk_rx_buffers(ring);
+                s2io_chk_rx_buffers(sp, ring);
         }
 
         return IRQ_HANDLED;
@@ -4826,7 +4830,7 @@ static irqreturn_t s2io_isr(int irq, void *dev_id)
                  */
                 if (!config->napi) {
                         for (i = 0; i < config->rx_ring_num; i++)
-                                s2io_chk_rx_buffers(&mac_control->rings[i]);
+                                s2io_chk_rx_buffers(sp, &mac_control->rings[i]);
                 }
                 writeq(sp->general_int_mask, &bar0->general_int_mask);
                 readl(&bar0->general_int_status);
@@ -6859,7 +6863,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                                 pci_map_single( sp->pdev, (*skb)->data,
                                         size - NET_IP_ALIGN,
                                         PCI_DMA_FROMDEVICE);
-                        if (pci_dma_mapping_error(rxdp1->Buffer0_ptr))
+                        if (pci_dma_mapping_error(sp->pdev, rxdp1->Buffer0_ptr))
                                 goto memalloc_failed;
                         rxdp->Host_Control = (unsigned long) (*skb);
                 }
@@ -6886,12 +6890,13 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                                 pci_map_single(sp->pdev, (*skb)->data,
                                                dev->mtu + 4,
                                                PCI_DMA_FROMDEVICE);
-                        if (pci_dma_mapping_error(rxdp3->Buffer2_ptr))
+                        if (pci_dma_mapping_error(sp->pdev, rxdp3->Buffer2_ptr))
                                 goto memalloc_failed;
                         rxdp3->Buffer0_ptr = *temp0 =
                                 pci_map_single( sp->pdev, ba->ba_0, BUF0_LEN,
                                                 PCI_DMA_FROMDEVICE);
-                        if (pci_dma_mapping_error(rxdp3->Buffer0_ptr)) {
+                        if (pci_dma_mapping_error(sp->pdev,
+                                                rxdp3->Buffer0_ptr)) {
                                 pci_unmap_single (sp->pdev,
                                         (dma_addr_t)rxdp3->Buffer2_ptr,
                                         dev->mtu + 4, PCI_DMA_FROMDEVICE);
@@ -6903,7 +6908,8 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                         rxdp3->Buffer1_ptr = *temp1 =
                                 pci_map_single(sp->pdev, ba->ba_1, BUF1_LEN,
                                                 PCI_DMA_FROMDEVICE);
-                        if (pci_dma_mapping_error(rxdp3->Buffer1_ptr)) {
+                        if (pci_dma_mapping_error(sp->pdev,
+                                                rxdp3->Buffer1_ptr)) {
                                 pci_unmap_single (sp->pdev,
                                         (dma_addr_t)rxdp3->Buffer0_ptr,
                                         BUF0_LEN, PCI_DMA_FROMDEVICE);
@@ -7187,7 +7193,7 @@ static int s2io_card_up(struct s2io_nic * sp)
 
         for (i = 0; i < config->rx_ring_num; i++) {
                 mac_control->rings[i].mtu = dev->mtu;
-                ret = fill_rx_buffers(&mac_control->rings[i], 1);
+                ret = fill_rx_buffers(sp, &mac_control->rings[i], 1);
                 if (ret) {
                         DBG_PRINT(ERR_DBG, "%s: Out of memory in Open\n",
                                   dev->name);
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index 601b001437c0..0d27dd39bc09 100644
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
@@ -233,7 +233,7 @@ static inline int efx_init_rx_buffer_skb(struct efx_rx_queue *rx_queue,
                                           rx_buf->data, rx_buf->len,
                                           PCI_DMA_FROMDEVICE);
 
-        if (unlikely(pci_dma_mapping_error(rx_buf->dma_addr))) {
+        if (unlikely(pci_dma_mapping_error(efx->pci_dev, rx_buf->dma_addr))) {
                 dev_kfree_skb_any(rx_buf->skb);
                 rx_buf->skb = NULL;
                 return -EIO;
@@ -275,7 +275,7 @@ static inline int efx_init_rx_buffer_page(struct efx_rx_queue *rx_queue,
                                         0, efx_rx_buf_size(efx),
                                         PCI_DMA_FROMDEVICE);
 
-                if (unlikely(pci_dma_mapping_error(dma_addr))) {
+                if (unlikely(pci_dma_mapping_error(efx->pci_dev, dma_addr))) {
                         __free_pages(rx_buf->page, efx->rx_buffer_order);
                         rx_buf->page = NULL;
                         return -EIO;
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index 5cdd082ab8f6..5e8374ab28ee 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -172,7 +172,7 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,
 
         /* Process all fragments */
         while (1) {
-                if (unlikely(pci_dma_mapping_error(dma_addr)))
+                if (unlikely(pci_dma_mapping_error(pci_dev, dma_addr)))
                         goto pci_err;
 
                 /* Store fields for marking in the per-fragment final
@@ -661,7 +661,8 @@ efx_tsoh_heap_alloc(struct efx_tx_queue *tx_queue, size_t header_len)
         tsoh->dma_addr = pci_map_single(tx_queue->efx->pci_dev,
                                         TSOH_BUFFER(tsoh), header_len,
                                         PCI_DMA_TODEVICE);
-        if (unlikely(pci_dma_mapping_error(tsoh->dma_addr))) {
+        if (unlikely(pci_dma_mapping_error(tx_queue->efx->pci_dev,
+                                           tsoh->dma_addr))) {
                 kfree(tsoh);
                 return NULL;
         }
@@ -863,7 +864,7 @@ static inline int tso_get_fragment(struct tso_state *st, struct efx_nic *efx,
 
         st->ifc.unmap_addr = pci_map_page(efx->pci_dev, page, page_off,
                                           len, PCI_DMA_TODEVICE);
-        if (likely(!pci_dma_mapping_error(st->ifc.unmap_addr))) {
+        if (likely(!pci_dma_mapping_error(efx->pci_dev, st->ifc.unmap_addr))) {
                 st->ifc.unmap_len = len;
                 st->ifc.len = len;
                 st->ifc.dma_addr = st->ifc.unmap_addr;
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 00aa0b108cb9..b6435d0d71f9 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -452,7 +452,7 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
         /* iommu-map the skb */
         buf = pci_map_single(card->pdev, descr->skb->data,
                         SPIDER_NET_MAX_FRAME, PCI_DMA_FROMDEVICE);
-        if (pci_dma_mapping_error(buf)) {
+        if (pci_dma_mapping_error(card->pdev, buf)) {
                 dev_kfree_skb_any(descr->skb);
                 descr->skb = NULL;
                 if (netif_msg_rx_err(card) && net_ratelimit())
@@ -691,7 +691,7 @@ spider_net_prepare_tx_descr(struct spider_net_card *card,
         unsigned long flags;
 
         buf = pci_map_single(card->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
-        if (pci_dma_mapping_error(buf)) {
+        if (pci_dma_mapping_error(card->pdev, buf)) {
                 if (netif_msg_tx_err(card) && net_ratelimit())
                         dev_err(&card->netdev->dev, "could not iommu-map packet (%p, %i). "
                                   "Dropping packet\n", skb->data, skb->len);
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index a645e5028c14..8487ace9d2e3 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -506,7 +506,7 @@ static void *alloc_rxbuf_page(struct pci_dev *hwdev, dma_addr_t *dma_handle)
                 return NULL;
         *dma_handle = pci_map_single(hwdev, buf, PAGE_SIZE,
                                      PCI_DMA_FROMDEVICE);
-        if (pci_dma_mapping_error(*dma_handle)) {
+        if (pci_dma_mapping_error(hwdev, *dma_handle)) {
                 free_page((unsigned long)buf);
                 return NULL;
         }
@@ -536,7 +536,7 @@ static struct sk_buff *alloc_rxbuf_skb(struct net_device *dev,
                 return NULL;
         *dma_handle = pci_map_single(hwdev, skb->data, RX_BUF_SIZE,
                                      PCI_DMA_FROMDEVICE);
-        if (pci_dma_mapping_error(*dma_handle)) {
+        if (pci_dma_mapping_error(hwdev, *dma_handle)) {
                 dev_kfree_skb_any(skb);
                 return NULL;
         }
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 217d506527a9..d9769c527346 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -1166,7 +1166,7 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
                 bf->skb = skb;
                 bf->skbaddr = pci_map_single(sc->pdev,
                         skb->data, sc->rxbufsize, PCI_DMA_FROMDEVICE);
-                if (unlikely(pci_dma_mapping_error(bf->skbaddr))) {
+                if (unlikely(pci_dma_mapping_error(sc->pdev, bf->skbaddr))) {
                         ATH5K_ERR(sc, "%s: DMA mapping failed\n", __func__);
                         dev_kfree_skb(skb);
                         bf->skb = NULL;
@@ -1918,7 +1918,7 @@ ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
         ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "skb %p [data %p len %u] "
                         "skbaddr %llx\n", skb, skb->data, skb->len,
                         (unsigned long long)bf->skbaddr);
-        if (pci_dma_mapping_error(bf->skbaddr)) {
+        if (pci_dma_mapping_error(sc->pdev, bf->skbaddr)) {
                 ATH5K_ERR(sc, "beacon DMA mapping failed\n");
                 return -EIO;
         }