usb: separate out sysdev pointer from usb_bus

For xhci-hcd platform device, all the DMA parameters are not
configured properly, notably dma ops for dwc3 devices.

The idea here is that you pass in the parent of_node along with
the child device pointer, so it would behave exactly like the
parent already does. The difference is that it also handles all
the other attributes besides the mask.

sysdev will represent the physical device, as seen from firmware
or bus.Splitting the usb_bus->controller field into the
Linux-internal device (used for the sysfs hierarchy, for printks
and for power management) and a new pointer (used for DMA,
DT enumeration and phy lookup) probably covers all that we really
need.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
Tested-by: Baolin Wang <baolin.wang@linaro.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Tested-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Tested-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Sinjan Kumar <sinjank@codeaurora.org>
Cc: David Fisher <david.fisher1@synopsys.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: "Thang Q. Nguyen" <tqnguyen@apm.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Ming Lei <tom.leiming@gmail.com>
Cc: Jon Masters <jcm@redhat.com>
Cc: Dann Frazier <dann.frazier@canonical.com>
Cc: Peter Chen <peter.chen@nxp.com>
Cc: Leo Li <pku.leo@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index b9bf6e2eb6fe..b64568cf572c 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -66,7 +66,7 @@ int hcd_buffer_create(struct usb_hcd *hcd)
         int             i, size;
 
         if (!IS_ENABLED(CONFIG_HAS_DMA) ||
-            (!hcd->self.controller->dma_mask &&
+            (!is_device_dma_capable(hcd->self.sysdev) &&
              !(hcd->driver->flags & HCD_LOCAL_MEM)))
                 return 0;
 
@@ -75,7 +75,7 @@ int hcd_buffer_create(struct usb_hcd *hcd)
                 if (!size)
                         continue;
                 snprintf(name, sizeof(name), "buffer-%d", size);
-                hcd->pool[i] = dma_pool_create(name, hcd->self.controller,
+                hcd->pool[i] = dma_pool_create(name, hcd->self.sysdev,
                                 size, size, 0);
                 if (!hcd->pool[i]) {
                         hcd_buffer_destroy(hcd);
@@ -130,7 +130,7 @@ void *hcd_buffer_alloc(
 
         /* some USB hosts just use PIO */
         if (!IS_ENABLED(CONFIG_HAS_DMA) ||
-            (!bus->controller->dma_mask &&
+            (!is_device_dma_capable(bus->sysdev) &&
              !(hcd->driver->flags & HCD_LOCAL_MEM))) {
                 *dma = ~(dma_addr_t) 0;
                 return kmalloc(size, mem_flags);
@@ -140,7 +140,7 @@ void *hcd_buffer_alloc(
                 if (size <= pool_max[i])
                         return dma_pool_alloc(hcd->pool[i], mem_flags, dma);
         }
-        return dma_alloc_coherent(hcd->self.controller, size, dma, mem_flags);
+        return dma_alloc_coherent(hcd->self.sysdev, size, dma, mem_flags);
 }
 
 void hcd_buffer_free(
@@ -157,7 +157,7 @@ void hcd_buffer_free(
                 return;
 
         if (!IS_ENABLED(CONFIG_HAS_DMA) ||
-            (!bus->controller->dma_mask &&
+            (!is_device_dma_capable(bus->sysdev) &&
              !(hcd->driver->flags & HCD_LOCAL_MEM))) {
                 kfree(addr);
                 return;
@@ -169,5 +169,5 @@ void hcd_buffer_free(
                         return;
                 }
         }
-        dma_free_coherent(hcd->self.controller, size, addr, dma);
+        dma_free_coherent(hcd->self.sysdev, size, addr, dma);
 }