Skip to contentSkip to conversation

usb: chipidea: set dma_ops for the created ci_hdrc platform_device

RFC In review Jisheng Zhang 2 participants 3 messages Apr 25, 2017 – Apr 26, 2017

Subsystems (2)
USB Chipidea USB high speed dual role controller
lore
Share & tools
lore

Jisheng Zhang

author
#0 lore raw

RFC 1/1 usb: chipidea: set dma_ops for the created ci_hdrc platform_device

Hi all,

After commit 1dccb598df549 ("arm64: simplify dma_get_ops"), the chipidea driver can't work any more on Marvell Berlin arm64 platforms, the reason is the created ci_hdrc platform_device's dma_ops is dummy_dma_ops, so all dma related operations will fail. The fix I can think of would be something as below:

And I noticed that dwc3 has the same issue[1], and as pointed out in its discussion, the patch can't fix None-DT platforms, so could you please guide me what's the proper fix which can be mainlined?

Any suggestion is appreciated!

Thanks,
Jisheng

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2016-April/425079.html

drivers/usb/chipidea/core.c +2 -0
index 047afdbb7049..acb80457603c 100644
@@ -62,6 +62,7 @@
 #include <linux/usb/chipidea.h>
 #include <linux/usb/of.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/usb/ehci_def.h>
 

@@ -786,6 +787,7 @@ struct platform_device *ci_hdrc_add_device(struct device *dev,
 	pdev->dev.dma_mask = dev->dma_mask;
 	pdev->dev.dma_parms = dev->dma_parms;
 	dma_set_coherent_mask(&pdev->dev, dev->coherent_dma_mask);
+	of_dma_configure(&pdev->dev, dev->of_node);
 
 	ret = platform_device_add_resources(pdev, res, nres);
 	if (ret)
#1 lore raw
Quoted 11 lines · Jisheng Zhang

Hi all,

After commit 1dccb598df549 ("arm64: simplify dma_get_ops"), the chipidea driver can't work any more on Marvell Berlin arm64 platforms, the reason is the created ci_hdrc platform_device's dma_ops is dummy_dma_ops, so all dma related operations will fail. The fix I can think of would be something as below:

And I noticed that dwc3 has the same issue[1], and as pointed out in its discussion, the patch can't fix None-DT platforms, so could you please guide me what's the proper fix which can be mainlined?

I think the right solution is:

- Set the "sysdev" pointer tin the USB device o the device structure that was created by DT or the legacy board file and remove the manual setting of dma_mask, parms and the dma_configure. This should make everything work as expected in case of DT

- For any legacy board files, set the mask/parms and map_ops at the point where the device originally created.

Arnd

author
#2 lore raw
Quoted 13 lines · On Tue, 25 Apr 2017 13:09:27 +0200 Arnd Bergmann wrote:
Quoted 11 lines · Jisheng Zhang

Hi all,

After commit 1dccb598df549 ("arm64: simplify dma_get_ops"), the chipidea driver can't work any more on Marvell Berlin arm64 platforms, the reason is the created ci_hdrc platform_device's dma_ops is dummy_dma_ops, so all dma related operations will fail. The fix I can think of would be something as below:

And I noticed that dwc3 has the same issue[1], and as pointed out in its discussion, the patch can't fix None-DT platforms, so could you please guide me what's the proper fix which can be mainlined?

Quoted 7 lines

I think the right solution is:

- Set the "sysdev" pointer tin the USB device o the device structure that was created by DT or the legacy board file and remove the manual setting of dma_mask, parms and the dma_configure. This should make everything work as expected in case of DT

oh yeah! I see a proper fix in linux-next tree, thanks for fixing it.