powerpc: Remove addr_needs_map in struct dma_mapping_ops

This patch adds max_direct_dma_addr to struct dev_archdata to remove
addr_needs_map in struct dma_mapping_ops. It also converts
dma_capable() to use max_direct_dma_addr.

max_direct_dma_addr is initialized in pci_dma_dev_setup_swiotlb(),
called via ppc_md.pci_dma_dev_setup hook.

For further information:
http://marc.info/?t=124719060200001&r=1&w=2

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 15 insertions, 21 deletions

diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
index e8a57de85bcf..c9f6a302e879 100644
--- a/arch/powerpc/kernel/dma-swiotlb.c
+++ b/arch/powerpc/kernel/dma-swiotlb.c
@@ -25,26 +25,6 @@ int swiotlb __read_mostly;
 unsigned int ppc_swiotlb_enable;
 
 /*
- * Determine if an address is reachable by a pci device, or if we must bounce.
- */
-static int
-swiotlb_pci_addr_needs_map(struct device *hwdev, dma_addr_t addr, size_t size)
-{
-        dma_addr_t max;
-        struct pci_controller *hose;
-        struct pci_dev *pdev = to_pci_dev(hwdev);
-
-        hose = pci_bus_to_host(pdev->bus);
-        max = hose->dma_window_base_cur + hose->dma_window_size;
-
-        /* check that we're within mapped pci window space */
-        if ((addr + size > max) | (addr < hose->dma_window_base_cur))
-                return 1;
-
-        return 0;
-}
-
-/*
  * At the moment, all platforms that use this code only require
  * swiotlb to be used if we're operating on HIGHMEM.  Since
  * we don't ever call anything other than map_sg, unmap_sg,
@@ -73,22 +53,36 @@ struct dma_mapping_ops swiotlb_pci_dma_ops = {
         .dma_supported = swiotlb_dma_supported,
         .map_page = swiotlb_map_page,
         .unmap_page = swiotlb_unmap_page,
-        .addr_needs_map = swiotlb_pci_addr_needs_map,
         .sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,
         .sync_single_range_for_device = swiotlb_sync_single_range_for_device,
         .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
         .sync_sg_for_device = swiotlb_sync_sg_for_device
 };
 
+void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev)
+{
+        struct pci_controller *hose;
+        struct dev_archdata *sd;
+
+        hose = pci_bus_to_host(pdev->bus);
+        sd = &pdev->dev.archdata;
+        sd->max_direct_dma_addr =
+                hose->dma_window_base_cur + hose->dma_window_size;
+}
+
 static int ppc_swiotlb_bus_notify(struct notifier_block *nb,
                                   unsigned long action, void *data)
 {
         struct device *dev = data;
+        struct dev_archdata *sd;
 
         /* We are only intereted in device addition */
         if (action != BUS_NOTIFY_ADD_DEVICE)
                 return 0;
 
+        sd = &dev->archdata;
+        sd->max_direct_dma_addr = 0;
+
         /* May need to bounce if the device can't address all of DRAM */
         if (dma_get_mask(dev) < lmb_end_of_DRAM())
                 set_dma_ops(dev, &swiotlb_dma_ops);