Support UDC on Tegra 20/30/114/124
Subsystems (5)
v4 cover Support UDC on Tegra 20/30/114/124
Some time ago Thierry Reding sent out patches that enabled UDC on NVIDIA Tegra, unfortunately they haven't got enough traction to get into the kernel. I've rebased those patches and added a fix for the Ethernet USB Gadget on Tegra20, Marc Dietrich tested UDC driver on AC100 (Tegra20), Nicolas Chauvet on TK1 (Tegra124) and Michał Mirosław on TF300T (Tegra30). Like an original patchset, this series adds support for the peripheral mode only.
Changelog:
V4:
1) Use of_device_get_match_data() instead of of_match_node() to cleanup code a tad.
V3:
1) Specified platform flags directly in the SoC info as per Michał's suggestion.
V2:
1) Added comments to each of patched USB Ethernet gadget models.
2) Added explanatory comment about why usb_phy_set_suspend() invocation is necessary in tegra_udc_probe().
3) Dropped TrimSlice from patchset because it turned out that it uses USB1 controller for USB-to-SATA.
4) Moved tegra_defconfig patch before DT patches as per Stephen's suggestion.
5) Changed dr_mode to "peripheral" in DT patches since we don't support role mode switching for now.
Dmitry Osipenko (4):
usb: gadget: f_ecm/f_eem/f_rndis: Setup quirk_avoids_skb_reserve
usb: chipidea: udc: Support SKB alignment quirk
ARM: defconfig: tegra: Enable ChipIdea UDC driver
ARM: tegra: Enable UDC on AC100
Thierry Reding (4):
usb: chipidea: Add support for Tegra20/30/114/124
ARM: tegra: Enable UDC on Beaver
ARM: tegra: Enable UDC on Dalmore
ARM: tegra: Enable UDC on Jetson TK1
arch/arm/boot/dts/tegra114-dalmore.dts | 10 ++ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 12 ++- arch/arm/boot/dts/tegra20-paz00.dts | 2 + arch/arm/boot/dts/tegra30-beaver.dts | 10 ++ arch/arm/configs/tegra_defconfig | 10 +- drivers/usb/chipidea/Makefile | 1 + drivers/usb/chipidea/ci_hdrc_tegra.c | 155 ++++++++++++++++++++++++++++++ drivers/usb/chipidea/udc.c | 3 + drivers/usb/gadget/function/f_ecm.c | 7 ++ drivers/usb/gadget/function/f_eem.c | 5 + drivers/usb/gadget/function/f_rndis.c | 4 + include/linux/usb/chipidea.h | 1 + 12 files changed, 214 insertions(+), 6 deletions(-) create mode 100644 drivers/usb/chipidea/ci_hdrc_tegra.c
Signature · 1 line
2.13.3
PATCH v4 1/8 usb: gadget: f_ecm/f_eem/f_rndis: Setup quirk_avoids_skb_reserve
In reply to a message not in the archiveThis quirk is required to make USB Ethernet gadget working with HW that can't cope with unaligned DMA. For some reason only f_ncm handles that quirk, let's handle it in the rest of the network models. All models have been tested with a ChipIdea UDC driver on NVIDIA Tegra20 SoC that require DMA to be aligned.
--- drivers/usb/gadget/function/f_ecm.c | 7 +++++++ drivers/usb/gadget/function/f_eem.c | 5 +++++ drivers/usb/gadget/function/f_rndis.c | 4 ++++ 3 files changed, 16 insertions(+)
drivers/usb/gadget/function/f_ecm.c +7 -0
@@ -584,6 +584,13 @@ static int ecm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)*/ ecm->port.is_zlp_ok =gadget_is_zlp_supported (cdev->gadget); + +/* Setup DMA alignment workaround for UDC's that +* need it. +*/ + ecm->port.no_skb_reserve = +gadget_avoids_skb_reserve (cdev->gadget); + ecm->port.cdc_filter =DEFAULT_FILTER ;DBG (cdev,"activate ecm\n" ); net =gether_connect (&ecm->port);
drivers/usb/gadget/function/f_eem.c +5 -0
@@ -215,6 +215,11 @@ static int eem_set_alt(struct usb_function *f, unsigned intf, unsigned alt)*/ eem->port.is_zlp_ok =1 ; eem->port.cdc_filter =DEFAULT_FILTER ; + +/* setup DMA alignment workaround for UDC's that*need it */ + eem->port.no_skb_reserve = +gadget_avoids_skb_reserve (cdev->gadget); +DBG (cdev,"activate eem\n" ); net =gether_connect (&eem->port);if (IS_ERR (net))
drivers/usb/gadget/function/f_rndis.c +4 -0
@@ -593,6 +593,10 @@ static int rndis_set_alt(struct usb_function *f, unsigned intf, unsigned alt)*/ rndis->port.cdc_filter =0 ; +/* Setup DMA alignment workaround for UDC's that need it */ + rndis->port.no_skb_reserve = +gadget_avoids_skb_reserve (cdev->gadget); +DBG (cdev,"RNDIS RX/TX early activation ... \n" ); net =gether_connect (&rndis->port);if (IS_ERR (net))
Signature · 1 line
2.13.3
PATCH v4 2/8 usb: chipidea: udc: Support SKB alignment quirk
In reply to a message not in the archiveNVIDIA Tegra20 UDC can't cope with unaligned DMA and require a USB gadget quirk that avoids SKB buffer alignment to be set in order to make Ethernet Gadget working. Later Tegra generations do not require that quirk. Let's add a new platform data flag that allows to enable USB gadget quirk for platforms that require it.
--- drivers/usb/chipidea/udc.c | 3 +++ include/linux/usb/chipidea.h | 1 + 2 files changed, 4 insertions(+)
drivers/usb/chipidea/udc.c +3 -0
@@ -1896,6 +1896,9 @@ static int udc_start(struct ci_hdrc *ci) ci->gadget.name = ci->platdata->name; ci->gadget.otg_caps = otg_caps; +if (ci->platdata->flags &CI_HDRC_REQUIRES_ALIGNED_DMA ) + ci->gadget.quirk_avoids_skb_reserve =1 ; +if (ci->is_otg && (otg_caps->hnp_support || otg_caps->srp_support || otg_caps->adp_support)) ci->gadget.is_otg =1 ;
include/linux/usb/chipidea.h +1 -0
@@ -58,6 +58,7 @@ struct ci_hdrc_platform_data {#define CI_HDRC_OVERRIDE_TX_BURST BIT(10)#define CI_HDRC_OVERRIDE_RX_BURST BIT(11)#define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12)/* Glue layer manages phy */ +#define CI_HDRC_REQUIRES_ALIGNED_DMA BIT(13)enum usb_dr_mode dr_mode;#define CI_HDRC_CONTROLLER_RESET_EVENT 0#define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
Signature · 6 lines
2.13.3 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 3/8 usb: chipidea: Add support for Tegra20/30/114/124
In reply to a message not in the archiveFrom: Thierry Reding <[email protected]>
All of these Tegra SoC generations have a ChipIdea UDC IP block that can be used for device mode communication with a host. Implement rudimentary support that doesn't allow switching between host and device modes.
--- drivers/usb/chipidea/Makefile | 1 + drivers/usb/chipidea/ci_hdrc_tegra.c | 155 +++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 drivers/usb/chipidea/ci_hdrc_tegra.c
drivers/usb/chipidea/Makefile +1 -0
@@ -15,3 +15,4 @@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zevio.o obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o obj-$(CONFIG_USB_CHIPIDEA_OF) += usbmisc_imx.o ci_hdrc_imx.o +obj-$(CONFIG_USB_CHIPIDEA_OF) += ci_hdrc_tegra.o
drivers/usb/chipidea/ci_hdrc_tegra.c new file +155 -0
155 lines not on this page · raw message
Signature · 1 line
2.13.3
PATCH v4 4/8 ARM: defconfig: tegra: Enable ChipIdea UDC driver
In reply to a message not in the archiveSince NVIDIA Tegra is supported now by the ChipIdea USB driver, let's enable this driver in tegra_defconfig.
--- arch/arm/configs/tegra_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/configs/tegra_defconfig +5 -5
@@ -121,7 +121,6 @@ CONFIG_TOUCHSCREEN_WM97XX=y CONFIG_TOUCHSCREEN_STMPE=y CONFIG_INPUT_MISC=y # CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y
@@ -220,6 +219,9 @@ CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_ACM=y CONFIG_USB_WDM=y CONFIG_USB_STORAGE=y +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_GADGET=m CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_SDHCI=y
@@ -249,8 +251,6 @@ CONFIG_RTC_DRV_TEGRA=y CONFIG_DMADEVICES=y CONFIG_TEGRA20_APB_DMA=y CONFIG_STAGING=y -CONFIG_SENSORS_ISL29018=y -CONFIG_SENSORS_ISL29028=y CONFIG_MFD_NVEC=y CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y
@@ -265,6 +265,8 @@ CONFIG_ARCH_TEGRA_124_SOC=y CONFIG_MEMORY=y CONFIG_IIO=y CONFIG_MPU3050_I2C=y +CONFIG_SENSORS_ISL29018=y +CONFIG_SENSORS_ISL29028=y CONFIG_AK8975=y CONFIG_PWM=y CONFIG_PWM_TEGRA=y
@@ -290,13 +292,11 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_SLAB=y CONFIG_DEBUG_VM=y CONFIG_DETECT_HUNG_TASK=y CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_SG=y
Signature · 6 lines
2.13.3 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 5/8 ARM: tegra: Enable UDC on Beaver
In reply to a message not in the archiveFrom: Thierry Reding <[email protected]>
Override the compatible string of the first USB controller to enable device mode.
--- arch/arm/boot/dts/tegra30-beaver.dts | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/tegra30-beaver.dts +10 -0
@@ -1927,6 +1927,16 @@ non-removable; }; + usb@7d000000 { + compatible = "nvidia,tegra30-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + usb@7d004000 { status = "okay"; };
Signature · 1 line
2.13.3
PATCH v4 6/8 ARM: tegra: Enable UDC on Dalmore
In reply to a message not in the archiveFrom: Thierry Reding <[email protected]>
Override the compatible string of the first USB controller to enable device mode.
--- arch/arm/boot/dts/tegra114-dalmore.dts | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/tegra114-dalmore.dts +10 -0
@@ -1122,6 +1122,16 @@ non-removable; }; + usb@7d000000 { + compatible = "nvidia,tegra114-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + usb@7d008000 { status = "okay"; };
Signature · 1 line
2.13.3
PATCH v4 7/8 ARM: tegra: Enable UDC on Jetson TK1
In reply to a message not in the archiveFrom: Thierry Reding <[email protected]>
Override the compatible string of the first USB controller to enable device mode.
--- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/arm/boot/dts/tegra124-jetson-tk1.dts +11 -1
@@ -1722,7 +1722,7 @@ lanes { usb2-0 { - nvidia,function = "xusb"; + nvidia,function = "snps"; status = "okay"; };
@@ -1829,6 +1829,16 @@ }; }; + usb@7d000000 { + compatible = "nvidia,tegra124-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + /* mini-PCIe USB */ usb@7d004000 { status = "okay";
Signature · 1 line
2.13.3
PATCH v4 8/8 ARM: tegra: Enable UDC on AC100
In reply to a message not in the archiveOverride the compatible string of the first USB controller to enable device mode.
--- arch/arm/boot/dts/tegra20-paz00.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/tegra20-paz00.dts +2 -0
@@ -452,7 +452,9 @@ }; usb@c5000000 { + compatible = "nvidia,tegra20-udc"; status = "okay"; + dr_mode = "peripheral"; }; usb-phy@c5000000 {
Signature · 6 lines
2.13.3 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4 3/8] usb: chipidea: Add support for Tegra20/30/114/124
In reply to a message not in the archiveQuoted 121 lines · Dmitry Osipenko
From: Thierry Reding <[email protected]>
All of these Tegra SoC generations have a ChipIdea UDC IP block that can be used for device mode communication with a host. Implement rudimentary support that doesn't allow switching between host and device modes.
Tested-by Michał Mirosław <[email protected]>Signed-off-by Thierry Reding <[email protected]>[[email protected]: rebased patches and added DMA alignment quirk for Tegra20]Signed-off-by Dmitry Osipenko <[email protected]>Acked-by Peter Chen <[email protected]>--- drivers/usb/chipidea/Makefile | 1 + drivers/usb/chipidea/ci_hdrc_tegra.c | 155 +++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 drivers/usb/chipidea/ci_hdrc_tegra.cdrivers/usb/chipidea/Makefile +1
-0@@ -15,3 +15,4 @@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zevio.o obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o obj-$(CONFIG_USB_CHIPIDEA_OF) += usbmisc_imx.o ci_hdrc_imx.o +obj-$(CONFIG_USB_CHIPIDEA_OF) += ci_hdrc_tegra.odrivers/usb/chipidea/ci_hdrc_tegra.c new file +89
-0@@ -0,0 +1,155 @@ +/* +* Copyright (c) 2016, NVIDIA Corporation +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +*/ + +#include <linux/clk.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/reset.h> + +#include <linux/usb/chipidea.h> + +#include "ci.h" + +struct tegra_udc { +struct ci_hdrc_platform_data data; +struct platform_device *dev; + +struct usb_phy *phy; +struct clk *clk; +}; + +struct tegra_udc_soc_info { +unsigned long flags; +}; + +static const struct tegra_udc_soc_info tegra20_udc_soc_info = { + .flags =CI_HDRC_REQUIRES_ALIGNED_DMA , +}; + +static const struct tegra_udc_soc_info tegra30_udc_soc_info = { + .flags =0 , +}; + +static const struct tegra_udc_soc_info tegra114_udc_soc_info = { + .flags =0 , +}; + +static const struct tegra_udc_soc_info tegra124_udc_soc_info = { + .flags =0 , +}; + +static const struct of_device_id tegra_udc_of_match[] = { + { + .compatible ="nvidia,tegra20-udc" , + .data = &tegra20_udc_soc_info, + }, { + .compatible ="nvidia,tegra30-udc" , + .data = &tegra30_udc_soc_info, + }, { + .compatible ="nvidia,tegra114-udc" , + .data = &tegra114_udc_soc_info, + }, { + .compatible ="nvidia,tegra124-udc" , + .data = &tegra124_udc_soc_info, + }, { +/* sentinel */ + } +}; +MODULE_DEVICE_TABLE (of, tegra_udc_of_match); + +static int tegra_udc_probe (struct platform_device *pdev) +{ +const struct tegra_udc_soc_info *soc; +struct tegra_udc *udc; +int err; + + udc =devm_kzalloc (&pdev->dev,sizeof (*udc),GFP_KERNEL ); +if (!udc) +return -ENOMEM ; + + udc->phy =devm_usb_get_phy_by_phandle (&pdev->dev,"nvidia,phy" ,0 ); +if (IS_ERR (udc->phy)) { + err =PTR_ERR (udc->phy); +dev_err (&pdev->dev,"failed to get PHY: %d\n" , err); +return err; + } + + udc->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (udc->clk)) { + err =PTR_ERR (udc->clk); +dev_err (&pdev->dev,"failed to get clock: %d\n" , err); +return err; + } + + err =clk_prepare_enable (udc->clk);
drivers/usb/chipidea/ci_hdrc_tegra.c line 99
Quoted 10 lines
drivers/usb/chipidea/ci_hdrc_tegra.c new file +10
-0+if (err <0 ) { +dev_err (&pdev->dev,"failed to enable clock: %d\n" , err); +return err; + } + + soc =of_device_get_match_data (&pdev->dev); +if (!soc) { +dev_err (&pdev->dev,"failed to match OF data\n" ); +return -EINVAL ; + }
Oh, I made a mistake here. The code above should be before clock enabling. I'll send V5 shortly.
Quoted 57 lines
drivers/usb/chipidea/ci_hdrc_tegra.c new file +56
-0+ +/* +* Tegra's USB PHY driver doesn't implement optional phy_init() +* hook, so we have to power on UDC controller before ChipIdea +* driver initialization kicks in. +*/ +usb_phy_set_suspend (udc->phy,0 ); + +/* setup and register ChipIdea HDRC device */ + udc->data.name ="tegra-udc" ; + udc->data.flags = soc->flags; + udc->data.usb_phy = udc->phy; + udc->data.capoffset =DEF_CAPOFFSET ; + + udc->dev =ci_hdrc_add_device (&pdev->dev, pdev->resource, + pdev->num_resources, &udc->data); +if (IS_ERR (udc->dev)) { + err =PTR_ERR (udc->dev); +dev_err (&pdev->dev,"failed to add HDRC device: %d\n" , err); + goto power_off; + } + +platform_set_drvdata (pdev, udc); + +return 0 ; + +power_off: +usb_phy_set_suspend (udc->phy,1 ); +clk_disable_unprepare (udc->clk); +return err; +} + +static int tegra_udc_remove (struct platform_device *pdev) +{ +struct tegra_udc *udc =platform_get_drvdata (pdev); + +usb_phy_set_suspend (udc->phy,1 ); +clk_disable_unprepare (udc->clk); + +return 0 ; +} + +static struct platform_driver tegra_udc_driver = { + .driver = { + .name ="tegra-udc" , + .of_match_table = tegra_udc_of_match, + }, + .probe = tegra_udc_probe, + .remove = tegra_udc_remove, +}; +module_platform_driver (tegra_udc_driver); + +MODULE_DESCRIPTION ("NVIDIA Tegra USB device mode driver" ); +MODULE_AUTHOR ("Thierry Reding <[email protected]>" ); +MODULE_ALIAS ("platform:tegra-udc" ); +MODULE_LICENSE ("GPL v2" );
Signature · 1 line
Dmitry