[v3,3/5] usb: musb: Add support of CPPI 4.1 DMA controller to DA8xx

Message ID 20170119140835.18981-4-abailon@baylibre.com
State Superseded
Headers show
Series
  • usb: musb: da8xx: Add DMA support
Related show

Commit Message

Alexandre Bailon Jan. 19, 2017, 2:08 p.m.
Currently, only the PIO mode is supported.
This add support of CPPI 4.1 to DA8xx.
As the In DA8xx the CPPI 4.1 DMA is a part of the USB.
Create the CPPI 4.1 device as a child of USB.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>

---
 drivers/usb/musb/Kconfig |  4 ++--
 drivers/usb/musb/da8xx.c | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

-- 
2.10.2

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Alexandre Bailon Jan. 19, 2017, 3:56 p.m. | #1
On 01/19/2017 03:08 PM, Alexandre Bailon wrote:
> Currently, only the PIO mode is supported.

> This add support of CPPI 4.1 to DA8xx.

> As the In DA8xx the CPPI 4.1 DMA is a part of the USB.

> Create the CPPI 4.1 device as a child of USB.

> 

> Signed-off-by: Alexandre Bailon <abailon@baylibre.com>

> ---

>  drivers/usb/musb/Kconfig |  4 ++--

>  drivers/usb/musb/da8xx.c | 35 ++++++++++++++++++++++++++++++++++-

>  2 files changed, 36 insertions(+), 3 deletions(-)

> 

> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig

> index 72a2a50..5506a9c 100644

> --- a/drivers/usb/musb/Kconfig

> +++ b/drivers/usb/musb/Kconfig

> @@ -160,8 +160,8 @@ config USB_TI_CPPI_DMA

>  	  Enable DMA transfers when TI CPPI DMA is available.

>  

>  config USB_TI_CPPI41_DMA

> -	bool 'TI CPPI 4.1 (AM335x)'

> -	depends on ARCH_OMAP && DMADEVICES

> +	bool 'TI CPPI 4.1'

> +	depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX) && DMADEVICES

>  	select TI_CPPI41

>  

>  config USB_TUSB_OMAP_DMA

> diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c

> index cd3d763..5f50a78 100644

> --- a/drivers/usb/musb/da8xx.c

> +++ b/drivers/usb/musb/da8xx.c

> @@ -33,6 +33,7 @@

>  #include <linux/clk.h>

>  #include <linux/err.h>

>  #include <linux/io.h>

> +#include <linux/of_platform.h>

>  #include <linux/phy/phy.h>

>  #include <linux/platform_device.h>

>  #include <linux/dma-mapping.h>

> @@ -457,12 +458,40 @@ static inline u8 get_vbus_power(struct device *dev)

>  	return current_uA / 1000 / 2;

>  }

>  

> +#ifdef CONFIG_USB_TI_CPPI41_DM

There is a typo here...
> +static void da8xx_dma_controller_callback(struct dma_controller *c)

> +{

> +	struct musb *musb = c->musb;

> +	void __iomem *reg_base = musb->ctrl_base;

> +

> +	musb_writel(reg_base, DA8XX_USB_END_OF_INTR_REG, 0);

> +}

> +

> +static struct dma_controller *

> +da8xx_dma_controller_create(struct musb *musb, void __iomem *base)

> +{

> +	struct dma_controller *controller;

> +

> +	controller = cppi41_dma_controller_create(musb, base);

> +	if (IS_ERR_OR_NULL(controller))

> +		return controller;

> +

> +	controller->dma_callback = da8xx_dma_controller_callback;

> +

> +	return controller;

> +}

> +#endif

> +

>  static const struct musb_platform_ops da8xx_ops = {

> -	.quirks		= MUSB_INDEXED_EP,

> +	.quirks		= MUSB_INDEXED_EP | MUSB_DMA_CPPI41,

>  	.init		= da8xx_musb_init,

>  	.exit		= da8xx_musb_exit,

>  

>  	.fifo_mode	= 2,

> +#ifdef CONFIG_USB_TI_CPPI41_DMA

> +	.dma_init	= da8xx_dma_controller_create,

> +	.dma_exit	= cppi41_dma_controller_destroy,

> +#endif

>  	.enable		= da8xx_musb_enable,

>  	.disable	= da8xx_musb_disable,

>  

> @@ -534,6 +563,10 @@ static int da8xx_probe(struct platform_device *pdev)

>  	}

>  	platform_set_drvdata(pdev, glue);

>  

> +	ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);

> +	if (ret)

> +		return ret;

> +

>  	memset(musb_resources, 0x00, sizeof(*musb_resources) *

>  			ARRAY_SIZE(musb_resources));

>  

> 


--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sergei Shtylyov Jan. 19, 2017, 4:38 p.m. | #2
On 01/19/2017 05:08 PM, Alexandre Bailon wrote:

> Currently, only the PIO mode is supported.

> This add support of CPPI 4.1 to DA8xx.

> As the In DA8xx the CPPI 4.1 DMA is a part of the USB.

> Create the CPPI 4.1 device as a child of USB.

>

> Signed-off-by: Alexandre Bailon <abailon@baylibre.com>

> ---

>  drivers/usb/musb/Kconfig |  4 ++--

>  drivers/usb/musb/da8xx.c | 35 ++++++++++++++++++++++++++++++++++-

>  2 files changed, 36 insertions(+), 3 deletions(-)

>

> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig

> index 72a2a50..5506a9c 100644

> --- a/drivers/usb/musb/Kconfig

> +++ b/drivers/usb/musb/Kconfig

> @@ -160,8 +160,8 @@ config USB_TI_CPPI_DMA

>  	  Enable DMA transfers when TI CPPI DMA is available.

>

>  config USB_TI_CPPI41_DMA

> -	bool 'TI CPPI 4.1 (AM335x)'

> -	depends on ARCH_OMAP && DMADEVICES

> +	bool 'TI CPPI 4.1'

> +	depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX) && DMADEVICES

>  	select TI_CPPI41

>

>  config USB_TUSB_OMAP_DMA

> diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c

> index cd3d763..5f50a78 100644

> --- a/drivers/usb/musb/da8xx.c

> +++ b/drivers/usb/musb/da8xx.c

[...]
> @@ -457,12 +458,40 @@ static inline u8 get_vbus_power(struct device *dev)

>  	return current_uA / 1000 / 2;

>  }

>

> +#ifdef CONFIG_USB_TI_CPPI41_DM


    CONFIG_USB_TI_CPPI41_DMA! :-)

[...]

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 72a2a50..5506a9c 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -160,8 +160,8 @@  config USB_TI_CPPI_DMA
 	  Enable DMA transfers when TI CPPI DMA is available.
 
 config USB_TI_CPPI41_DMA
-	bool 'TI CPPI 4.1 (AM335x)'
-	depends on ARCH_OMAP && DMADEVICES
+	bool 'TI CPPI 4.1'
+	depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX) && DMADEVICES
 	select TI_CPPI41
 
 config USB_TUSB_OMAP_DMA
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index cd3d763..5f50a78 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -33,6 +33,7 @@ 
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
@@ -457,12 +458,40 @@  static inline u8 get_vbus_power(struct device *dev)
 	return current_uA / 1000 / 2;
 }
 
+#ifdef CONFIG_USB_TI_CPPI41_DM
+static void da8xx_dma_controller_callback(struct dma_controller *c)
+{
+	struct musb *musb = c->musb;
+	void __iomem *reg_base = musb->ctrl_base;
+
+	musb_writel(reg_base, DA8XX_USB_END_OF_INTR_REG, 0);
+}
+
+static struct dma_controller *
+da8xx_dma_controller_create(struct musb *musb, void __iomem *base)
+{
+	struct dma_controller *controller;
+
+	controller = cppi41_dma_controller_create(musb, base);
+	if (IS_ERR_OR_NULL(controller))
+		return controller;
+
+	controller->dma_callback = da8xx_dma_controller_callback;
+
+	return controller;
+}
+#endif
+
 static const struct musb_platform_ops da8xx_ops = {
-	.quirks		= MUSB_INDEXED_EP,
+	.quirks		= MUSB_INDEXED_EP | MUSB_DMA_CPPI41,
 	.init		= da8xx_musb_init,
 	.exit		= da8xx_musb_exit,
 
 	.fifo_mode	= 2,
+#ifdef CONFIG_USB_TI_CPPI41_DMA
+	.dma_init	= da8xx_dma_controller_create,
+	.dma_exit	= cppi41_dma_controller_destroy,
+#endif
 	.enable		= da8xx_musb_enable,
 	.disable	= da8xx_musb_disable,
 
@@ -534,6 +563,10 @@  static int da8xx_probe(struct platform_device *pdev)
 	}
 	platform_set_drvdata(pdev, glue);
 
+	ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
+	if (ret)
+		return ret;
+
 	memset(musb_resources, 0x00, sizeof(*musb_resources) *
 			ARRAY_SIZE(musb_resources));