Skip to contentSkip to conversation

dra7xx: am43xx: add dwc3 gadget driver support and enable dfu

PATCH New Kishon Vijay Abraham I 3 participants 104 messages Feb 6, 2015 – Mar 2, 2015 Page 1 of 2

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

cover dra7xx: am43xx: add dwc3 gadget driver support and enable dfu

This patch series ports dwc3 gadget driver from linux kernel (3.19-rc1) to u-boot.

Changes from RFC:
*) A patch has been added to copy the driver from linux kernel to u-boot and then
it's modfied to make it work in u-boot. This will help to understand the changes that's been done to make it work in u-boot and will also be easier to review.
*) Implemented chained TRB support in dwc3 ep0 so that we need not increase the size
of bounce buffer

Testing:
*) tested DFU RAM and DFU MMC in dra7xx and am43xx

TODO:
*) Add Kconfig support
*) Adapt dwc3 driver to use the driver model.
*) Make composite driver similar to the one in linux kernel.

Pushed these patches to
git://git.ti.com/~kishon/ti-u-boot/kishons-ti-u-boot.git dwc3_upstream_v1

Kishon Vijay Abraham I (40):
ARM: DRA7: Enable clocks for USB OTGSS and USB PHY
ARM: AM43xx: Enable clocks for USB OTGSS and USB PHY
usb: gadget: udc: add udc-core from linux kernel to u-boot
include: usb: modify gadget.h to include udc support
usb: gadget: udc: make udc-core compile in u-boot build
include: asm: dma-mapping: get rid of the compilation warning in
udc-core
usb: dwc3: add dwc3 folder from linux kernel to u-boot
usb: dwc3: remove un-used files from dwc3 folder
usb: dwc3: Modify the file headers to u-boot format
usb: dwc3: remove trace_* APIs from dwc3 driver
usb: dwc3: fix dwc3 header files
usb: dwc3: remove pm related operations from dwc3 driver
arm: asm: dma-mapping: added dma_free_coherent API
usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy
usb: dwc3: gadget: make dwc3 gadget build in uboot
include: asm: types: add resource_size_t type
usb: dwc3: ep0: make dwc3 ep0 build in uboot
include: usb: composite: add USB_GADGET_DELAYED_STATUS to avoid
compilation error
usb: dwc3: core: make dwc3 core build in uboot
include: dwc3-uboot: add a structure for populating platform data
dwc3: core: change probe and remove to uboot init and uboot exit code
dwc3: core: add support for multiple dwc3 controllers
dwc3: core: added an API to invoke irq handlers
usb: dwc3: dwc3-omap: make dwc3-omap build in uboot
include: dwc3-omap-uboot: add a structure for populating dwc3-omap
platform data
usb: dwc3: dwc3-omap: change probe and remove to uboot init and uboot
exit code
dwc3: dwc3-omap: add support for multiple dwc3-omap controllers
usb: dwc3: dwc3-omap: add interrupt status API to check for
interrupts
usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms
dwc3: flush the buffers before using it
usb: dwc3: ep0: preparation for implementing chained TRB
usb: dwc3: Add chained TRB support for ep0
usb: dwc3: Makefile: Make dwc3 driver compile in u-boot
usb: gadget: defer setting maxpacket till ->setup()
common: cmd_dfu: invoke board_usb_cleanup() for cleaning up
board: ti: DRA7: added USB initializtion code
include: configs: Enable DWC3 and DFU in DRA7xx
board: ti: AM43xx: added USB initializtion code
include: configs: Enable DWC3 and DFU in AM43xx
usb: modify usb_gadget_handle_interrupts to take controller index

 Makefile                                           |    2 +
 arch/arm/cpu/armv7/am33xx/clock_am43xx.c           |   12 +
 arch/arm/cpu/armv7/omap5/hw_data.c                 |   14 +
 arch/arm/cpu/armv7/omap5/prcm-regs.c               |   10 +-
 arch/arm/include/asm/arch-am33xx/cpu.h             |   22 +-
 arch/arm/include/asm/arch-am33xx/hardware_am43xx.h |   13 +
 arch/arm/include/asm/arch-omap5/omap.h             |   12 +
 arch/arm/include/asm/dma-mapping.h                 |    9 +-
 arch/arm/include/asm/omap_common.h                 |    4 +-
 arch/arm/include/asm/types.h                       |    1 +
 board/ti/am43xx/board.c                            |  108 +
 board/ti/dra7xx/evm.c                              |  109 +
 common/cmd_dfu.c                                   |    3 +-
 common/cmd_fastboot.c                              |    2 +-
 common/cmd_usb_mass_storage.c                      |    2 +-
 common/usb.c                                       |    7 +
 drivers/usb/dwc3/Makefile                          |    8 +
 drivers/usb/dwc3/core.c                            |  792 ++++++
 drivers/usb/dwc3/core.h                            | 1033 ++++++++
 drivers/usb/dwc3/dwc3-omap.c                       |  441 ++++
 drivers/usb/dwc3/ep0.c                             | 1112 ++++++++
 drivers/usb/dwc3/gadget.c                          | 2679 ++++++++++++++++++++
 drivers/usb/dwc3/gadget.h                          |  108 +
 drivers/usb/dwc3/io.h                              |   56 +
 drivers/usb/dwc3/linux-compat.h                    |   38 +
 drivers/usb/dwc3/ti_usb_phy.c                      |  309 +++
 drivers/usb/gadget/atmel_usba_udc.c                |    2 +-
 drivers/usb/gadget/ci_udc.c                        |    2 +-
 drivers/usb/gadget/composite.c                     |    4 +-
 drivers/usb/gadget/ether.c                         |   12 +-
 drivers/usb/gadget/f_mass_storage.c                |    2 +-
 drivers/usb/gadget/f_thor.c                        |    6 +-
 drivers/usb/gadget/fotg210.c                       |    2 +-
 drivers/usb/gadget/pxa25x_udc.c                    |    2 +-
 drivers/usb/gadget/s3c_udc_otg.c                   |    2 +-
 drivers/usb/gadget/udc/Makefile                    |    4 +
 drivers/usb/gadget/udc/udc-core.c                  |  354 +++
 drivers/usb/musb-new/musb_uboot.c                  |    2 +-
 include/configs/am43xx_evm.h                       |   61 +-
 include/configs/dra7xx_evm.h                       |   63 +
 include/configs/ti_omap5_common.h                  |    5 +
 include/dwc3-omap-uboot.h                          |   32 +
 include/dwc3-uboot.h                               |   42 +
 include/linux/compat.h                             |    1 +
 include/linux/usb/composite.h                      |    9 +
 include/linux/usb/dwc3-omap.h                      |   19 +
 include/linux/usb/gadget.h                         |   84 +-
 include/linux/usb/otg.h                            |   20 +
 include/ti-usb-phy-uboot.h                         |   22 +
 49 files changed, 7622 insertions(+), 36 deletions(-)
 create mode 100644 drivers/usb/dwc3/Makefile
 create mode 100644 drivers/usb/dwc3/core.c
 create mode 100644 drivers/usb/dwc3/core.h
 create mode 100644 drivers/usb/dwc3/dwc3-omap.c
 create mode 100644 drivers/usb/dwc3/ep0.c
 create mode 100644 drivers/usb/dwc3/gadget.c
 create mode 100644 drivers/usb/dwc3/gadget.h
 create mode 100644 drivers/usb/dwc3/io.h
 create mode 100644 drivers/usb/dwc3/linux-compat.h
 create mode 100644 drivers/usb/dwc3/ti_usb_phy.c
 create mode 100644 drivers/usb/gadget/udc/Makefile
 create mode 100644 drivers/usb/gadget/udc/udc-core.c
 create mode 100644 include/dwc3-omap-uboot.h
 create mode 100644 include/dwc3-uboot.h
 create mode 100644 include/linux/usb/dwc3-omap.h
 create mode 100644 include/linux/usb/otg.h
 create mode 100644 include/ti-usb-phy-uboot.h
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/40 ARM: DRA7: Enable clocks for USB OTGSS and USB PHY

Enabled clocks for dwc3 controller and USB PHY present in DRA7.

---
 arch/arm/cpu/armv7/omap5/hw_data.c   |   14 ++++++++++++++
 arch/arm/cpu/armv7/omap5/prcm-regs.c |   10 +++++-----
 arch/arm/include/asm/omap_common.h   |    4 ++--
 3 files changed, 21 insertions(+), 7 deletions(-)
arch/arm/cpu/armv7/omap5/hw_data.c +14 -0
index 95f1686..9315bce 100644
@@ -455,6 +455,10 @@ void enable_basic_clocks(void)
 		(*prcm)->cm_l4per_gpio6_clkctrl,
 		(*prcm)->cm_l4per_gpio7_clkctrl,
 		(*prcm)->cm_l4per_gpio8_clkctrl,
+#ifdef CONFIG_USB_DWC3
+		(*prcm)->cm_l3init_ocp2scp1_clkctrl,
+		(*prcm)->cm_l3init_usb_otg_ss1_clkctrl,
+#endif
 		0
 	};
 
@@ -486,6 +490,16 @@ void enable_basic_clocks(void)
 	setbits_le32((*prcm)->cm_l3init_hsmmc2_clkctrl,
 			HSMMC_CLKCTRL_CLKSEL_MASK);
 
+#ifdef CONFIG_USB_DWC3
+	/* Enable 960 MHz clock for dwc3 */
+	setbits_le32((*prcm)->cm_l3init_usb_otg_ss1_clkctrl,
+		     OPTFCLKEN_REFCLK960M);
+
+	/* Enable 32 KHz clock for dwc3 */
+	setbits_le32((*prcm)->cm_coreaon_usb_phy1_core_clkctrl,
+		     USBPHY_CORE_CLKCTRL_OPTFCLKEN_CLK32K);
+#endif
+
 	/* Set the correct clock dividers for mmc */
 	setbits_le32((*prcm)->cm_l3init_hsmmc1_clkctrl,
 			HSMMC_CLKCTRL_CLKSEL_DIV_MASK);
arch/arm/cpu/armv7/omap5/prcm-regs.c +5 -5
index 0745d42..440bb40 100644
@@ -575,7 +575,7 @@ struct prcm_regs const omap5_es2_prcm = {
 	.cm_div_m2_dpll_unipro = 0x4a0081d0,
 	.cm_ssc_deltamstep_dpll_unipro = 0x4a0081e8,
 	.cm_ssc_modfreqdiv_dpll_unipro = 0x4a0081ec,
-	.cm_coreaon_usb_phy_core_clkctrl = 0x4A008640,
+	.cm_coreaon_usb_phy1_core_clkctrl = 0x4A008640,
 	.cm_coreaon_bandgap_clkctrl = 0x4a008648,
 	.cm_coreaon_io_srcomp_clkctrl = 0x4a008650,
 
@@ -709,7 +709,7 @@ struct prcm_regs const omap5_es2_prcm = {
 	.cm_l3init_fsusb_clkctrl = 0x4a0096d0,
 	.cm_l3init_ocp2scp1_clkctrl = 0x4a0096e0,
 	.cm_l3init_ocp2scp3_clkctrl = 0x4a0096e8,
-	.cm_l3init_usb_otg_ss_clkctrl = 0x4a0096f0,
+	.cm_l3init_usb_otg_ss1_clkctrl = 0x4a0096f0,
 
 	/* prm irqstatus regs */
 	.prm_irqstatus_mpu_2 = 0x4ae06014,
@@ -801,8 +801,8 @@ struct prcm_regs const dra7xx_prcm = {
 	.cm_clkmode_dpll_dsp			= 0x4a005234,
 	.cm_shadow_freq_config1			= 0x4a005260,
 	.cm_clkmode_dpll_gmac			= 0x4a0052a8,
-	.cm_coreaon_usb_phy_core_clkctrl	= 0x4a008640,
-	.cm_coreaon_usb_phy2_core_clkctrl = 0x4a008688,
+	.cm_coreaon_usb_phy1_core_clkctrl	= 0x4a008640,
+	.cm_coreaon_usb_phy2_core_clkctrl	= 0x4a008688,
 
 	/* cm1.mpu */
 	.cm_mpu_mpu_clkctrl			= 0x4a005320,
@@ -908,7 +908,7 @@ struct prcm_regs const dra7xx_prcm = {
 	.cm_gmac_gmac_clkctrl			= 0x4a0093d0,
 	.cm_l3init_ocp2scp1_clkctrl		= 0x4a0093e0,
 	.cm_l3init_ocp2scp3_clkctrl		= 0x4a0093e8,
-	.cm_l3init_usb_otg_ss_clkctrl		= 0x4a0093f0,
+	.cm_l3init_usb_otg_ss1_clkctrl		= 0x4a0093f0,
 
 	/* cm2.l4per */
 	.cm_l4per_clkstctrl			= 0x4a009700,
arch/arm/include/asm/omap_common.h +2 -2
index 323952f..bd43099 100644
@@ -143,7 +143,7 @@ struct prcm_regs {
 	u32 cm_div_m2_dpll_unipro;
 	u32 cm_ssc_deltamstep_dpll_unipro;
 	u32 cm_ssc_modfreqdiv_dpll_unipro;
-	u32 cm_coreaon_usb_phy_core_clkctrl;
+	u32 cm_coreaon_usb_phy1_core_clkctrl;
 	u32 cm_coreaon_usb_phy2_core_clkctrl;
 
 	/* cm2.core */
@@ -230,7 +230,7 @@ struct prcm_regs {
 	u32 cm_l3init_fsusb_clkctrl;
 	u32 cm_l3init_ocp2scp1_clkctrl;
 	u32 cm_l3init_ocp2scp3_clkctrl;
-	u32 cm_l3init_usb_otg_ss_clkctrl;
+	u32 cm_l3init_usb_otg_ss1_clkctrl;
 
 	u32 prm_irqstatus_mpu_2;
 
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/40 ARM: DRA7: Enable clocks for USB OTGSS and USB PHY

Hi Kishon,

Quoted 97 lines

Enabled clocks for dwc3 controller and USB PHY present in DRA7.

---
 arch/arm/cpu/armv7/omap5/hw_data.c   |   14 ++++++++++++++
 arch/arm/cpu/armv7/omap5/prcm-regs.c |   10 +++++-----
 arch/arm/include/asm/omap_common.h   |    4 ++--
 3 files changed, 21 insertions(+), 7 deletions(-)
(quoted diff) +0 -0

b/arch/arm/cpu/armv7/omap5/hw_data.c index 95f1686..9315bce 100644

arch/arm/cpu/armv7/omap5/hw_data.c +14 -0
@@ -455,6 +455,10 @@ void enable_basic_clocks(void)
 		(*prcm)->cm_l4per_gpio6_clkctrl,
 		(*prcm)->cm_l4per_gpio7_clkctrl,
 		(*prcm)->cm_l4per_gpio8_clkctrl,
+#ifdef CONFIG_USB_DWC3
+		(*prcm)->cm_l3init_ocp2scp1_clkctrl,
+		(*prcm)->cm_l3init_usb_otg_ss1_clkctrl,
+#endif
 		0
 	};
 
@@ -486,6 +490,16 @@ void enable_basic_clocks(void)
 	setbits_le32((*prcm)->cm_l3init_hsmmc2_clkctrl,
 			HSMMC_CLKCTRL_CLKSEL_MASK);
 
+#ifdef CONFIG_USB_DWC3
+	/* Enable 960 MHz clock for dwc3 */
+	setbits_le32((*prcm)->cm_l3init_usb_otg_ss1_clkctrl,
+		     OPTFCLKEN_REFCLK960M);
+
+	/* Enable 32 KHz clock for dwc3 */
+	setbits_le32((*prcm)->cm_coreaon_usb_phy1_core_clkctrl,
+		     USBPHY_CORE_CLKCTRL_OPTFCLKEN_CLK32K);
+#endif
+
 	/* Set the correct clock dividers for mmc */
 	setbits_le32((*prcm)->cm_l3init_hsmmc1_clkctrl,
 			HSMMC_CLKCTRL_CLKSEL_DIV_MASK);
(quoted diff) +0 -0

b/arch/arm/cpu/armv7/omap5/prcm-regs.c index 0745d42..440bb40 100644

arch/arm/cpu/armv7/omap5/prcm-regs.c +5 -5
@@ -575,7 +575,7 @@ struct prcm_regs const omap5_es2_prcm = {
 	.cm_div_m2_dpll_unipro = 0x4a0081d0,
 	.cm_ssc_deltamstep_dpll_unipro = 0x4a0081e8,
 	.cm_ssc_modfreqdiv_dpll_unipro = 0x4a0081ec,
-	.cm_coreaon_usb_phy_core_clkctrl = 0x4A008640,
+	.cm_coreaon_usb_phy1_core_clkctrl = 0x4A008640,
 	.cm_coreaon_bandgap_clkctrl = 0x4a008648,
 	.cm_coreaon_io_srcomp_clkctrl = 0x4a008650,
 
@@ -709,7 +709,7 @@ struct prcm_regs const omap5_es2_prcm = {
 	.cm_l3init_fsusb_clkctrl = 0x4a0096d0,
 	.cm_l3init_ocp2scp1_clkctrl = 0x4a0096e0,
 	.cm_l3init_ocp2scp3_clkctrl = 0x4a0096e8,
-	.cm_l3init_usb_otg_ss_clkctrl = 0x4a0096f0,
+	.cm_l3init_usb_otg_ss1_clkctrl = 0x4a0096f0,
 
 	/* prm irqstatus regs */
 	.prm_irqstatus_mpu_2 = 0x4ae06014,
@@ -801,8 +801,8 @@ struct prcm_regs const dra7xx_prcm = {
 	.cm_clkmode_dpll_dsp			= 0x4a005234,
 	.cm_shadow_freq_config1			= 0x4a005260,
 	.cm_clkmode_dpll_gmac			= 0x4a0052a8,
-	.cm_coreaon_usb_phy_core_clkctrl	= 0x4a008640,
-	.cm_coreaon_usb_phy2_core_clkctrl = 0x4a008688,
+	.cm_coreaon_usb_phy1_core_clkctrl	= 0x4a008640,
+	.cm_coreaon_usb_phy2_core_clkctrl	= 0x4a008688,
 
 	/* cm1.mpu */
 	.cm_mpu_mpu_clkctrl			= 0x4a005320,
@@ -908,7 +908,7 @@ struct prcm_regs const dra7xx_prcm = {
 	.cm_gmac_gmac_clkctrl			= 0x4a0093d0,
 	.cm_l3init_ocp2scp1_clkctrl		= 0x4a0093e0,
 	.cm_l3init_ocp2scp3_clkctrl		= 0x4a0093e8,
-	.cm_l3init_usb_otg_ss_clkctrl		= 0x4a0093f0,
+	.cm_l3init_usb_otg_ss1_clkctrl		= 0x4a0093f0,
 
 	/* cm2.l4per */
 	.cm_l4per_clkstctrl			= 0x4a009700,
(quoted diff) +0 -0

b/arch/arm/include/asm/omap_common.h index 323952f..bd43099 100644

arch/arm/include/asm/omap_common.h +1 -1
@@ -143,7 +143,7 @@ struct prcm_regs {
 	u32 cm_div_m2_dpll_unipro;
 	u32 cm_ssc_deltamstep_dpll_unipro;
 	u32 cm_ssc_modfreqdiv_dpll_unipro;
-	u32 cm_coreaon_usb_phy_core_clkctrl;
+	u32 cm_coreaon_usb_phy1_core_clkctrl;
 	u32 cm_coreaon_usb_phy2_core_clkctrl;
 
 	/* cm2.core */

arch/arm/include/asm/omap_common.h struct prcm_regs { · line 236

Quoted 8 lines
arch/arm/include/asm/omap_common.h +1 -1
@@ -230,7 +230,7 @@ struct prcm_regs {
 	u32 cm_l3init_fsusb_clkctrl;
 	u32 cm_l3init_ocp2scp1_clkctrl;
 	u32 cm_l3init_ocp2scp3_clkctrl;
-	u32 cm_l3init_usb_otg_ss_clkctrl;
+	u32 cm_l3init_usb_otg_ss1_clkctrl;
 
 	u32 prm_irqstatus_mpu_2;
 
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#3 lore raw

PATCH 2/40 ARM: AM43xx: Enable clocks for USB OTGSS and USB PHY

In reply to Kishon Vijay Abraham I

Enabled clocks for dwc3 controller and USB PHY present in AM43xx.

---
 arch/arm/cpu/armv7/am33xx/clock_am43xx.c           |   12 +++++++++++
 arch/arm/include/asm/arch-am33xx/cpu.h             |   22 ++++++++++++++------
 arch/arm/include/asm/arch-am33xx/hardware_am43xx.h |    4 ++++
 3 files changed, 32 insertions(+), 6 deletions(-)
arch/arm/cpu/armv7/am33xx/clock_am43xx.c +12 -0
index 31188c8..252135d 100644
@@ -111,9 +111,21 @@ void enable_basic_clocks(void)
 		&cmper->emifclkctrl,
 		&cmper->otfaemifclkctrl,
 		&cmper->qspiclkctrl,
+		&cmper->usb0clkctrl,
+		&cmper->usbphyocp2scp0clkctrl,
+		&cmper->usb1clkctrl,
+		&cmper->usbphyocp2scp1clkctrl,
 		0
 	};
 
+	setbits_le32(&cmper->usb0clkctrl,
+		     USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960);
+	setbits_le32(&cmwkup->usbphy0clkctrl,
+		     USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K);
+	setbits_le32(&cmper->usb1clkctrl,
+		     USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960);
+	setbits_le32(&cmwkup->usbphy1clkctrl,
+		     USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K);
 	do_enable_clocks(clk_domains, clk_modules_explicit_en, 1);
 
 	/* Select the Master osc clk as Timer2 clock source */
arch/arm/include/asm/arch-am33xx/cpu.h +16 -6
index 8dd69b3..1caa24e 100644
@@ -224,7 +224,11 @@ struct cm_dpll {
 struct cm_wkuppll {
 	unsigned int resv0[136];
 	unsigned int wkl4wkclkctrl;	/* offset 0x220 */
-	unsigned int resv1[55];
+	unsigned int resv1[7];
+	unsigned int usbphy0clkctrl;	/* offset 0x240 */
+	unsigned int resv112;
+	unsigned int usbphy1clkctrl;	/* offset 0x248 */
+	unsigned int resv113[45];
 	unsigned int wkclkstctrl;	/* offset 0x300 */
 	unsigned int resv2[15];
 	unsigned int wkup_i2c0ctrl;	/* offset 0x340 */
@@ -275,7 +279,7 @@ struct cm_wkuppll {
 	unsigned int divm2dplldisp;	/* offset 0x630 */
 };
 
-/*
+/*get_sys_clk_freq
  * Encapsulating peripheral functional clocks
  * pll registers
  */
@@ -283,7 +287,7 @@ struct cm_perpll {
 	unsigned int l3clkstctrl;	/* offset 0x00 */
 	unsigned int resv0[7];
 	unsigned int l3clkctrl;		/* Offset 0x20 */
-	unsigned int resv1[7];
+	unsigned int resv112[7];
 	unsigned int l3instrclkctrl;	/* offset 0x40 */
 	unsigned int resv2[3];
 	unsigned int ocmcramclkctrl;	/* offset 0x50 */
@@ -310,7 +314,9 @@ struct cm_perpll {
 	unsigned int qspiclkctrl;       /* offset 0x258 */
 	unsigned int resv121;
 	unsigned int usb0clkctrl;	/* offset 0x260 */
-	unsigned int resv13[103];
+	unsigned int resv122;
+	unsigned int usb1clkctrl;	/* offset 0x268 */
+	unsigned int resv13[101];
 	unsigned int l4lsclkstctrl;	/* offset 0x400 */
 	unsigned int resv14[7];
 	unsigned int l4lsclkctrl;	/* offset 0x420 */
@@ -364,10 +370,14 @@ struct cm_perpll {
 	unsigned int uart4clkctrl;	/* offset 0x598 */
 	unsigned int resv35;
 	unsigned int uart5clkctrl;	/* offset 0x5A0 */
-	unsigned int resv36[87];
+	unsigned int resv36[5];
+	unsigned int usbphyocp2scp0clkctrl;	/* offset 0x5B8 */
+	unsigned int resv361;
+	unsigned int usbphyocp2scp1clkctrl;	/* offset 0x5C0 */
+	unsigned int resv3611[79];
 
 	unsigned int emifclkstctrl;	/* offset 0x700 */
-	unsigned int resv361[7];
+	unsigned int resv362[7];
 	unsigned int emifclkctrl;	/* offset 0x720 */
 	unsigned int resv37[3];
 	unsigned int emiffwclkctrl;	/* offset 0x730 */
arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +4 -0
index efdecf4..5f259da 100644
@@ -72,6 +72,10 @@
 #define USBPHYOCPSCP_MODULE_EN	(1 << 1)
 #define CM_DEVICE_INST			0x44df4100
 
+#define	USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960	(1 << 8)
+#define	USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K	(1 << 8)
+
+
 /* Control status register */
 #define CTRL_CRYSTAL_FREQ_SRC_MASK		(1 << 31)
 #define CTRL_CRYSTAL_FREQ_SRC_SHIFT		31
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 2/40 ARM: AM43xx: Enable clocks for USB OTGSS and USB PHY

Hi Kishon,

Quoted 54 lines

Enabled clocks for dwc3 controller and USB PHY present in AM43xx.

---
 arch/arm/cpu/armv7/am33xx/clock_am43xx.c           |   12 +++++++++++
 arch/arm/include/asm/arch-am33xx/cpu.h             |   22

++++++++++++++------
arch/arm/include/asm/arch-am33xx/hardware_am43xx.h | 4 ++++ 3
files changed, 32 insertions(+), 6 deletions(-)

(quoted diff) +0 -0

b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c index 31188c8..252135d 100644 --- a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c +++ b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c

arch/arm/cpu/armv7/am33xx/clock_am43xx.c +12 -0
@@ -111,9 +111,21 @@ void enable_basic_clocks(void)
 		&cmper->emifclkctrl,
 		&cmper->otfaemifclkctrl,
 		&cmper->qspiclkctrl,
+		&cmper->usb0clkctrl,
+		&cmper->usbphyocp2scp0clkctrl,
+		&cmper->usb1clkctrl,
+		&cmper->usbphyocp2scp1clkctrl,
 		0
 	};
 
+	setbits_le32(&cmper->usb0clkctrl,
+		     USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960);
+	setbits_le32(&cmwkup->usbphy0clkctrl,
+		     USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K);
+	setbits_le32(&cmper->usb1clkctrl,
+		     USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960);
+	setbits_le32(&cmwkup->usbphy1clkctrl,
+		     USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K);
 	do_enable_clocks(clk_domains, clk_modules_explicit_en, 1);
 
 	/* Select the Master osc clk as Timer2 clock source */
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-am33xx/cpu.h index 8dd69b3..1caa24e 100644

arch/arm/include/asm/arch-am33xx/cpu.h +5 -1
@@ -224,7 +224,11 @@ struct cm_dpll {
 struct cm_wkuppll {
 	unsigned int resv0[136];
 	unsigned int wkl4wkclkctrl;	/* offset 0x220 */
-	unsigned int resv1[55];
+	unsigned int resv1[7];
+	unsigned int usbphy0clkctrl;	/* offset 0x240 */
+	unsigned int resv112;
+	unsigned int usbphy1clkctrl;	/* offset 0x248 */
+	unsigned int resv113[45];
 	unsigned int wkclkstctrl;	/* offset 0x300 */
 	unsigned int resv2[15];
 	unsigned int wkup_i2c0ctrl;	/* offset 0x340 */

arch/arm/include/asm/arch-am33xx/cpu.h struct cm_wkuppll { · line 282

Quoted 5 lines
arch/arm/include/asm/arch-am33xx/cpu.h +1 -1
@@ -275,7 +279,7 @@ struct cm_wkuppll {
 	unsigned int divm2dplldisp;	/* offset 0x630 */
 };
 
-/*
+/*get_sys_clk_freq

This comment doesn't comply with coding style.

It should be

	/*
	 * get_sys_clk_freq
	 * En ...

	 */
Quoted 48 lines
arch/arm/include/asm/arch-am33xx/cpu.h +10 -4
  * Encapsulating peripheral functional clocks
  * pll registers
  */
@@ -283,7 +287,7 @@ struct cm_perpll {
 	unsigned int l3clkstctrl;	/* offset 0x00 */
 	unsigned int resv0[7];
 	unsigned int l3clkctrl;		/* Offset 0x20 */
-	unsigned int resv1[7];
+	unsigned int resv112[7];
 	unsigned int l3instrclkctrl;	/* offset 0x40 */
 	unsigned int resv2[3];
 	unsigned int ocmcramclkctrl;	/* offset 0x50 */
@@ -310,7 +314,9 @@ struct cm_perpll {
 	unsigned int qspiclkctrl;       /* offset 0x258 */
 	unsigned int resv121;
 	unsigned int usb0clkctrl;	/* offset 0x260 */
-	unsigned int resv13[103];
+	unsigned int resv122;
+	unsigned int usb1clkctrl;	/* offset 0x268 */
+	unsigned int resv13[101];
 	unsigned int l4lsclkstctrl;	/* offset 0x400 */
 	unsigned int resv14[7];
 	unsigned int l4lsclkctrl;	/* offset 0x420 */
@@ -364,10 +370,14 @@ struct cm_perpll {
 	unsigned int uart4clkctrl;	/* offset 0x598 */
 	unsigned int resv35;
 	unsigned int uart5clkctrl;	/* offset 0x5A0 */
-	unsigned int resv36[87];
+	unsigned int resv36[5];
+	unsigned int usbphyocp2scp0clkctrl;	/* offset 0x5B8 */
+	unsigned int resv361;
+	unsigned int usbphyocp2scp1clkctrl;	/* offset 0x5C0 */
+	unsigned int resv3611[79];
 
 	unsigned int emifclkstctrl;	/* offset 0x700 */
-	unsigned int resv361[7];
+	unsigned int resv362[7];
 	unsigned int emifclkctrl;	/* offset 0x720 */
 	unsigned int resv37[3];
 	unsigned int emiffwclkctrl;	/* offset 0x730 */
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h index efdecf4..5f259da 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h @@ -72,6 +72,10
@@ #define USBPHYOCPSCP_MODULE_EN (1 << 1)
#define CM_DEVICE_INST 0x44df4100

arch/arm/include/asm/arch-am33xx/hardware_am43xx.h line 78

Quoted 4 lines
arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +4 -0
+#define	USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960	(1 << 8)
+#define	USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K	(1 << 8)
+
+

Two blank lines.

Quoted 3 lines

/* Control status register */
#define CTRL_CRYSTAL_FREQ_SRC_MASK (1 << 31)
#define CTRL_CRYSTAL_FREQ_SRC_SHIFT 31

If Marek agrees to correct this minor issues (before adding it to -usb tree), then

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#5 lore raw

PATCH 2/40 ARM: AM43xx: Enable clocks for USB OTGSS and USB PHY

Quoted 157 lines · Lukasz Majewski

Hi Kishon,

Quoted 67 lines

Enabled clocks for dwc3 controller and USB PHY present in AM43xx.

---

 arch/arm/cpu/armv7/am33xx/clock_am43xx.c           |   12 +++++++++++
 arch/arm/include/asm/arch-am33xx/cpu.h             |   22

++++++++++++++------
arch/arm/include/asm/arch-am33xx/hardware_am43xx.h | 4 ++++ 3
files changed, 32 insertions(+), 6 deletions(-)

(quoted diff) +0 -0

b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c index 31188c8..252135d 100644 --- a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c +++ b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c

(quoted diff) +12 -0
@@ -111,9 +111,21 @@ void enable_basic_clocks(void)
 
 		&cmper->emifclkctrl,
 		&cmper->otfaemifclkctrl,
 		&cmper->qspiclkctrl,
 
+		&cmper->usb0clkctrl,
+		&cmper->usbphyocp2scp0clkctrl,
+		&cmper->usb1clkctrl,
+		&cmper->usbphyocp2scp1clkctrl,
 
 		0
 
 	};
 
+	setbits_le32(&cmper->usb0clkctrl,
+		     USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960);
+	setbits_le32(&cmwkup->usbphy0clkctrl,
+		     USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K);
+	setbits_le32(&cmper->usb1clkctrl,
+		     USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960);
+	setbits_le32(&cmwkup->usbphy1clkctrl,
+		     USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K);
 
 	do_enable_clocks(clk_domains, clk_modules_explicit_en, 1);
 
 	/* Select the Master osc clk as Timer2 clock source */
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-am33xx/cpu.h index 8dd69b3..1caa24e 100644

arch/arm/include/asm/arch-am33xx/cpu.h +5 -1
@@ -224,7 +224,11 @@ struct cm_dpll {
 
 struct cm_wkuppll {
 
 	unsigned int resv0[136];
 	unsigned int wkl4wkclkctrl;	/* offset 0x220 */
 
-	unsigned int resv1[55];
+	unsigned int resv1[7];
+	unsigned int usbphy0clkctrl;	/* offset 0x240 */
+	unsigned int resv112;
+	unsigned int usbphy1clkctrl;	/* offset 0x248 */
+	unsigned int resv113[45];
arch/arm/include/asm/arch-am33xx/cpu.h +0 -0
 	unsigned int wkclkstctrl;	/* offset 0x300 */
 	unsigned int resv2[15];
 	unsigned int wkup_i2c0ctrl;	/* offset 0x340 */

arch/arm/include/asm/arch-am33xx/cpu.h struct cm_wkuppll { · line 284

Quoted 7 lines
arch/arm/include/asm/arch-am33xx/cpu.h +1 -1
@@ -275,7 +279,7 @@ struct cm_wkuppll {
 
 	unsigned int divm2dplldisp;	/* offset 0x630 */
 
 };
 
-/*
+/*get_sys_clk_freq

This comment doesn't comply with coding style.

It should be

	/*
	 * get_sys_clk_freq
	 * En ...

	 */
Quoted 63 lines
arch/arm/include/asm/arch-am33xx/cpu.h +0 -0
  * Encapsulating peripheral functional clocks

* pll registers
*/

arch/arm/include/asm/arch-am33xx/cpu.h +1 -1
@@ -283,7 +287,7 @@ struct cm_perpll {
 
 	unsigned int l3clkstctrl;	/* offset 0x00 */
 	unsigned int resv0[7];
 	unsigned int l3clkctrl;		/* Offset 0x20 */
 
-	unsigned int resv1[7];
+	unsigned int resv112[7];
 
arch/arm/include/asm/arch-am33xx/cpu.h +3 -1
 	unsigned int l3instrclkctrl;	/* offset 0x40 */
 	unsigned int resv2[3];
 	unsigned int ocmcramclkctrl;	/* offset 0x50 */
@@ -310,7 +314,9 @@ struct cm_perpll {
 
 	unsigned int qspiclkctrl;       /* offset 0x258 */
 	unsigned int resv121;
 	unsigned int usb0clkctrl;	/* offset 0x260 */
 
-	unsigned int resv13[103];
+	unsigned int resv122;
+	unsigned int usb1clkctrl;	/* offset 0x268 */
+	unsigned int resv13[101];
 
arch/arm/include/asm/arch-am33xx/cpu.h +6 -2
 	unsigned int l4lsclkstctrl;	/* offset 0x400 */
 	unsigned int resv14[7];
 	unsigned int l4lsclkctrl;	/* offset 0x420 */
@@ -364,10 +370,14 @@ struct cm_perpll {
 
 	unsigned int uart4clkctrl;	/* offset 0x598 */
 	unsigned int resv35;
 	unsigned int uart5clkctrl;	/* offset 0x5A0 */
 
-	unsigned int resv36[87];
+	unsigned int resv36[5];
+	unsigned int usbphyocp2scp0clkctrl;	/* offset 0x5B8 */
+	unsigned int resv361;
+	unsigned int usbphyocp2scp1clkctrl;	/* offset 0x5C0 */
+	unsigned int resv3611[79];
 
 	unsigned int emifclkstctrl;	/* offset 0x700 */
 
-	unsigned int resv361[7];
+	unsigned int resv362[7];
arch/arm/include/asm/arch-am33xx/cpu.h +0 -0
 	unsigned int emifclkctrl;	/* offset 0x720 */
 	unsigned int resv37[3];
 	unsigned int emiffwclkctrl;	/* offset 0x730 */
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h index efdecf4..5f259da 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h @@ -72,6 +72,10
@@ #define USBPHYOCPSCP_MODULE_EN (1 << 1)

#define CM_DEVICE_INST 0x44df4100

arch/arm/include/asm/arch-am33xx/hardware_am43xx.h line 78

Quoted 4 lines
arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +4 -0
+#define	USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960	(1 << 8)
+#define	USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K	(1 << 8)
+
+

Two blank lines.

Quoted 6 lines
Quoted 3 lines

/* Control status register */
#define CTRL_CRYSTAL_FREQ_SRC_MASK (1 << 31)
#define CTRL_CRYSTAL_FREQ_SRC_SHIFT 31

If Marek agrees to correct this minor issues (before adding it to -usb tree), then

OK, minor issues are pilinng up, so maybe a V2 of the series would be better.

#6 lore raw

PATCH 2/40 ARM: AM43xx: Enable clocks for USB OTGSS and USB PHY

Hi,

Quoted 158 lines · Marek Vasut
Quoted 157 lines · Lukasz Majewski

Hi Kishon,

Quoted 67 lines

Enabled clocks for dwc3 controller and USB PHY present in AM43xx.

---

  arch/arm/cpu/armv7/am33xx/clock_am43xx.c           |   12 +++++++++++
  arch/arm/include/asm/arch-am33xx/cpu.h             |   22

++++++++++++++------
arch/arm/include/asm/arch-am33xx/hardware_am43xx.h | 4 ++++ 3
files changed, 32 insertions(+), 6 deletions(-)

(quoted diff) +0 -0

b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c index 31188c8..252135d 100644 --- a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c +++ b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c

(quoted diff) +12 -0
@@ -111,9 +111,21 @@ void enable_basic_clocks(void)
 
  		&cmper->emifclkctrl,
  		&cmper->otfaemifclkctrl,
  		&cmper->qspiclkctrl,
 
+		&cmper->usb0clkctrl,
+		&cmper->usbphyocp2scp0clkctrl,
+		&cmper->usb1clkctrl,
+		&cmper->usbphyocp2scp1clkctrl,
 
  		0
 
  	};
 
+	setbits_le32(&cmper->usb0clkctrl,
+		     USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960);
+	setbits_le32(&cmwkup->usbphy0clkctrl,
+		     USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K);
+	setbits_le32(&cmper->usb1clkctrl,
+		     USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960);
+	setbits_le32(&cmwkup->usbphy1clkctrl,
+		     USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K);
 
  	do_enable_clocks(clk_domains, clk_modules_explicit_en, 1);
 
  	/* Select the Master osc clk as Timer2 clock source */
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-am33xx/cpu.h index 8dd69b3..1caa24e 100644

arch/arm/include/asm/arch-am33xx/cpu.h +5 -1
@@ -224,7 +224,11 @@ struct cm_dpll {
 
  struct cm_wkuppll {
 
  	unsigned int resv0[136];
  	unsigned int wkl4wkclkctrl;	/* offset 0x220 */
 
-	unsigned int resv1[55];
+	unsigned int resv1[7];
+	unsigned int usbphy0clkctrl;	/* offset 0x240 */
+	unsigned int resv112;
+	unsigned int usbphy1clkctrl;	/* offset 0x248 */
+	unsigned int resv113[45];
  	unsigned int wkclkstctrl;	/* offset 0x300 */
  	unsigned int resv2[15];
  	unsigned int wkup_i2c0ctrl;	/* offset 0x340 */

arch/arm/include/asm/arch-am33xx/cpu.h struct cm_wkuppll { · line 284

Quoted 7 lines
arch/arm/include/asm/arch-am33xx/cpu.h +1 -1
@@ -275,7 +279,7 @@ struct cm_wkuppll {
 
  	unsigned int divm2dplldisp;	/* offset 0x630 */
 
  };
 
-/*
+/*get_sys_clk_freq

This comment doesn't comply with coding style.

It should be

	/*
	 * get_sys_clk_freq
	 * En ...

	 */
Quoted 63 lines
arch/arm/include/asm/arch-am33xx/cpu.h +0 -0
   * Encapsulating peripheral functional clocks

* pll registers
*/

arch/arm/include/asm/arch-am33xx/cpu.h +1 -1
@@ -283,7 +287,7 @@ struct cm_perpll {
 
  	unsigned int l3clkstctrl;	/* offset 0x00 */
  	unsigned int resv0[7];
  	unsigned int l3clkctrl;		/* Offset 0x20 */
 
-	unsigned int resv1[7];
+	unsigned int resv112[7];
 
  	unsigned int l3instrclkctrl;	/* offset 0x40 */
  	unsigned int resv2[3];
  	unsigned int ocmcramclkctrl;	/* offset 0x50 */
arch/arm/include/asm/arch-am33xx/cpu.h +3 -1
@@ -310,7 +314,9 @@ struct cm_perpll {
 
  	unsigned int qspiclkctrl;       /* offset 0x258 */
  	unsigned int resv121;
  	unsigned int usb0clkctrl;	/* offset 0x260 */
 
-	unsigned int resv13[103];
+	unsigned int resv122;
+	unsigned int usb1clkctrl;	/* offset 0x268 */
+	unsigned int resv13[101];
 
  	unsigned int l4lsclkstctrl;	/* offset 0x400 */
  	unsigned int resv14[7];
  	unsigned int l4lsclkctrl;	/* offset 0x420 */
arch/arm/include/asm/arch-am33xx/cpu.h +6 -2
@@ -364,10 +370,14 @@ struct cm_perpll {
 
  	unsigned int uart4clkctrl;	/* offset 0x598 */
  	unsigned int resv35;
  	unsigned int uart5clkctrl;	/* offset 0x5A0 */
 
-	unsigned int resv36[87];
+	unsigned int resv36[5];
+	unsigned int usbphyocp2scp0clkctrl;	/* offset 0x5B8 */
+	unsigned int resv361;
+	unsigned int usbphyocp2scp1clkctrl;	/* offset 0x5C0 */
+	unsigned int resv3611[79];
 
  	unsigned int emifclkstctrl;	/* offset 0x700 */
 
-	unsigned int resv361[7];
+	unsigned int resv362[7];
  	unsigned int emifclkctrl;	/* offset 0x720 */
  	unsigned int resv37[3];
  	unsigned int emiffwclkctrl;	/* offset 0x730 */
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h index efdecf4..5f259da 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h @@ -72,6 +72,10
@@ #define USBPHYOCPSCP_MODULE_EN (1 << 1)

  #define CM_DEVICE_INST			0x44df4100

arch/arm/include/asm/arch-am33xx/cpu.h

Quoted 4 lines
arch/arm/include/asm/arch-am33xx/cpu.h +4 -0
+#define	USBOTGSSX_CLKCTRL_OPTFCLKEN_REFCLK960	(1 << 8)
+#define	USBPHY0_CLKCTRL_OPTFCLKEN_CLK32K	(1 << 8)
+
+

Two blank lines.

Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
  /* Control status register */
  #define CTRL_CRYSTAL_FREQ_SRC_MASK		(1 << 31)
  #define CTRL_CRYSTAL_FREQ_SRC_SHIFT		31

If Marek agrees to correct this minor issues (before adding it to -usb tree), then

OK, minor issues are pilinng up, so maybe a V2 of the series would be better.

sure, I'll fix the comments and send v2.

Cheers
Kishon

#7 lore raw

PATCH 2/40 ARM: AM43xx: Enable clocks for USB OTGSS and USB PHY

Quoted 5 lines · Kishon Vijay Abraham I

Hi,

Quoted 2 lines · Marek Vasut
Quoted 1 line · Lukasz Majewski

Hi Kishon,

[...]

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

Two blank lines.

Quoted 3 lines
  /* Control status register */
  #define CTRL_CRYSTAL_FREQ_SRC_MASK		(1 << 31)
  #define CTRL_CRYSTAL_FREQ_SRC_SHIFT		31
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

If Marek agrees to correct this minor issues (before adding it to -usb tree), then

OK, minor issues are pilinng up, so maybe a V2 of the series would be better.

sure, I'll fix the comments and send v2.

Cool, thank you :) Please CC Lukasz and once he says it's OK, I will pick this.

Best regards,
Marek Vasut

#8 lore raw

PATCH 3/40 usb: gadget: udc: add udc-core from linux kernel to u-boot

In reply to Kishon Vijay Abraham I

Added udc-core.c from linux kernel 3.19-rc1 (97bf6af1f9) to u-boot. This will be adapted to work with u-boot in the
following patches.
Adding support for udc will help to seamlessly port dwc3 driver from linux kernel to u-boot (since dwc3 uses udc-core) and it'll also help to add support for multiple gadget controllers to be functional at the same time.
All other gadget drivers can also be adapted to use udc-core.

---
 drivers/usb/gadget/udc/Makefile   |    4 +
 drivers/usb/gadget/udc/udc-core.c |  637 +++++++++++++++++++++++++++++++++++++
 2 files changed, 641 insertions(+)
 create mode 100644 drivers/usb/gadget/udc/Makefile
 create mode 100644 drivers/usb/gadget/udc/udc-core.c
drivers/usb/gadget/udc/Makefile new file +4 -0
new file mode 100644
index 0000000..be265aa
@@ -0,0 +1,4 @@
+#
+# USB peripheral controller drivers
+#
+obj-$(CONFIG_USB_GADGET)	+= udc-core.o
drivers/usb/gadget/udc/udc-core.c new file +637 -0

637 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#9 lore raw

PATCH 3/40 usb: gadget: udc: add udc-core from linux kernel to u-boot

Quoted 10 lines · Kishon Vijay Abraham I

Added udc-core.c from linux kernel 3.19-rc1 (97bf6af1f9) to u-boot. This will be adapted to work with u-boot in the
following patches.
Adding support for udc will help to seamlessly port dwc3 driver from linux kernel to u-boot (since dwc3 uses udc-core) and it'll also help to add support for multiple gadget controllers to be functional at the same time.
All other gadget drivers can also be adapted to use udc-core.

Lukasz, do you have any comments on this ? I'd like to pick this whole thing via u-boot-usb for this MW if possible.

Best regards,
Marek Vasut

#10 lore raw

PATCH 3/40 usb: gadget: udc: add udc-core from linux kernel to u-boot

Hi Marek,

Quoted 11 lines
Quoted 9 lines · Kishon Vijay Abraham I

Added udc-core.c from linux kernel 3.19-rc1 (97bf6af1f9) to u-boot. This will be adapted to work with u-boot in the
following patches.
Adding support for udc will help to seamlessly port dwc3 driver from linux kernel to u-boot (since dwc3 uses udc-core) and it'll also help to add support for multiple gadget controllers to be functional at the same time.
All other gadget drivers can also be adapted to use udc-core.

Quoted 4 lines
Quoted 1 line

Lukasz, do you have any comments on this ? I'd like to pick this whole thing via u-boot-usb for this MW if possible.

I wasn't in the office for the last week. I will review this code ASAP.

Quoted 3 lines

Best regards,
Marek Vasut

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#11 lore raw

PATCH 3/40 usb: gadget: udc: add udc-core from linux kernel to u-boot

Quoted 14 lines · Lukasz Majewski

Hi Marek,

Quoted 12 lines

On Friday, February 06, 2015 at 09:47:40 AM, Kishon Vijay Abraham I

Quoted 9 lines · wrote:

Added udc-core.c from linux kernel 3.19-rc1 (97bf6af1f9) to u-boot. This will be adapted to work with u-boot in the
following patches.
Adding support for udc will help to seamlessly port dwc3 driver from linux kernel to u-boot (since dwc3 uses udc-core) and it'll also help to add support for multiple gadget controllers to be functional at the same time.
All other gadget drivers can also be adapted to use udc-core.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Lukasz, do you have any comments on this ? I'd like to pick this whole thing via u-boot-usb for this MW if possible.

I wasn't in the office for the last week. I will review this code ASAP.

No worries, thanks :)

Best regards,
Marek Vasut

#12 lore raw

PATCH 3/40 usb: gadget: udc: add udc-core from linux kernel to u-boot

In reply to Kishon Vijay Abraham I

Hi Kishon,

Quoted 695 lines

Added udc-core.c from linux kernel 3.19-rc1 (97bf6af1f9) to u-boot. This will be adapted to work with u-boot in the
following patches.
Adding support for udc will help to seamlessly port dwc3 driver from linux kernel to u-boot (since dwc3 uses udc-core) and it'll also help to add support for multiple gadget controllers to be functional at the same time.
All other gadget drivers can also be adapted to use udc-core.

---
 drivers/usb/gadget/udc/Makefile   |    4 +
 drivers/usb/gadget/udc/udc-core.c |  637
+++++++++++++++++++++++++++++++++++++ 2 files changed, 641
insertions(+) create mode 100644 drivers/usb/gadget/udc/Makefile
 create mode 100644 drivers/usb/gadget/udc/udc-core.c
(quoted diff) +0 -0

b/drivers/usb/gadget/udc/Makefile new file mode 100644 index 0000000..be265aa

drivers/usb/gadget/udc/Makefile new file +4 -0
@@ -0,0 +1,4 @@
+#
+# USB peripheral controller drivers
+#
+obj-$(CONFIG_USB_GADGET)	+= udc-core.o
(quoted diff) +0 -0

b/drivers/usb/gadget/udc/udc-core.c new file mode 100644 index 0000000..e31d574

drivers/usb/gadget/udc/udc-core.c new file +7 -0
@@ -0,0 +1,637 @@
+/**
+ * udc.c - Core UDC Framework
+ *
+ * Copyright (C) 2010 Texas Instruments
+ * Author: Felipe Balbi <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or

modify
+ * it under the terms of the GNU General Public License version 2 of
+ * the License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
<http://www.gnu.org/licenses/>.
+ */

drivers/usb/gadget/udc/udc-core.c new file +21 -0
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/err.h>
+#include <linux/dma-mapping.h>
+#include <linux/workqueue.h>
+
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb.h>
+
+/**
+ * struct usb_udc - describes one usb device controller
+ * @driver - the gadget driver pointer. For use by the class code
+ * @dev - the child device to the actual controller
+ * @gadget - the gadget. For use by the class code
+ * @list - for use by the udc class driver
+ *
+ * This represents the internal data structure which is used by the

UDC-class
+ * to hold information about udc driver and gadget together.
+ */

drivers/usb/gadget/udc/udc-core.c new file +12 -1
+struct usb_udc {
+	struct usb_gadget_driver	*driver;
+	struct usb_gadget		*gadget;
+	struct device			dev;
+	struct list_head		list;
+};
+
+static struct class *udc_class;
+static LIST_HEAD(udc_list);
+static DEFINE_MUTEX(udc_lock);
+
+/*
-------------------------------------------------------------------------

*/ + +#ifdef CONFIG_HAS_DMA

drivers/usb/gadget/udc/udc-core.c new file +11 -0
+
+int usb_gadget_map_request(struct usb_gadget *gadget,
+		struct usb_request *req, int is_in)
+{
+	if (req->length == 0)
+		return 0;
+
+	if (req->num_sgs) {
+		int     mapped;
+
+		mapped = dma_map_sg(&gadget->dev, req->sg,

req->num_sgs,

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+				is_in ? DMA_TO_DEVICE :

DMA_FROM_DEVICE);

drivers/usb/gadget/udc/udc-core.c new file +8 -0
+		if (mapped == 0) {
+			dev_err(&gadget->dev, "failed to map SGs\n");
+			return -EFAULT;
+		}
+
+		req->num_mapped_sgs = mapped;
+	} else {
+		req->dma = dma_map_single(&gadget->dev, req->buf,

req->length,

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+				is_in ? DMA_TO_DEVICE :

DMA_FROM_DEVICE); +

drivers/usb/gadget/udc/udc-core.c new file +2 -0
+		if (dma_mapping_error(&gadget->dev, req->dma)) {
+			dev_err(&gadget->dev, "failed to map

buffer\n");

drivers/usb/gadget/udc/udc-core.c new file +16 -0
+			return -EFAULT;
+		}
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(usb_gadget_map_request);
+
+void usb_gadget_unmap_request(struct usb_gadget *gadget,
+		struct usb_request *req, int is_in)
+{
+	if (req->length == 0)
+		return;
+
+	if (req->num_mapped_sgs) {
+		dma_unmap_sg(&gadget->dev, req->sg,

req->num_mapped_sgs,

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+				is_in ? DMA_TO_DEVICE :

DMA_FROM_DEVICE); +

drivers/usb/gadget/udc/udc-core.c new file +4 -0
+		req->num_mapped_sgs = 0;
+	} else {
+		dma_unmap_single(&gadget->dev, req->dma, req->length,
+				is_in ? DMA_TO_DEVICE :

DMA_FROM_DEVICE);

drivers/usb/gadget/udc/udc-core.c new file +7 -1
+	}
+}
+EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
+
+#endif	/* CONFIG_HAS_DMA */
+
+/*
-------------------------------------------------------------------------

*/ + +/**
+ * usb_gadget_giveback_request - give the request back to the gadget layer
+ * Context: in_interrupt()
+ *
+ * This is called by device controller drivers in order to return the
+ * completed request back to the gadget layer.
+ */

drivers/usb/gadget/udc/udc-core.c new file +11 -1
+void usb_gadget_giveback_request(struct usb_ep *ep,
+		struct usb_request *req)
+{
+	if (likely(req->status == 0))
+		usb_led_activity(USB_LED_EVENT_GADGET);
+
+	req->complete(ep, req);
+}
+EXPORT_SYMBOL_GPL(usb_gadget_giveback_request);
+
+/*
-------------------------------------------------------------------------

*/ + +static void usb_gadget_state_work(struct work_struct *work)

drivers/usb/gadget/udc/udc-core.c new file +27 -1
+{
+	struct usb_gadget	*gadget = work_to_gadget(work);
+	struct usb_udc		*udc = NULL;
+
+	mutex_lock(&udc_lock);
+	list_for_each_entry(udc, &udc_list, list)
+		if (udc->gadget == gadget)
+			goto found;
+	mutex_unlock(&udc_lock);
+
+	return;
+
+found:
+	mutex_unlock(&udc_lock);
+
+	sysfs_notify(&udc->dev.kobj, NULL, "state");
+}
+
+void usb_gadget_set_state(struct usb_gadget *gadget,
+		enum usb_device_state state)
+{
+	gadget->state = state;
+	schedule_work(&gadget->work);
+}
+EXPORT_SYMBOL_GPL(usb_gadget_set_state);
+
+/*
-------------------------------------------------------------------------

*/ + +/**
+ * usb_gadget_udc_reset - notifies the udc core that bus reset occurs
+ * @gadget: The gadget which bus reset occurs
+ * @driver: The gadget driver we want to notify
+ *
+ * If the udc driver has bus reset handler, it needs to call this when the bus
+ * reset occurs, it notifies the gadget driver that the bus reset occurs as
+ * well as updates gadget state.
+ */

drivers/usb/gadget/udc/udc-core.c new file +28 -0
+void usb_gadget_udc_reset(struct usb_gadget *gadget,
+		struct usb_gadget_driver *driver)
+{
+	driver->reset(gadget);
+	usb_gadget_set_state(gadget, USB_STATE_DEFAULT);
+}
+EXPORT_SYMBOL_GPL(usb_gadget_udc_reset);
+
+/**
+ * usb_gadget_udc_start - tells usb device controller to start up
+ * @udc: The UDC to be started
+ *
+ * This call is issued by the UDC Class driver when it's about
+ * to register a gadget driver to the device controller, before
+ * calling gadget driver's bind() method.
+ *
+ * It allows the controller to be powered off until strictly
+ * necessary to have it powered on.
+ *
+ * Returns zero on success, else negative errno.
+ */
+static inline int usb_gadget_udc_start(struct usb_udc *udc)
+{
+	return udc->gadget->ops->udc_start(udc->gadget, udc->driver);
+}
+
+/**
+ * usb_gadget_udc_stop - tells usb device controller we don't need

it anymore
+ * @gadget: The device we want to stop activity
+ * @driver: The driver to unbind from @gadget
+ *
+ * This call is issued by the UDC Class driver after calling
+ * gadget driver's unbind() method.
+ *
+ * The details are implementation specific, but it can go as
+ * far as powering off UDC completely and disable its data
+ * line pullups.
+ */

drivers/usb/gadget/udc/udc-core.c new file +10 -0
+static inline void usb_gadget_udc_stop(struct usb_udc *udc)
+{
+	udc->gadget->ops->udc_stop(udc->gadget);
+}
+
+/**
+ * usb_udc_release - release the usb_udc struct
+ * @dev: the dev member within usb_udc
+ *
+ * This is called by driver's core in order to free memory once the

last
+ * reference is released.
+ */

drivers/usb/gadget/udc/udc-core.c new file +18 -0
+static void usb_udc_release(struct device *dev)
+{
+	struct usb_udc *udc;
+
+	udc = container_of(dev, struct usb_udc, dev);
+	dev_dbg(dev, "releasing '%s'\n", dev_name(dev));
+	kfree(udc);
+}
+
+static const struct attribute_group *usb_udc_attr_groups[];
+
+static void usb_udc_nop_release(struct device *dev)
+{
+	dev_vdbg(dev, "%s\n", __func__);
+}
+
+/**
+ * usb_add_gadget_udc_release - adds a new gadget to the udc class

driver list
+ * @parent: the parent device to this udc. Usually the controller driver's
+ * device.
+ * @gadget: the gadget to be added to the list.
+ * @release: a gadget release function.
+ *
+ * Returns zero on success, negative errno otherwise.
+ */
+int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,

drivers/usb/gadget/udc/udc-core.c new file +15 -0
+		void (*release)(struct device *dev))
+{
+	struct usb_udc		*udc;
+	int			ret = -ENOMEM;
+
+	udc = kzalloc(sizeof(*udc), GFP_KERNEL);
+	if (!udc)
+		goto err1;
+
+	dev_set_name(&gadget->dev, "gadget");
+	INIT_WORK(&gadget->work, usb_gadget_state_work);
+	gadget->dev.parent = parent;
+
+#ifdef	CONFIG_HAS_DMA
+	dma_set_coherent_mask(&gadget->dev,

parent->coherent_dma_mask);

drivers/usb/gadget/udc/udc-core.c new file +19 -0
+	gadget->dev.dma_parms = parent->dma_parms;
+	gadget->dev.dma_mask = parent->dma_mask;
+#endif
+
+	if (release)
+		gadget->dev.release = release;
+	else
+		gadget->dev.release = usb_udc_nop_release;
+
+	ret = device_register(&gadget->dev);
+	if (ret)
+		goto err2;
+
+	device_initialize(&udc->dev);
+	udc->dev.release = usb_udc_release;
+	udc->dev.class = udc_class;
+	udc->dev.groups = usb_udc_attr_groups;
+	udc->dev.parent = parent;
+	ret = dev_set_name(&udc->dev, "%s",

kobject_name(&parent->kobj));

drivers/usb/gadget/udc/udc-core.c new file +36 -0
+	if (ret)
+		goto err3;
+
+	udc->gadget = gadget;
+
+	mutex_lock(&udc_lock);
+	list_add_tail(&udc->list, &udc_list);
+
+	ret = device_add(&udc->dev);
+	if (ret)
+		goto err4;
+
+	usb_gadget_set_state(gadget, USB_STATE_NOTATTACHED);
+
+	mutex_unlock(&udc_lock);
+
+	return 0;
+
+err4:
+	list_del(&udc->list);
+	mutex_unlock(&udc_lock);
+
+err3:
+	put_device(&udc->dev);
+
+err2:
+	put_device(&gadget->dev);
+	kfree(udc);
+
+err1:
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_add_gadget_udc_release);
+
+/**
+ * usb_add_gadget_udc - adds a new gadget to the udc class driver

list
+ * @parent: the parent device to this udc. Usually the controller
+ * driver's device.
+ * @gadget: the gadget to be added to the list
+ *
+ * Returns zero on success, negative errno otherwise.
+ */
+int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget) +{

drivers/usb/gadget/udc/udc-core.c new file +59 -1
+	return usb_add_gadget_udc_release(parent, gadget, NULL);
+}
+EXPORT_SYMBOL_GPL(usb_add_gadget_udc);
+
+static void usb_gadget_remove_driver(struct usb_udc *udc)
+{
+	dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n",
+			udc->driver->function);
+
+	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
+
+	usb_gadget_disconnect(udc->gadget);
+	udc->driver->disconnect(udc->gadget);
+	udc->driver->unbind(udc->gadget);
+	usb_gadget_udc_stop(udc);
+
+	udc->driver = NULL;
+	udc->dev.driver = NULL;
+	udc->gadget->dev.driver = NULL;
+}
+
+/**
+ * usb_del_gadget_udc - deletes @udc from udc_list
+ * @gadget: the gadget to be removed.
+ *
+ * This, will call usb_gadget_unregister_driver() if
+ * the @udc is still busy.
+ */
+void usb_del_gadget_udc(struct usb_gadget *gadget)
+{
+	struct usb_udc		*udc = NULL;
+
+	mutex_lock(&udc_lock);
+	list_for_each_entry(udc, &udc_list, list)
+		if (udc->gadget == gadget)
+			goto found;
+
+	dev_err(gadget->dev.parent, "gadget not registered.\n");
+	mutex_unlock(&udc_lock);
+
+	return;
+
+found:
+	dev_vdbg(gadget->dev.parent, "unregistering gadget\n");
+
+	list_del(&udc->list);
+	mutex_unlock(&udc_lock);
+
+	if (udc->driver)
+		usb_gadget_remove_driver(udc);
+
+	kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE);
+	flush_work(&gadget->work);
+	device_unregister(&udc->dev);
+	device_unregister(&gadget->dev);
+}
+EXPORT_SYMBOL_GPL(usb_del_gadget_udc);
+
+/*
-------------------------------------------------------------------------

*/ + +static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *driver) +{

drivers/usb/gadget/udc/udc-core.c new file +32 -0
+	int ret;
+
+	dev_dbg(&udc->dev, "registering UDC driver [%s]\n",
+			driver->function);
+
+	udc->driver = driver;
+	udc->dev.driver = &driver->driver;
+	udc->gadget->dev.driver = &driver->driver;
+
+	ret = driver->bind(udc->gadget, driver);
+	if (ret)
+		goto err1;
+	ret = usb_gadget_udc_start(udc);
+	if (ret) {
+		driver->unbind(udc->gadget);
+		goto err1;
+	}
+	usb_gadget_connect(udc->gadget);
+
+	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
+	return 0;
+err1:
+	if (ret != -EISNAM)
+		dev_err(&udc->dev, "failed to start %s: %d\n",
+			udc->driver->function, ret);
+	udc->driver = NULL;
+	udc->dev.driver = NULL;
+	udc->gadget->dev.driver = NULL;
+	return ret;
+}
+
+int usb_udc_attach_driver(const char *name, struct usb_gadget_driver

*driver) +{

drivers/usb/gadget/udc/udc-core.c new file +73 -1
+	struct usb_udc *udc = NULL;
+	int ret = -ENODEV;
+
+	mutex_lock(&udc_lock);
+	list_for_each_entry(udc, &udc_list, list) {
+		ret = strcmp(name, dev_name(&udc->dev));
+		if (!ret)
+			break;
+	}
+	if (ret) {
+		ret = -ENODEV;
+		goto out;
+	}
+	if (udc->driver) {
+		ret = -EBUSY;
+		goto out;
+	}
+	ret = udc_bind_to_driver(udc, driver);
+out:
+	mutex_unlock(&udc_lock);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_udc_attach_driver);
+
+int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
+{
+	struct usb_udc		*udc = NULL;
+	int			ret;
+
+	if (!driver || !driver->bind || !driver->setup)
+		return -EINVAL;
+
+	mutex_lock(&udc_lock);
+	list_for_each_entry(udc, &udc_list, list) {
+		/* For now we take the first one */
+		if (!udc->driver)
+			goto found;
+	}
+
+	pr_debug("couldn't find an available UDC\n");
+	mutex_unlock(&udc_lock);
+	return -ENODEV;
+found:
+	ret = udc_bind_to_driver(udc, driver);
+	mutex_unlock(&udc_lock);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_gadget_probe_driver);
+
+int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
+{
+	struct usb_udc		*udc = NULL;
+	int			ret = -ENODEV;
+
+	if (!driver || !driver->unbind)
+		return -EINVAL;
+
+	mutex_lock(&udc_lock);
+	list_for_each_entry(udc, &udc_list, list)
+		if (udc->driver == driver) {
+			usb_gadget_remove_driver(udc);
+			usb_gadget_set_state(udc->gadget,
+					USB_STATE_NOTATTACHED);
+			ret = 0;
+			break;
+		}
+
+	mutex_unlock(&udc_lock);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_gadget_unregister_driver);
+
+/*
-------------------------------------------------------------------------

*/ + +static ssize_t usb_udc_srp_store(struct device *dev,

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+		struct device_attribute *attr, const char *buf,

size_t n) +{

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev); +

drivers/usb/gadget/udc/udc-core.c new file +9 -0
+	if (sysfs_streq(buf, "1"))
+		usb_gadget_wakeup(udc->gadget);
+
+	return n;
+}
+static DEVICE_ATTR(srp, S_IWUSR, NULL, usb_udc_srp_store);
+
+static ssize_t usb_udc_softconn_store(struct device *dev,
+		struct device_attribute *attr, const char *buf,

size_t n) +{

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev); +

drivers/usb/gadget/udc/udc-core.c new file +2 -0
+	if (!udc->driver) {
+		dev_err(dev, "soft-connect without a gadget

driver\n");

drivers/usb/gadget/udc/udc-core.c new file +18 -0
+		return -EOPNOTSUPP;
+	}
+
+	if (sysfs_streq(buf, "connect")) {
+		usb_gadget_udc_start(udc);
+		usb_gadget_connect(udc->gadget);
+	} else if (sysfs_streq(buf, "disconnect")) {
+		usb_gadget_disconnect(udc->gadget);
+		udc->driver->disconnect(udc->gadget);
+		usb_gadget_udc_stop(udc);
+	} else {
+		dev_err(dev, "unsupported command '%s'\n", buf);
+		return -EINVAL;
+	}
+
+	return n;
+}
+static DEVICE_ATTR(soft_connect, S_IWUSR, NULL,

usb_udc_softconn_store); +
+static ssize_t state_show(struct device *dev, struct device_attribute *attr,

drivers/usb/gadget/udc/udc-core.c new file +3 -0
+			  char *buf)
+{
+	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev);

drivers/usb/gadget/udc/udc-core.c new file +7 -0
+	struct usb_gadget	*gadget = udc->gadget;
+
+	return sprintf(buf, "%s\n", usb_state_string(gadget->state));
+}
+static DEVICE_ATTR_RO(state);
+
+#define USB_UDC_SPEED_ATTR(name,

param) \ +ssize_t
name##_show(struct device
*dev, \

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+		struct device_attribute *attr, char

*buf) \
+{
\

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+	struct usb_udc *udc = container_of(dev, struct usb_udc,

dev); \

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+	return snprintf(buf, PAGE_SIZE,

"%s\n", \
+
usb_speed_string(udc->gadget->param)); \
+}
\ +static DEVICE_ATTR_RO(name) +

drivers/usb/gadget/udc/udc-core.c new file +5 -0
+static USB_UDC_SPEED_ATTR(current_speed, speed);
+static USB_UDC_SPEED_ATTR(maximum_speed, max_speed);
+
+#define USB_UDC_ATTR(name)					\
+ssize_t name##_show(struct device

*dev, \

drivers/usb/gadget/udc/udc-core.c new file +3 -0
+		struct device_attribute *attr, char *buf)	\
+{								\
+	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev); \

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+	struct usb_gadget	*gadget =

udc->gadget; \

drivers/usb/gadget/udc/udc-core.c new file +2 -0
+								\
+	return snprintf(buf, PAGE_SIZE, "%d\n",

gadget->name); \

drivers/usb/gadget/udc/udc-core.c new file +33 -0
+}								\
+static DEVICE_ATTR_RO(name) +
+static USB_UDC_ATTR(is_otg);
+static USB_UDC_ATTR(is_a_peripheral);
+static USB_UDC_ATTR(b_hnp_enable);
+static USB_UDC_ATTR(a_hnp_support);
+static USB_UDC_ATTR(a_alt_hnp_support);
+
+static struct attribute *usb_udc_attrs[] = {
+	&dev_attr_srp.attr,
+	&dev_attr_soft_connect.attr,
+	&dev_attr_state.attr,
+	&dev_attr_current_speed.attr,
+	&dev_attr_maximum_speed.attr,
+
+	&dev_attr_is_otg.attr,
+	&dev_attr_is_a_peripheral.attr,
+	&dev_attr_b_hnp_enable.attr,
+	&dev_attr_a_hnp_support.attr,
+	&dev_attr_a_alt_hnp_support.attr,
+	NULL,
+};
+
+static const struct attribute_group usb_udc_attr_group = {
+	.attrs = usb_udc_attrs,
+};
+
+static const struct attribute_group *usb_udc_attr_groups[] = {
+	&usb_udc_attr_group,
+	NULL,
+};
+
+static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env

*env) +{

drivers/usb/gadget/udc/udc-core.c new file +1 -0
+	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev);

drivers/usb/gadget/udc/udc-core.c new file +3 -0
+	int			ret;
+
+	ret = add_uevent_var(env, "USB_UDC_NAME=%s",

udc->gadget->name);

drivers/usb/gadget/udc/udc-core.c new file +10 -0
+	if (ret) {
+		dev_err(dev, "failed to add uevent USB_UDC_NAME\n");
+		return ret;
+	}
+
+	if (udc->driver) {
+		ret = add_uevent_var(env, "USB_UDC_DRIVER=%s",
+				udc->driver->function);
+		if (ret) {
+			dev_err(dev, "failed to add uevent

USB_UDC_DRIVER\n");

drivers/usb/gadget/udc/udc-core.c new file +20 -0
+			return ret;
+		}
+	}
+
+	return 0;
+}
+
+static int __init usb_udc_init(void)
+{
+	udc_class = class_create(THIS_MODULE, "udc");
+	if (IS_ERR(udc_class)) {
+		pr_err("failed to create udc class --> %ld\n",
+				PTR_ERR(udc_class));
+		return PTR_ERR(udc_class);
+	}
+
+	udc_class->dev_uevent = usb_udc_uevent;
+	return 0;
+}
+subsys_initcall(usb_udc_init);

drivers/usb/gadget/udc/udc-core.c line 637

Quoted 10 lines
drivers/usb/gadget/udc/udc-core.c new file +10 -0
+
+static void __exit usb_udc_exit(void)
+{
+	class_destroy(udc_class);
+}
+module_exit(usb_udc_exit);
+
+MODULE_DESCRIPTION("UDC Framework");
+MODULE_AUTHOR("Felipe Balbi <[email protected]>");
+MODULE_LICENSE("GPL v2");

Since this code was taken from a linux kernel I don't have any comments :-)

However, I will thest this series to asses if it works with Odroid-XU3, since it also uses DWC3.

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#13 lore raw

PATCH 4/40 include: usb: modify gadget.h to include udc support

In reply to Kishon Vijay Abraham I

Made changes in gadget.h that is required after adding udc-core.c except changes that might break other platforms.

---
 include/linux/usb/gadget.h |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
include/linux/usb/gadget.h +43 -0
index 9bccd45..1960958 100644
@@ -396,6 +396,7 @@ static inline void usb_ep_fifo_flush(struct usb_ep *ep)
 /*-------------------------------------------------------------------------*/
 
 struct usb_gadget;
+struct usb_gadget_driver;
 
 /* the rest of the api to the controller hardware: device operations,
  * which don't involve endpoints (or i/o).
@@ -409,6 +410,9 @@ struct usb_gadget_ops {
 	int	(*pullup) (struct usb_gadget *, int is_on);
 	int	(*ioctl)(struct usb_gadget *,
 				unsigned code, unsigned long param);
+	int	(*udc_start)(struct usb_gadget *,
+			     struct usb_gadget_driver *);
+	int	(*udc_stop)(struct usb_gadget *);
 };
 
 /**
@@ -459,6 +463,7 @@ struct usb_gadget {
 	struct usb_ep			*ep0;
 	struct list_head		ep_list;	/* of usb_ep */
 	enum usb_device_speed		speed;
+	enum usb_device_state		state;
 	unsigned			is_dualspeed:1;
 	unsigned			is_otg:1;
 	unsigned			is_a_peripheral:1;
@@ -686,6 +691,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
 
 /**
  * struct usb_gadget_driver - driver for usb 'slave' devices
+ * @function: String describing the gadget's function
  * @speed: Highest speed the driver handles.
  * @bind: Invoked when the driver is bound to a gadget, usually
  *	after registering the driver.
@@ -707,6 +713,8 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
  *	Called in a context that permits sleeping.
  * @suspend: Invoked on USB suspend.  May be called in_interrupt.
  * @resume: Invoked on USB resume.  May be called in_interrupt.
+ * @reset: Invoked on USB bus reset. It is mandatory for all gadget drivers
+ *	and should be called in_interrupt.
  *
  * Devices are disabled till a gadget driver successfully bind()s, which
  * means the driver will handle setup() requests needed to enumerate (and
@@ -753,6 +761,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
  * power is maintained.
  */
 struct usb_gadget_driver {
+	char			*function;
 	enum usb_device_speed	speed;
 	int			(*bind)(struct usb_gadget *);
 	void			(*unbind)(struct usb_gadget *);
@@ -761,6 +770,7 @@ struct usb_gadget_driver {
 	void			(*disconnect)(struct usb_gadget *);
 	void			(*suspend)(struct usb_gadget *);
 	void			(*resume)(struct usb_gadget *);
+	void			(*reset)(struct usb_gadget *);
 };
 
 
@@ -801,6 +811,10 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver);
  */
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver);
 
+int usb_add_gadget_udc_release(struct device *parent,
+		struct usb_gadget *gadget, void (*release)(struct device *dev));
+int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget);
+void usb_del_gadget_udc(struct usb_gadget *gadget);
 /*-------------------------------------------------------------------------*/
 
 /* utility to simplify dealing with string descriptors */
@@ -847,6 +861,35 @@ int usb_gadget_config_buf(const struct usb_config_descriptor *config,
 	void *buf, unsigned buflen, const struct usb_descriptor_header **desc);
 
 /*-------------------------------------------------------------------------*/
+/* utility to simplify map/unmap of usb_requests to/from DMA */
+
+extern int usb_gadget_map_request(struct usb_gadget *gadget,
+				  struct usb_request *req, int is_in);
+
+extern void usb_gadget_unmap_request(struct usb_gadget *gadget,
+				     struct usb_request *req, int is_in);
+
+/*-------------------------------------------------------------------------*/
+
+/* utility to set gadget state properly */
+
+extern void usb_gadget_set_state(struct usb_gadget *gadget,
+				 enum usb_device_state state);
+
+/*-------------------------------------------------------------------------*/
+
+/* utility to tell udc core that the bus reset occurs */
+extern void usb_gadget_udc_reset(struct usb_gadget *gadget,
+				 struct usb_gadget_driver *driver);
+
+/*-------------------------------------------------------------------------*/
+
+/* utility to give requests back to the gadget layer */
+
+extern void usb_gadget_giveback_request(struct usb_ep *ep,
+					struct usb_request *req);
+
+/*-------------------------------------------------------------------------*/
 
 /* utility wrapping a simple endpoint selection policy */
 
Signature · 1 line
1.7.9.5
#14 lore raw

PATCH 4/40 include: usb: modify gadget.h to include udc support

Hi Kishon,

Quoted 113 lines

Made changes in gadget.h that is required after adding udc-core.c except changes that might break other platforms.

---
 include/linux/usb/gadget.h |   43

+++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)

include/linux/usb/gadget.h +0 -0
index 9bccd45..1960958 100644
@@ -396,6 +396,7 @@ static inline void usb_ep_fifo_flush(struct

usb_ep
*ep) /*-------------------------------------------------------------------------*/
struct usb_gadget;

include/linux/usb/gadget.h +7 -0
+struct usb_gadget_driver;
 
 /* the rest of the api to the controller hardware: device operations,
  * which don't involve endpoints (or i/o).
@@ -409,6 +410,9 @@ struct usb_gadget_ops {
 	int	(*pullup) (struct usb_gadget *, int is_on);
 	int	(*ioctl)(struct usb_gadget *,
 				unsigned code, unsigned long param);
+	int	(*udc_start)(struct usb_gadget *,
+			     struct usb_gadget_driver *);
+	int	(*udc_stop)(struct usb_gadget *);
 };
 
 /**
@@ -459,6 +463,7 @@ struct usb_gadget {
 	struct usb_ep			*ep0;
 	struct list_head		ep_list;	/* of usb_ep
 */ enum usb_device_speed		speed;
+	enum usb_device_state		state;
 	unsigned			is_dualspeed:1;
 	unsigned			is_otg:1;
 	unsigned			is_a_peripheral:1;
@@ -686,6 +691,7 @@ static inline int usb_gadget_disconnect(struct
 usb_gadget *gadget) 
 /**
  * struct usb_gadget_driver - driver for usb 'slave' devices
+ * @function: String describing the gadget's function
  * @speed: Highest speed the driver handles.
  * @bind: Invoked when the driver is bound to a gadget, usually
  *	after registering the driver.
@@ -707,6 +713,8 @@ static inline int usb_gadget_disconnect(struct
 usb_gadget *gadget)
  *	Called in a context that permits sleeping.
  * @suspend: Invoked on USB suspend.  May be called in_interrupt.
  * @resume: Invoked on USB resume.  May be called in_interrupt.
+ * @reset: Invoked on USB bus reset. It is mandatory for all gadget

drivers
+ * and should be called in_interrupt.
*
* Devices are disabled till a gadget driver successfully bind()s,
which
* means the driver will handle setup() requests needed to enumerate
(and @@ -753,6 +761,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
* power is maintained.
*/
struct usb_gadget_driver {

include/linux/usb/gadget.h +2 -0
+	char			*function;
 	enum usb_device_speed	speed;
 	int			(*bind)(struct usb_gadget *);
 	void			(*unbind)(struct usb_gadget *);
@@ -761,6 +770,7 @@ struct usb_gadget_driver {
 	void			(*disconnect)(struct usb_gadget
 *); void			(*suspend)(struct usb_gadget *);
 	void			(*resume)(struct usb_gadget *);
+	void			(*reset)(struct usb_gadget *);
 };
 
 
@@ -801,6 +811,10 @@ int usb_gadget_register_driver(struct

usb_gadget_driver *driver); */
int usb_gadget_unregister_driver(struct usb_gadget_driver *driver);

include/linux/usb/gadget.h +2 -0
+int usb_add_gadget_udc_release(struct device *parent,
+		struct usb_gadget *gadget, void (*release)(struct

device *dev)); +int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget); +void usb_del_gadget_udc(struct usb_gadget
*gadget); /*-------------------------------------------------------------------------*/

/* utility to simplify dealing with string descriptors */

include/linux/usb/gadget.h +0 -0
@@ -847,6 +861,35 @@ int usb_gadget_config_buf(const struct

usb_config_descriptor *config, void *buf, unsigned buflen, const struct usb_descriptor_header **desc);
/*-------------------------------------------------------------------------*/

include/linux/usb/gadget.h +4 -0
+/* utility to simplify map/unmap of usb_requests to/from DMA */
+
+extern int usb_gadget_map_request(struct usb_gadget *gadget,
+				  struct usb_request *req, int

is_in); +

include/linux/usb/gadget.h +2 -0
+extern void usb_gadget_unmap_request(struct usb_gadget *gadget,
+				     struct usb_request *req, int

is_in); +

include/linux/usb/gadget.h +13 -0
+/*-------------------------------------------------------------------------*/
+
+/* utility to set gadget state properly */
+
+extern void usb_gadget_set_state(struct usb_gadget *gadget,
+				 enum usb_device_state state);
+
+/*-------------------------------------------------------------------------*/
+
+/* utility to tell udc core that the bus reset occurs */
+extern void usb_gadget_udc_reset(struct usb_gadget *gadget,
+				 struct usb_gadget_driver *driver);
+

include/linux/usb/gadget.h int usb_gadget_config_buf(const struct usb_config_descriptor *config, · line 894

Quoted 10 lines
include/linux/usb/gadget.h +8 -0
+/*-------------------------------------------------------------------------*/
+
+/* utility to give requests back to the gadget layer */
+
+extern void usb_gadget_giveback_request(struct usb_ep *ep,
+					struct usb_request *req);
+
+/*-------------------------------------------------------------------------*/
 
 /* utility wrapping a simple endpoint selection policy */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#15 lore raw

PATCH 5/40 usb: gadget: udc: make udc-core compile in u-boot build

In reply to Kishon Vijay Abraham I

Make udc-core compile in u-boot by removing all linux specific stuff and having only the bare minimal udc-core required for usb gadget drivers. Also modified the file header to a format that is generally being used in u-boot.

---
 drivers/usb/gadget/udc/udc-core.c |  335 +++----------------------------------
 1 file changed, 26 insertions(+), 309 deletions(-)
drivers/usb/gadget/udc/udc-core.c +26 -309
index e31d574..875e998 100644
@@ -1,33 +1,27 @@
 /**
- * udc.c - Core UDC Framework
+ * udc-core.c - Core UDC Framework
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
- * Copyright (C) 2010 Texas Instruments
  * Author: Felipe Balbi <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/gadget/udc-core.c) and ported
+ * to uboot.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * commit 02e8c96627 : usb: gadget: udc: core: prepend udc_attach_driver with
+ *		       usb_
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier:     GPL-2.0
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/list.h>
-#include <linux/err.h>
-#include <linux/dma-mapping.h>
-#include <linux/workqueue.h>
+#include <linux/compat.h>
+#include <malloc.h>
+#include <asm/cache.h>
+#include <asm/dma-mapping.h>
+#include <common.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
-#include <linux/usb.h>
 
 /**
  * struct usb_udc - describes one usb device controller
@@ -48,38 +42,18 @@ struct usb_udc {
 
 static struct class *udc_class;
 static LIST_HEAD(udc_list);
-static DEFINE_MUTEX(udc_lock);
+DEFINE_MUTEX(udc_lock);
 
 /* ------------------------------------------------------------------------- */
 
-#ifdef	CONFIG_HAS_DMA
-
 int usb_gadget_map_request(struct usb_gadget *gadget,
 		struct usb_request *req, int is_in)
 {
 	if (req->length == 0)
 		return 0;
 
-	if (req->num_sgs) {
-		int     mapped;
-
-		mapped = dma_map_sg(&gadget->dev, req->sg, req->num_sgs,
-				is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
-		if (mapped == 0) {
-			dev_err(&gadget->dev, "failed to map SGs\n");
-			return -EFAULT;
-		}
-
-		req->num_mapped_sgs = mapped;
-	} else {
-		req->dma = dma_map_single(&gadget->dev, req->buf, req->length,
-				is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
-
-		if (dma_mapping_error(&gadget->dev, req->dma)) {
-			dev_err(&gadget->dev, "failed to map buffer\n");
-			return -EFAULT;
-		}
-	}
+	req->dma = dma_map_single(req->buf, req->length,
+				  is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
 
 	return 0;
 }
@@ -91,20 +65,11 @@ void usb_gadget_unmap_request(struct usb_gadget *gadget,
 	if (req->length == 0)
 		return;
 
-	if (req->num_mapped_sgs) {
-		dma_unmap_sg(&gadget->dev, req->sg, req->num_mapped_sgs,
-				is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
-
-		req->num_mapped_sgs = 0;
-	} else {
-		dma_unmap_single(&gadget->dev, req->dma, req->length,
-				is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
-	}
+	dma_unmap_single((void *)req->dma, req->length,
+			 is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
 }
 EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
 
-#endif	/* CONFIG_HAS_DMA */
-
 /* ------------------------------------------------------------------------- */
 
 /**
@@ -117,39 +82,16 @@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
 void usb_gadget_giveback_request(struct usb_ep *ep,
 		struct usb_request *req)
 {
-	if (likely(req->status == 0))
-		usb_led_activity(USB_LED_EVENT_GADGET);
-
 	req->complete(ep, req);
 }
 EXPORT_SYMBOL_GPL(usb_gadget_giveback_request);
 
 /* ------------------------------------------------------------------------- */
 
-static void usb_gadget_state_work(struct work_struct *work)
-{
-	struct usb_gadget	*gadget = work_to_gadget(work);
-	struct usb_udc		*udc = NULL;
-
-	mutex_lock(&udc_lock);
-	list_for_each_entry(udc, &udc_list, list)
-		if (udc->gadget == gadget)
-			goto found;
-	mutex_unlock(&udc_lock);
-
-	return;
-
-found:
-	mutex_unlock(&udc_lock);
-
-	sysfs_notify(&udc->dev.kobj, NULL, "state");
-}
-
 void usb_gadget_set_state(struct usb_gadget *gadget,
 		enum usb_device_state state)
 {
 	gadget->state = state;
-	schedule_work(&gadget->work);
 }
 EXPORT_SYMBOL_GPL(usb_gadget_set_state);
 
@@ -219,17 +161,9 @@ static void usb_udc_release(struct device *dev)
 	struct usb_udc *udc;
 
 	udc = container_of(dev, struct usb_udc, dev);
-	dev_dbg(dev, "releasing '%s'\n", dev_name(dev));
 	kfree(udc);
 }
 
-static const struct attribute_group *usb_udc_attr_groups[];
-
-static void usb_udc_nop_release(struct device *dev)
-{
-	dev_vdbg(dev, "%s\n", __func__);
-}
-
 /**
  * usb_add_gadget_udc_release - adds a new gadget to the udc class driver list
  * @parent: the parent device to this udc. Usually the controller driver's
@@ -250,59 +184,23 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
 		goto err1;
 
 	dev_set_name(&gadget->dev, "gadget");
-	INIT_WORK(&gadget->work, usb_gadget_state_work);
 	gadget->dev.parent = parent;
 
-#ifdef	CONFIG_HAS_DMA
-	dma_set_coherent_mask(&gadget->dev, parent->coherent_dma_mask);
-	gadget->dev.dma_parms = parent->dma_parms;
-	gadget->dev.dma_mask = parent->dma_mask;
-#endif
-
-	if (release)
-		gadget->dev.release = release;
-	else
-		gadget->dev.release = usb_udc_nop_release;
-
-	ret = device_register(&gadget->dev);
-	if (ret)
-		goto err2;
-
-	device_initialize(&udc->dev);
 	udc->dev.release = usb_udc_release;
 	udc->dev.class = udc_class;
-	udc->dev.groups = usb_udc_attr_groups;
 	udc->dev.parent = parent;
-	ret = dev_set_name(&udc->dev, "%s", kobject_name(&parent->kobj));
-	if (ret)
-		goto err3;
 
 	udc->gadget = gadget;
 
 	mutex_lock(&udc_lock);
 	list_add_tail(&udc->list, &udc_list);
 
-	ret = device_add(&udc->dev);
-	if (ret)
-		goto err4;
-
 	usb_gadget_set_state(gadget, USB_STATE_NOTATTACHED);
 
 	mutex_unlock(&udc_lock);
 
 	return 0;
 
-err4:
-	list_del(&udc->list);
-	mutex_unlock(&udc_lock);
-
-err3:
-	put_device(&udc->dev);
-
-err2:
-	put_device(&gadget->dev);
-	kfree(udc);
-
 err1:
 	return ret;
 }
@@ -327,16 +225,12 @@ static void usb_gadget_remove_driver(struct usb_udc *udc)
 	dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n",
 			udc->driver->function);
 
-	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
-
 	usb_gadget_disconnect(udc->gadget);
 	udc->driver->disconnect(udc->gadget);
 	udc->driver->unbind(udc->gadget);
 	usb_gadget_udc_stop(udc);
 
 	udc->driver = NULL;
-	udc->dev.driver = NULL;
-	udc->gadget->dev.driver = NULL;
 }
 
 /**
@@ -368,11 +262,6 @@ found:
 
 	if (udc->driver)
 		usb_gadget_remove_driver(udc);
-
-	kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE);
-	flush_work(&gadget->work);
-	device_unregister(&udc->dev);
-	device_unregister(&gadget->dev);
 }
 EXPORT_SYMBOL_GPL(usb_del_gadget_udc);
 
@@ -386,10 +275,8 @@ static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *dri
 			driver->function);
 
 	udc->driver = driver;
-	udc->dev.driver = &driver->driver;
-	udc->gadget->dev.driver = &driver->driver;
 
-	ret = driver->bind(udc->gadget, driver);
+	ret = driver->bind(udc->gadget);
 	if (ret)
 		goto err1;
 	ret = usb_gadget_udc_start(udc);
@@ -399,43 +286,14 @@ static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *dri
 	}
 	usb_gadget_connect(udc->gadget);
 
-	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
 	return 0;
 err1:
 	if (ret != -EISNAM)
 		dev_err(&udc->dev, "failed to start %s: %d\n",
 			udc->driver->function, ret);
 	udc->driver = NULL;
-	udc->dev.driver = NULL;
-	udc->gadget->dev.driver = NULL;
-	return ret;
-}
-
-int usb_udc_attach_driver(const char *name, struct usb_gadget_driver *driver)
-{
-	struct usb_udc *udc = NULL;
-	int ret = -ENODEV;
-
-	mutex_lock(&udc_lock);
-	list_for_each_entry(udc, &udc_list, list) {
-		ret = strcmp(name, dev_name(&udc->dev));
-		if (!ret)
-			break;
-	}
-	if (ret) {
-		ret = -ENODEV;
-		goto out;
-	}
-	if (udc->driver) {
-		ret = -EBUSY;
-		goto out;
-	}
-	ret = udc_bind_to_driver(udc, driver);
-out:
-	mutex_unlock(&udc_lock);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(usb_udc_attach_driver);
 
 int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
 {
@@ -452,7 +310,7 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
 			goto found;
 	}
 
-	pr_debug("couldn't find an available UDC\n");
+	printf("couldn't find an available UDC\n");
 	mutex_unlock(&udc_lock);
 	return -ENODEV;
 found:
@@ -462,6 +320,12 @@ found:
 }
 EXPORT_SYMBOL_GPL(usb_gadget_probe_driver);
 
+int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+{
+	return usb_gadget_probe_driver(driver);
+}
+EXPORT_SYMBOL_GPL(usb_gadget_register_driver);
+
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 {
 	struct usb_udc		*udc = NULL;
@@ -485,153 +349,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 }
 EXPORT_SYMBOL_GPL(usb_gadget_unregister_driver);
 
-/* ------------------------------------------------------------------------- */
-
-static ssize_t usb_udc_srp_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t n)
-{
-	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
-
-	if (sysfs_streq(buf, "1"))
-		usb_gadget_wakeup(udc->gadget);
-
-	return n;
-}
-static DEVICE_ATTR(srp, S_IWUSR, NULL, usb_udc_srp_store);
-
-static ssize_t usb_udc_softconn_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t n)
-{
-	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
-
-	if (!udc->driver) {
-		dev_err(dev, "soft-connect without a gadget driver\n");
-		return -EOPNOTSUPP;
-	}
-
-	if (sysfs_streq(buf, "connect")) {
-		usb_gadget_udc_start(udc);
-		usb_gadget_connect(udc->gadget);
-	} else if (sysfs_streq(buf, "disconnect")) {
-		usb_gadget_disconnect(udc->gadget);
-		udc->driver->disconnect(udc->gadget);
-		usb_gadget_udc_stop(udc);
-	} else {
-		dev_err(dev, "unsupported command '%s'\n", buf);
-		return -EINVAL;
-	}
-
-	return n;
-}
-static DEVICE_ATTR(soft_connect, S_IWUSR, NULL, usb_udc_softconn_store);
-
-static ssize_t state_show(struct device *dev, struct device_attribute *attr,
-			  char *buf)
-{
-	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
-	struct usb_gadget	*gadget = udc->gadget;
-
-	return sprintf(buf, "%s\n", usb_state_string(gadget->state));
-}
-static DEVICE_ATTR_RO(state);
-
-#define USB_UDC_SPEED_ATTR(name, param)					\
-ssize_t name##_show(struct device *dev,					\
-		struct device_attribute *attr, char *buf)		\
-{									\
-	struct usb_udc *udc = container_of(dev, struct usb_udc, dev);	\
-	return snprintf(buf, PAGE_SIZE, "%s\n",				\
-			usb_speed_string(udc->gadget->param));		\
-}									\
-static DEVICE_ATTR_RO(name)
-
-static USB_UDC_SPEED_ATTR(current_speed, speed);
-static USB_UDC_SPEED_ATTR(maximum_speed, max_speed);
-
-#define USB_UDC_ATTR(name)					\
-ssize_t name##_show(struct device *dev,				\
-		struct device_attribute *attr, char *buf)	\
-{								\
-	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev); \
-	struct usb_gadget	*gadget = udc->gadget;		\
-								\
-	return snprintf(buf, PAGE_SIZE, "%d\n", gadget->name);	\
-}								\
-static DEVICE_ATTR_RO(name)
-
-static USB_UDC_ATTR(is_otg);
-static USB_UDC_ATTR(is_a_peripheral);
-static USB_UDC_ATTR(b_hnp_enable);
-static USB_UDC_ATTR(a_hnp_support);
-static USB_UDC_ATTR(a_alt_hnp_support);
-
-static struct attribute *usb_udc_attrs[] = {
-	&dev_attr_srp.attr,
-	&dev_attr_soft_connect.attr,
-	&dev_attr_state.attr,
-	&dev_attr_current_speed.attr,
-	&dev_attr_maximum_speed.attr,
-
-	&dev_attr_is_otg.attr,
-	&dev_attr_is_a_peripheral.attr,
-	&dev_attr_b_hnp_enable.attr,
-	&dev_attr_a_hnp_support.attr,
-	&dev_attr_a_alt_hnp_support.attr,
-	NULL,
-};
-
-static const struct attribute_group usb_udc_attr_group = {
-	.attrs = usb_udc_attrs,
-};
-
-static const struct attribute_group *usb_udc_attr_groups[] = {
-	&usb_udc_attr_group,
-	NULL,
-};
-
-static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
-	int			ret;
-
-	ret = add_uevent_var(env, "USB_UDC_NAME=%s", udc->gadget->name);
-	if (ret) {
-		dev_err(dev, "failed to add uevent USB_UDC_NAME\n");
-		return ret;
-	}
-
-	if (udc->driver) {
-		ret = add_uevent_var(env, "USB_UDC_DRIVER=%s",
-				udc->driver->function);
-		if (ret) {
-			dev_err(dev, "failed to add uevent USB_UDC_DRIVER\n");
-			return ret;
-		}
-	}
-
-	return 0;
-}
-
-static int __init usb_udc_init(void)
-{
-	udc_class = class_create(THIS_MODULE, "udc");
-	if (IS_ERR(udc_class)) {
-		pr_err("failed to create udc class --> %ld\n",
-				PTR_ERR(udc_class));
-		return PTR_ERR(udc_class);
-	}
-
-	udc_class->dev_uevent = usb_udc_uevent;
-	return 0;
-}
-subsys_initcall(usb_udc_init);
-
-static void __exit usb_udc_exit(void)
-{
-	class_destroy(udc_class);
-}
-module_exit(usb_udc_exit);
-
 MODULE_DESCRIPTION("UDC Framework");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
Signature · 1 line
1.7.9.5
#16 lore raw

PATCH 5/40 usb: gadget: udc: make udc-core compile in u-boot build

Hi Kishon,

Quoted 524 lines

Make udc-core compile in u-boot by removing all linux specific stuff and having only the bare minimal udc-core required for usb gadget drivers. Also modified the file header to a format that is generally being used in u-boot.

---
 drivers/usb/gadget/udc/udc-core.c |  335

+++---------------------------------- 1 file changed, 26 insertions(+), 309 deletions(-)

(quoted diff) +0 -0

b/drivers/usb/gadget/udc/udc-core.c index e31d574..875e998 100644

drivers/usb/gadget/udc/udc-core.c +3 -1
@@ -1,33 +1,27 @@
 /**
- * udc.c - Core UDC Framework
+ * udc-core.c - Core UDC Framework
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -

http://www.ti.com *
- * Copyright (C) 2010 Texas Instruments
* Author: Felipe Balbi <[email protected]>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/gadget/udc-core.c) and ported
+ * to uboot.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * commit 02e8c96627 : usb: gadget: udc: core: prepend udc_attach_driver with
+ * usb_
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
<http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0
*/

drivers/usb/gadget/udc/udc-core.c +6 -25
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/list.h>
-#include <linux/err.h>
-#include <linux/dma-mapping.h>
-#include <linux/workqueue.h>
+#include <linux/compat.h>
+#include <malloc.h>
+#include <asm/cache.h>
+#include <asm/dma-mapping.h>
+#include <common.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
-#include <linux/usb.h>
 
 /**
  * struct usb_udc - describes one usb device controller
@@ -48,38 +42,18 @@ struct usb_udc {
 
 static struct class *udc_class;
 static LIST_HEAD(udc_list);
-static DEFINE_MUTEX(udc_lock);
+DEFINE_MUTEX(udc_lock);
 
 /*
-------------------------------------------------------------------------
 */ -#ifdef	CONFIG_HAS_DMA
-
 int usb_gadget_map_request(struct usb_gadget *gadget,
 		struct usb_request *req, int is_in)
 {
 	if (req->length == 0)
 		return 0;
 
-	if (req->num_sgs) {
-		int     mapped;
-
-		mapped = dma_map_sg(&gadget->dev, req->sg,
 req->num_sgs,
-				is_in ? DMA_TO_DEVICE :
 DMA_FROM_DEVICE);
-		if (mapped == 0) {
-			dev_err(&gadget->dev, "failed to map SGs\n");
-			return -EFAULT;
-		}
-
-		req->num_mapped_sgs = mapped;
-	} else {
-		req->dma = dma_map_single(&gadget->dev, req->buf,
 req->length,
-				is_in ? DMA_TO_DEVICE :

DMA_FROM_DEVICE); -

drivers/usb/gadget/udc/udc-core.c +0 -2
-		if (dma_mapping_error(&gadget->dev, req->dma)) {
-			dev_err(&gadget->dev, "failed to map

buffer\n");

drivers/usb/gadget/udc/udc-core.c +2 -3
-			return -EFAULT;
-		}
-	}
+	req->dma = dma_map_single(req->buf, req->length,
+				  is_in ? DMA_TO_DEVICE :

DMA_FROM_DEVICE);

drivers/usb/gadget/udc/udc-core.c +0 -3
 	return 0;
 }
@@ -91,20 +65,11 @@ void usb_gadget_unmap_request(struct usb_gadget
 *gadget, if (req->length == 0)
 		return;
 
-	if (req->num_mapped_sgs) {
-		dma_unmap_sg(&gadget->dev, req->sg,
 req->num_mapped_sgs,
-				is_in ? DMA_TO_DEVICE :

DMA_FROM_DEVICE); -

drivers/usb/gadget/udc/udc-core.c +0 -4
-		req->num_mapped_sgs = 0;
-	} else {
-		dma_unmap_single(&gadget->dev, req->dma, req->length,
-				is_in ? DMA_TO_DEVICE :

DMA_FROM_DEVICE);

drivers/usb/gadget/udc/udc-core.c +2 -4
-	}
+	dma_unmap_single((void *)req->dma, req->length,
+			 is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
 }
 EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
 
-#endif	/* CONFIG_HAS_DMA */
-
 /*
-------------------------------------------------------------------------

*/ /**

drivers/usb/gadget/udc/udc-core.c +0 -31
@@ -117,39 +82,16 @@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
 void usb_gadget_giveback_request(struct usb_ep *ep,
 		struct usb_request *req)
 {
-	if (likely(req->status == 0))
-		usb_led_activity(USB_LED_EVENT_GADGET);
-
 	req->complete(ep, req);
 }
 EXPORT_SYMBOL_GPL(usb_gadget_giveback_request);
 
 /*
-------------------------------------------------------------------------
 */ -static void usb_gadget_state_work(struct work_struct *work)
-{
-	struct usb_gadget	*gadget = work_to_gadget(work);
-	struct usb_udc		*udc = NULL;
-
-	mutex_lock(&udc_lock);
-	list_for_each_entry(udc, &udc_list, list)
-		if (udc->gadget == gadget)
-			goto found;
-	mutex_unlock(&udc_lock);
-
-	return;
-
-found:
-	mutex_unlock(&udc_lock);
-
-	sysfs_notify(&udc->dev.kobj, NULL, "state");
-}
-
 void usb_gadget_set_state(struct usb_gadget *gadget,
 		enum usb_device_state state)
 {
 	gadget->state = state;
-	schedule_work(&gadget->work);
 }
 EXPORT_SYMBOL_GPL(usb_gadget_set_state);
 
@@ -219,17 +161,9 @@ static void usb_udc_release(struct device *dev)
 	struct usb_udc *udc;
 
 	udc = container_of(dev, struct usb_udc, dev);
-	dev_dbg(dev, "releasing '%s'\n", dev_name(dev));
 	kfree(udc);
 }
 
-static const struct attribute_group *usb_udc_attr_groups[];
-
-static void usb_udc_nop_release(struct device *dev)
-{
-	dev_vdbg(dev, "%s\n", __func__);
-}
-
 /**
  * usb_add_gadget_udc_release - adds a new gadget to the udc class

driver list
* @parent: the parent device to this udc. Usually the controller
driver's @@ -250,59 +184,23 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, goto err1;

drivers/usb/gadget/udc/udc-core.c +0 -3
 	dev_set_name(&gadget->dev, "gadget");
-	INIT_WORK(&gadget->work, usb_gadget_state_work);
 	gadget->dev.parent = parent;
 
-#ifdef	CONFIG_HAS_DMA
-	dma_set_coherent_mask(&gadget->dev,

parent->coherent_dma_mask);

drivers/usb/gadget/udc/udc-core.c +0 -16
-	gadget->dev.dma_parms = parent->dma_parms;
-	gadget->dev.dma_mask = parent->dma_mask;
-#endif
-
-	if (release)
-		gadget->dev.release = release;
-	else
-		gadget->dev.release = usb_udc_nop_release;
-
-	ret = device_register(&gadget->dev);
-	if (ret)
-		goto err2;
-
-	device_initialize(&udc->dev);
 	udc->dev.release = usb_udc_release;
 	udc->dev.class = udc_class;
-	udc->dev.groups = usb_udc_attr_groups;
 	udc->dev.parent = parent;
-	ret = dev_set_name(&udc->dev, "%s",

kobject_name(&parent->kobj));

drivers/usb/gadget/udc/udc-core.c +8 -62
-	if (ret)
-		goto err3;
 
 	udc->gadget = gadget;
 
 	mutex_lock(&udc_lock);
 	list_add_tail(&udc->list, &udc_list);
 
-	ret = device_add(&udc->dev);
-	if (ret)
-		goto err4;
-
 	usb_gadget_set_state(gadget, USB_STATE_NOTATTACHED);
 
 	mutex_unlock(&udc_lock);
 
 	return 0;
 
-err4:
-	list_del(&udc->list);
-	mutex_unlock(&udc_lock);
-
-err3:
-	put_device(&udc->dev);
-
-err2:
-	put_device(&gadget->dev);
-	kfree(udc);
-
 err1:
 	return ret;
 }
@@ -327,16 +225,12 @@ static void usb_gadget_remove_driver(struct
 usb_udc *udc) dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n",
 			udc->driver->function);
 
-	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
-
 	usb_gadget_disconnect(udc->gadget);
 	udc->driver->disconnect(udc->gadget);
 	udc->driver->unbind(udc->gadget);
 	usb_gadget_udc_stop(udc);
 
 	udc->driver = NULL;
-	udc->dev.driver = NULL;
-	udc->gadget->dev.driver = NULL;
 }
 
 /**
@@ -368,11 +262,6 @@ found:
 
 	if (udc->driver)
 		usb_gadget_remove_driver(udc);
-
-	kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE);
-	flush_work(&gadget->work);
-	device_unregister(&udc->dev);
-	device_unregister(&gadget->dev);
 }
 EXPORT_SYMBOL_GPL(usb_del_gadget_udc);
 
@@ -386,10 +275,8 @@ static int udc_bind_to_driver(struct usb_udc
 *udc, struct usb_gadget_driver *dri driver->function);
 
 	udc->driver = driver;
-	udc->dev.driver = &driver->driver;
-	udc->gadget->dev.driver = &driver->driver;
 
-	ret = driver->bind(udc->gadget, driver);
+	ret = driver->bind(udc->gadget);
 	if (ret)
 		goto err1;
 	ret = usb_gadget_udc_start(udc);
@@ -399,43 +286,14 @@ static int udc_bind_to_driver(struct usb_udc
 *udc, struct usb_gadget_driver *dri }
 	usb_gadget_connect(udc->gadget);
 
-	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
 	return 0;
 err1:
 	if (ret != -EISNAM)
 		dev_err(&udc->dev, "failed to start %s: %d\n",
 			udc->driver->function, ret);
 	udc->driver = NULL;
-	udc->dev.driver = NULL;
-	udc->gadget->dev.driver = NULL;
-	return ret;
-}
-
-int usb_udc_attach_driver(const char *name, struct usb_gadget_driver
 *driver) -{
-	struct usb_udc *udc = NULL;
-	int ret = -ENODEV;
-
-	mutex_lock(&udc_lock);
-	list_for_each_entry(udc, &udc_list, list) {
-		ret = strcmp(name, dev_name(&udc->dev));
-		if (!ret)
-			break;
-	}
-	if (ret) {
-		ret = -ENODEV;
-		goto out;
-	}
-	if (udc->driver) {
-		ret = -EBUSY;
-		goto out;
-	}
-	ret = udc_bind_to_driver(udc, driver);
-out:
-	mutex_unlock(&udc_lock);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(usb_udc_attach_driver);
 
 int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
 {
@@ -452,7 +310,7 @@ int usb_gadget_probe_driver(struct
 usb_gadget_driver *driver) goto found;
 	}
 
-	pr_debug("couldn't find an available UDC\n");
+	printf("couldn't find an available UDC\n");
 	mutex_unlock(&udc_lock);
 	return -ENODEV;
 found:
@@ -462,6 +320,12 @@ found:
 }
 EXPORT_SYMBOL_GPL(usb_gadget_probe_driver);
 
+int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+{
+	return usb_gadget_probe_driver(driver);
+}
+EXPORT_SYMBOL_GPL(usb_gadget_register_driver);
+
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 {
 	struct usb_udc		*udc = NULL;
@@ -485,153 +349,6 @@ int usb_gadget_unregister_driver(struct
 usb_gadget_driver *driver) }
 EXPORT_SYMBOL_GPL(usb_gadget_unregister_driver);
 
-/*
-------------------------------------------------------------------------
 */ - -static ssize_t usb_udc_srp_store(struct device *dev,
-		struct device_attribute *attr, const char *buf,
 size_t n) -{
-	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev); -

drivers/usb/gadget/udc/udc-core.c +0 -9
-	if (sysfs_streq(buf, "1"))
-		usb_gadget_wakeup(udc->gadget);
-
-	return n;
-}
-static DEVICE_ATTR(srp, S_IWUSR, NULL, usb_udc_srp_store);
-
-static ssize_t usb_udc_softconn_store(struct device *dev,
-		struct device_attribute *attr, const char *buf,

size_t n) -{

drivers/usb/gadget/udc/udc-core.c +0 -1
-	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev); -

drivers/usb/gadget/udc/udc-core.c +0 -2
-	if (!udc->driver) {
-		dev_err(dev, "soft-connect without a gadget

driver\n");

drivers/usb/gadget/udc/udc-core.c +0 -18
-		return -EOPNOTSUPP;
-	}
-
-	if (sysfs_streq(buf, "connect")) {
-		usb_gadget_udc_start(udc);
-		usb_gadget_connect(udc->gadget);
-	} else if (sysfs_streq(buf, "disconnect")) {
-		usb_gadget_disconnect(udc->gadget);
-		udc->driver->disconnect(udc->gadget);
-		usb_gadget_udc_stop(udc);
-	} else {
-		dev_err(dev, "unsupported command '%s'\n", buf);
-		return -EINVAL;
-	}
-
-	return n;
-}
-static DEVICE_ATTR(soft_connect, S_IWUSR, NULL,

usb_udc_softconn_store); -
-static ssize_t state_show(struct device *dev, struct device_attribute *attr,

drivers/usb/gadget/udc/udc-core.c +0 -3
-			  char *buf)
-{
-	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev);

drivers/usb/gadget/udc/udc-core.c +0 -7
-	struct usb_gadget	*gadget = udc->gadget;
-
-	return sprintf(buf, "%s\n", usb_state_string(gadget->state));
-}
-static DEVICE_ATTR_RO(state);
-
-#define USB_UDC_SPEED_ATTR(name,

param) \ -ssize_t
name##_show(struct device
*dev, \

drivers/usb/gadget/udc/udc-core.c +0 -1
-		struct device_attribute *attr, char

*buf) \
-{
\

drivers/usb/gadget/udc/udc-core.c +0 -1
-	struct usb_udc *udc = container_of(dev, struct usb_udc,

dev); \

drivers/usb/gadget/udc/udc-core.c +0 -1
-	return snprintf(buf, PAGE_SIZE,

"%s\n", \
-
usb_speed_string(udc->gadget->param)); \
-}
\ -static DEVICE_ATTR_RO(name) -

drivers/usb/gadget/udc/udc-core.c +0 -5
-static USB_UDC_SPEED_ATTR(current_speed, speed);
-static USB_UDC_SPEED_ATTR(maximum_speed, max_speed);
-
-#define USB_UDC_ATTR(name)					\
-ssize_t name##_show(struct device

*dev, \

drivers/usb/gadget/udc/udc-core.c +0 -3
-		struct device_attribute *attr, char *buf)	\
-{								\
-	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev); \

drivers/usb/gadget/udc/udc-core.c +0 -1
-	struct usb_gadget	*gadget =

udc->gadget; \

drivers/usb/gadget/udc/udc-core.c +0 -2
-								\
-	return snprintf(buf, PAGE_SIZE, "%d\n",

gadget->name); \

drivers/usb/gadget/udc/udc-core.c +0 -33
-}								\
-static DEVICE_ATTR_RO(name) -
-static USB_UDC_ATTR(is_otg);
-static USB_UDC_ATTR(is_a_peripheral);
-static USB_UDC_ATTR(b_hnp_enable);
-static USB_UDC_ATTR(a_hnp_support);
-static USB_UDC_ATTR(a_alt_hnp_support);
-
-static struct attribute *usb_udc_attrs[] = {
-	&dev_attr_srp.attr,
-	&dev_attr_soft_connect.attr,
-	&dev_attr_state.attr,
-	&dev_attr_current_speed.attr,
-	&dev_attr_maximum_speed.attr,
-
-	&dev_attr_is_otg.attr,
-	&dev_attr_is_a_peripheral.attr,
-	&dev_attr_b_hnp_enable.attr,
-	&dev_attr_a_hnp_support.attr,
-	&dev_attr_a_alt_hnp_support.attr,
-	NULL,
-};
-
-static const struct attribute_group usb_udc_attr_group = {
-	.attrs = usb_udc_attrs,
-};
-
-static const struct attribute_group *usb_udc_attr_groups[] = {
-	&usb_udc_attr_group,
-	NULL,
-};
-
-static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env

*env) -{

drivers/usb/gadget/udc/udc-core.c +0 -1
-	struct usb_udc		*udc = container_of(dev,

struct usb_udc, dev);

drivers/usb/gadget/udc/udc-core.c +0 -3
-	int			ret;
-
-	ret = add_uevent_var(env, "USB_UDC_NAME=%s",

udc->gadget->name);

drivers/usb/gadget/udc/udc-core.c +0 -10
-	if (ret) {
-		dev_err(dev, "failed to add uevent USB_UDC_NAME\n");
-		return ret;
-	}
-
-	if (udc->driver) {
-		ret = add_uevent_var(env, "USB_UDC_DRIVER=%s",
-				udc->driver->function);
-		if (ret) {
-			dev_err(dev, "failed to add uevent

USB_UDC_DRIVER\n");

drivers/usb/gadget/udc/udc-core.c +0 -20
-			return ret;
-		}
-	}
-
-	return 0;
-}
-
-static int __init usb_udc_init(void)
-{
-	udc_class = class_create(THIS_MODULE, "udc");
-	if (IS_ERR(udc_class)) {
-		pr_err("failed to create udc class --> %ld\n",
-				PTR_ERR(udc_class));
-		return PTR_ERR(udc_class);
-	}
-
-	udc_class->dev_uevent = usb_udc_uevent;
-	return 0;
-}
-subsys_initcall(usb_udc_init);

drivers/usb/gadget/udc/udc-core.c int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) · line 354

Quoted 10 lines
drivers/usb/gadget/udc/udc-core.c +0 -7
-
-static void __exit usb_udc_exit(void)
-{
-	class_destroy(udc_class);
-}
-module_exit(usb_udc_exit);
-
 MODULE_DESCRIPTION("UDC Framework");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#17 lore raw

PATCH 6/40 include: asm: dma-mapping: get rid of the compilation warning in udc-core

In reply to Kishon Vijay Abraham I

Fixed the following warning here.
"warning: ?dma_alloc_coherent? defined but not used" while compiling udc-core

---
 arch/arm/include/asm/dma-mapping.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/dma-mapping.h +1 -1
index 55a4e26..14f00efd2 100644
@@ -14,7 +14,7 @@ enum dma_data_direction {
 	DMA_FROM_DEVICE		= 2,
 };
 
-static void *dma_alloc_coherent(size_t len, unsigned long *handle)
+static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
 	*handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, len);
 	return (void *)*handle;
Signature · 1 line
1.7.9.5
#18 lore raw

PATCH 6/40 include: asm: dma-mapping: get rid of the compilation warning in udc-core

Hi Kishon,

Quoted 14 lines

Fixed the following warning here.
"warning: ?dma_alloc_coherent? defined but not used" while compiling udc-core

---
 arch/arm/include/asm/dma-mapping.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/arch/arm/include/asm/dma-mapping.h index 55a4e26..14f00efd2 100644

arch/arm/include/asm/dma-mapping.h enum dma_data_direction { · line 20

Quoted 8 lines
arch/arm/include/asm/dma-mapping.h +1 -1
@@ -14,7 +14,7 @@ enum dma_data_direction {
 	DMA_FROM_DEVICE		= 2,
 };
 
-static void *dma_alloc_coherent(size_t len, unsigned long *handle)
+static inline void *dma_alloc_coherent(size_t len, unsigned long
 *handle) {
 	*handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, len);
 	return (void *)*handle;
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#19 lore raw

PATCH 7/40 usb: dwc3: add dwc3 folder from linux kernel to u-boot

In reply to Kishon Vijay Abraham I

Added dwc3 folder from linux kernel 3.19-rc1 (97bf6af1f9) to u-boot. This will be adapted to work with u-boot in the following patches.

---
 drivers/usb/dwc3/Kconfig         |  120 ++
 drivers/usb/dwc3/Makefile        |   40 +
 drivers/usb/dwc3/core.c          | 1119 +++++++++++++++
 drivers/usb/dwc3/core.h          | 1041 ++++++++++++++
 drivers/usb/dwc3/debug.c         |   32 +
 drivers/usb/dwc3/debug.h         |  228 +++
 drivers/usb/dwc3/debugfs.c       |  690 ++++++++++
 drivers/usb/dwc3/dwc3-exynos.c   |  301 ++++
 drivers/usb/dwc3/dwc3-keystone.c |  197 +++
 drivers/usb/dwc3/dwc3-omap.c     |  645 +++++++++
 drivers/usb/dwc3/dwc3-pci.c      |  272 ++++
 drivers/usb/dwc3/dwc3-qcom.c     |  130 ++
 drivers/usb/dwc3/dwc3-st.c       |  367 +++++
 drivers/usb/dwc3/ep0.c           | 1092 +++++++++++++++
 drivers/usb/dwc3/gadget.c        | 2824 ++++++++++++++++++++++++++++++++++++++
 drivers/usb/dwc3/gadget.h        |  107 ++
 drivers/usb/dwc3/host.c          |   91 ++
 drivers/usb/dwc3/io.h            |   70 +
 drivers/usb/dwc3/platform_data.h |   47 +
 drivers/usb/dwc3/trace.c         |   19 +
 drivers/usb/dwc3/trace.h         |  247 ++++
 21 files changed, 9679 insertions(+)
 create mode 100644 drivers/usb/dwc3/Kconfig
 create mode 100644 drivers/usb/dwc3/Makefile
 create mode 100644 drivers/usb/dwc3/core.c
 create mode 100644 drivers/usb/dwc3/core.h
 create mode 100644 drivers/usb/dwc3/debug.c
 create mode 100644 drivers/usb/dwc3/debug.h
 create mode 100644 drivers/usb/dwc3/debugfs.c
 create mode 100644 drivers/usb/dwc3/dwc3-exynos.c
 create mode 100644 drivers/usb/dwc3/dwc3-keystone.c
 create mode 100644 drivers/usb/dwc3/dwc3-omap.c
 create mode 100644 drivers/usb/dwc3/dwc3-pci.c
 create mode 100644 drivers/usb/dwc3/dwc3-qcom.c
 create mode 100644 drivers/usb/dwc3/dwc3-st.c
 create mode 100644 drivers/usb/dwc3/ep0.c
 create mode 100644 drivers/usb/dwc3/gadget.c
 create mode 100644 drivers/usb/dwc3/gadget.h
 create mode 100644 drivers/usb/dwc3/host.c
 create mode 100644 drivers/usb/dwc3/io.h
 create mode 100644 drivers/usb/dwc3/platform_data.h
 create mode 100644 drivers/usb/dwc3/trace.c
 create mode 100644 drivers/usb/dwc3/trace.h
drivers/usb/dwc3/Kconfig new file +120 -0
new file mode 100644
index 0000000..58b5b2c
@@ -0,0 +1,120 @@
+config USB_DWC3
+	tristate "DesignWare USB3 DRD Core Support"
+	depends on (USB || USB_GADGET) && HAS_DMA
+	select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD
+	help
+	  Say Y or M here if your system has a Dual Role SuperSpeed
+	  USB controller based on the DesignWare USB3 IP Core.
+
+	  If you choose to build this driver is a dynamically linked
+	  module, the module will be called dwc3.ko.
+
+if USB_DWC3
+
+choice
+	bool "DWC3 Mode Selection"
+	default USB_DWC3_DUAL_ROLE if (USB && USB_GADGET)
+	default USB_DWC3_HOST if (USB && !USB_GADGET)
+	default USB_DWC3_GADGET if (!USB && USB_GADGET)
+
+config USB_DWC3_HOST
+	bool "Host only mode"
+	depends on USB=y || USB=USB_DWC3
+	help
+	  Select this when you want to use DWC3 in host mode only,
+	  thereby the gadget feature will be regressed.
+
+config USB_DWC3_GADGET
+	bool "Gadget only mode"
+	depends on USB_GADGET=y || USB_GADGET=USB_DWC3
+	help
+	  Select this when you want to use DWC3 in gadget mode only,
+	  thereby the host feature will be regressed.
+
+config USB_DWC3_DUAL_ROLE
+	bool "Dual Role mode"
+	depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3))
+	help
+	  This is the default mode of working of DWC3 controller where
+	  both host and gadget features are enabled.
+
+endchoice
+
+comment "Platform Glue Driver Support"
+
+config USB_DWC3_OMAP
+	tristate "Texas Instruments OMAP5 and similar Platforms"
+	depends on EXTCON && (ARCH_OMAP2PLUS || COMPILE_TEST)
+	depends on OF
+	default USB_DWC3
+	help
+	  Some platforms from Texas Instruments like OMAP5, DRA7xxx and
+	  AM437x use this IP for USB2/3 functionality.
+
+	  Say 'Y' or 'M' here if you have one such device
+
+config USB_DWC3_EXYNOS
+	tristate "Samsung Exynos Platform"
+	depends on ARCH_EXYNOS && OF || COMPILE_TEST
+	default USB_DWC3
+	help
+	  Recent Exynos5 SoCs ship with one DesignWare Core USB3 IP inside,
+	  say 'Y' or 'M' if you have one such device.
+
+config USB_DWC3_PCI
+	tristate "PCIe-based Platforms"
+	depends on PCI
+	default USB_DWC3
+	help
+	  If you're using the DesignWare Core IP with a PCIe, please say
+	  'Y' or 'M' here.
+
+	  One such PCIe-based platform is Synopsys' PCIe HAPS model of
+	  this IP.
+
+config USB_DWC3_KEYSTONE
+	tristate "Texas Instruments Keystone2 Platforms"
+	depends on ARCH_KEYSTONE || COMPILE_TEST
+	default USB_DWC3
+	help
+	  Support of USB2/3 functionality in TI Keystone2 platforms.
+	  Say 'Y' or 'M' here if you have one such device
+
+config USB_DWC3_ST
+	tristate "STMicroelectronics Platforms"
+	depends on ARCH_STI && OF
+	default USB_DWC3
+	help
+	  STMicroelectronics SoCs with one DesignWare Core USB3 IP
+	  inside (i.e. STiH407).
+	  Say 'Y' or 'M' if you have one such device.
+
+config USB_DWC3_QCOM
+	tristate "Qualcomm Platforms"
+	depends on ARCH_QCOM || COMPILE_TEST
+	default USB_DWC3
+	help
+	  Recent Qualcomm SoCs ship with one DesignWare Core USB3 IP inside,
+	  say 'Y' or 'M' if you have one such device.
+
+comment "Debugging features"
+
+config USB_DWC3_DEBUG
+	bool "Enable Debugging Messages"
+	help
+	  Say Y here to enable debugging messages on DWC3 Driver.
+
+config USB_DWC3_VERBOSE
+	bool "Enable Verbose Debugging Messages"
+	depends on USB_DWC3_DEBUG
+	help
+	  Say Y here to enable verbose debugging messages on DWC3 Driver.
+
+config DWC3_HOST_USB3_LPM_ENABLE
+	bool "Enable USB3 LPM Capability"
+	depends on USB_DWC3_HOST=y || USB_DWC3_DUAL_ROLE=y
+	default n
+	help
+	  Select this when you want to enable USB3 LPM with dwc3 xhci host.
+
+endif
drivers/usb/dwc3/Makefile new file +40 -0
new file mode 100644
index 0000000..bb34fbc
@@ -0,0 +1,40 @@
+# define_trace.h needs to know how to find our header
+CFLAGS_trace.o				:= -I$(src)
+
+ccflags-$(CONFIG_USB_DWC3_DEBUG)	:= -DDEBUG
+ccflags-$(CONFIG_USB_DWC3_VERBOSE)	+= -DVERBOSE_DEBUG
+
+obj-$(CONFIG_USB_DWC3)			+= dwc3.o
+
+dwc3-y					:= core.o debug.o trace.o
+
+ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
+	dwc3-y				+= host.o
+endif
+
+ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
+	dwc3-y				+= gadget.o ep0.o
+endif
+
+ifneq ($(CONFIG_DEBUG_FS),)
+	dwc3-y				+= debugfs.o
+endif
+
+##
+# Platform-specific glue layers go here
+#
+# NOTICE: Make sure your glue layer doesn't depend on anything
+# which is arch-specific and that it compiles on all situations.
+#
+# We want to keep this requirement in order to be able to compile
+# the entire driver (with all its glue layers) on several architectures
+# and make sure it compiles fine. This will also help with allmodconfig
+# and allyesconfig builds.
+##
+
+obj-$(CONFIG_USB_DWC3_OMAP)		+= dwc3-omap.o
+obj-$(CONFIG_USB_DWC3_EXYNOS)		+= dwc3-exynos.o
+obj-$(CONFIG_USB_DWC3_PCI)		+= dwc3-pci.o
+obj-$(CONFIG_USB_DWC3_KEYSTONE)		+= dwc3-keystone.o
+obj-$(CONFIG_USB_DWC3_QCOM)		+= dwc3-qcom.o
+obj-$(CONFIG_USB_DWC3_ST)		+= dwc3-st.o
drivers/usb/dwc3/core.c new file +1119 -0

1,119 lines not on this page · raw message

drivers/usb/dwc3/core.h new file +1041 -0

1,041 lines not on this page · raw message

drivers/usb/dwc3/debug.c new file +32 -0
new file mode 100644
index 0000000..0be6885
@@ -0,0 +1,32 @@
+/**
+ * debug.c - DesignWare USB3 DRD Controller Debug/Trace Support
+ *
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Author: Felipe Balbi <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2  of
+ * the License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "debug.h"
+
+void dwc3_trace(void (*trace)(struct va_format *), const char *fmt, ...)
+{
+	struct va_format vaf;
+	va_list args;
+
+	va_start(args, fmt);
+	vaf.fmt = fmt;
+	vaf.va = &args;
+
+	trace(&vaf);
+
+	va_end(args);
+}
drivers/usb/dwc3/debug.h new file +228 -0

228 lines not on this page · raw message

drivers/usb/dwc3/debugfs.c new file +690 -0

420 lines not on this page · raw message

drivers/usb/dwc3/dwc3-exynos.c new file +301 -0

301 lines not on this page · raw message

drivers/usb/dwc3/dwc3-keystone.c new file +197 -0

197 lines not on this page · raw message

drivers/usb/dwc3/dwc3-omap.c new file +645 -0

645 lines not on this page · raw message

drivers/usb/dwc3/dwc3-pci.c new file +272 -0

272 lines not on this page · raw message

drivers/usb/dwc3/dwc3-qcom.c new file +130 -0

130 lines not on this page · raw message

drivers/usb/dwc3/dwc3-st.c new file +367 -0

367 lines not on this page · raw message

drivers/usb/dwc3/ep0.c new file +1092 -0

1,092 lines not on this page · raw message

drivers/usb/dwc3/gadget.c new file +2824 -0

2,824 lines not on this page · raw message

drivers/usb/dwc3/gadget.h new file +107 -0

107 lines not on this page · raw message

drivers/usb/dwc3/host.c new file +91 -0

91 lines not on this page · raw message

drivers/usb/dwc3/io.h new file +70 -0

70 lines not on this page · raw message

drivers/usb/dwc3/platform_data.h new file +47 -0

47 lines not on this page · raw message

drivers/usb/dwc3/trace.c new file +19 -0
new file mode 100644
index 0000000..6cd1664

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/trace.h new file +247 -0

247 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.9.5

Part of the diff is not shown here. View the raw message.

#21 lore raw

PATCH 8/40 usb: dwc3: remove un-used files from dwc3 folder

In reply to Kishon Vijay Abraham I

removed un-used/un-supported files from dwc3. These files can be added later as and when the support is added.

---
 drivers/usb/dwc3/Kconfig         |  120 -------
 drivers/usb/dwc3/debug.c         |   32 --
 drivers/usb/dwc3/debug.h         |  228 -------------
 drivers/usb/dwc3/debugfs.c       |  690 --------------------------------------
 drivers/usb/dwc3/dwc3-exynos.c   |  301 -----------------
 drivers/usb/dwc3/dwc3-keystone.c |  197 -----------
 drivers/usb/dwc3/dwc3-pci.c      |  272 ---------------
 drivers/usb/dwc3/dwc3-qcom.c     |  130 -------
 drivers/usb/dwc3/dwc3-st.c       |  367 --------------------
 drivers/usb/dwc3/host.c          |   91 -----
 drivers/usb/dwc3/platform_data.h |   47 ---
 drivers/usb/dwc3/trace.c         |   19 --
 drivers/usb/dwc3/trace.h         |  247 --------------
 13 files changed, 2741 deletions(-)
 delete mode 100644 drivers/usb/dwc3/Kconfig
 delete mode 100644 drivers/usb/dwc3/debug.c
 delete mode 100644 drivers/usb/dwc3/debug.h
 delete mode 100644 drivers/usb/dwc3/debugfs.c
 delete mode 100644 drivers/usb/dwc3/dwc3-exynos.c
 delete mode 100644 drivers/usb/dwc3/dwc3-keystone.c
 delete mode 100644 drivers/usb/dwc3/dwc3-pci.c
 delete mode 100644 drivers/usb/dwc3/dwc3-qcom.c
 delete mode 100644 drivers/usb/dwc3/dwc3-st.c
 delete mode 100644 drivers/usb/dwc3/host.c
 delete mode 100644 drivers/usb/dwc3/platform_data.h
 delete mode 100644 drivers/usb/dwc3/trace.c
 delete mode 100644 drivers/usb/dwc3/trace.h
drivers/usb/dwc3/Kconfig deleted +0 -120
deleted file mode 100644
index 58b5b2c..0000000
@@ -1,120 +0,0 @@
-config USB_DWC3
-	tristate "DesignWare USB3 DRD Core Support"
-	depends on (USB || USB_GADGET) && HAS_DMA
-	select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD
-	help
-	  Say Y or M here if your system has a Dual Role SuperSpeed
-	  USB controller based on the DesignWare USB3 IP Core.
-
-	  If you choose to build this driver is a dynamically linked
-	  module, the module will be called dwc3.ko.
-
-if USB_DWC3
-
-choice
-	bool "DWC3 Mode Selection"
-	default USB_DWC3_DUAL_ROLE if (USB && USB_GADGET)
-	default USB_DWC3_HOST if (USB && !USB_GADGET)
-	default USB_DWC3_GADGET if (!USB && USB_GADGET)
-
-config USB_DWC3_HOST
-	bool "Host only mode"
-	depends on USB=y || USB=USB_DWC3
-	help
-	  Select this when you want to use DWC3 in host mode only,
-	  thereby the gadget feature will be regressed.
-
-config USB_DWC3_GADGET
-	bool "Gadget only mode"
-	depends on USB_GADGET=y || USB_GADGET=USB_DWC3
-	help
-	  Select this when you want to use DWC3 in gadget mode only,
-	  thereby the host feature will be regressed.
-
-config USB_DWC3_DUAL_ROLE
-	bool "Dual Role mode"
-	depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3))
-	help
-	  This is the default mode of working of DWC3 controller where
-	  both host and gadget features are enabled.
-
-endchoice
-
-comment "Platform Glue Driver Support"
-
-config USB_DWC3_OMAP
-	tristate "Texas Instruments OMAP5 and similar Platforms"
-	depends on EXTCON && (ARCH_OMAP2PLUS || COMPILE_TEST)
-	depends on OF
-	default USB_DWC3
-	help
-	  Some platforms from Texas Instruments like OMAP5, DRA7xxx and
-	  AM437x use this IP for USB2/3 functionality.
-
-	  Say 'Y' or 'M' here if you have one such device
-
-config USB_DWC3_EXYNOS
-	tristate "Samsung Exynos Platform"
-	depends on ARCH_EXYNOS && OF || COMPILE_TEST
-	default USB_DWC3
-	help
-	  Recent Exynos5 SoCs ship with one DesignWare Core USB3 IP inside,
-	  say 'Y' or 'M' if you have one such device.
-
-config USB_DWC3_PCI
-	tristate "PCIe-based Platforms"
-	depends on PCI
-	default USB_DWC3
-	help
-	  If you're using the DesignWare Core IP with a PCIe, please say
-	  'Y' or 'M' here.
-
-	  One such PCIe-based platform is Synopsys' PCIe HAPS model of
-	  this IP.
-
-config USB_DWC3_KEYSTONE
-	tristate "Texas Instruments Keystone2 Platforms"
-	depends on ARCH_KEYSTONE || COMPILE_TEST
-	default USB_DWC3
-	help
-	  Support of USB2/3 functionality in TI Keystone2 platforms.
-	  Say 'Y' or 'M' here if you have one such device
-
-config USB_DWC3_ST
-	tristate "STMicroelectronics Platforms"
-	depends on ARCH_STI && OF
-	default USB_DWC3
-	help
-	  STMicroelectronics SoCs with one DesignWare Core USB3 IP
-	  inside (i.e. STiH407).
-	  Say 'Y' or 'M' if you have one such device.
-
-config USB_DWC3_QCOM
-	tristate "Qualcomm Platforms"
-	depends on ARCH_QCOM || COMPILE_TEST
-	default USB_DWC3
-	help
-	  Recent Qualcomm SoCs ship with one DesignWare Core USB3 IP inside,
-	  say 'Y' or 'M' if you have one such device.
-
-comment "Debugging features"
-
-config USB_DWC3_DEBUG
-	bool "Enable Debugging Messages"
-	help
-	  Say Y here to enable debugging messages on DWC3 Driver.
-
-config USB_DWC3_VERBOSE
-	bool "Enable Verbose Debugging Messages"
-	depends on USB_DWC3_DEBUG
-	help
-	  Say Y here to enable verbose debugging messages on DWC3 Driver.
-
-config DWC3_HOST_USB3_LPM_ENABLE
-	bool "Enable USB3 LPM Capability"
-	depends on USB_DWC3_HOST=y || USB_DWC3_DUAL_ROLE=y
-	default n
-	help
-	  Select this when you want to enable USB3 LPM with dwc3 xhci host.
-
-endif
drivers/usb/dwc3/debug.c deleted +0 -32
deleted file mode 100644
index 0be6885..0000000
@@ -1,32 +0,0 @@
-/**
- * debug.c - DesignWare USB3 DRD Controller Debug/Trace Support
- *
- * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
- *
- * Author: Felipe Balbi <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "debug.h"
-
-void dwc3_trace(void (*trace)(struct va_format *), const char *fmt, ...)
-{
-	struct va_format vaf;
-	va_list args;
-
-	va_start(args, fmt);
-	vaf.fmt = fmt;
-	vaf.va = &args;
-
-	trace(&vaf);
-
-	va_end(args);
-}
drivers/usb/dwc3/debug.h deleted +0 -228

228 lines not on this page · raw message

drivers/usb/dwc3/debugfs.c deleted +0 -690

690 lines not on this page · raw message

drivers/usb/dwc3/dwc3-exynos.c deleted +0 -301

301 lines not on this page · raw message

drivers/usb/dwc3/dwc3-keystone.c deleted +0 -197

197 lines not on this page · raw message

drivers/usb/dwc3/dwc3-pci.c deleted +0 -272

272 lines not on this page · raw message

drivers/usb/dwc3/dwc3-qcom.c deleted +0 -130

130 lines not on this page · raw message

drivers/usb/dwc3/dwc3-st.c deleted +0 -367

367 lines not on this page · raw message

drivers/usb/dwc3/host.c deleted +0 -91

91 lines not on this page · raw message

drivers/usb/dwc3/platform_data.h deleted +0 -47

47 lines not on this page · raw message

drivers/usb/dwc3/trace.c deleted +0 -19
deleted file mode 100644
index 6cd1664..0000000
@@ -1,19 +0,0 @@
-/**
- * trace.c - DesignWare USB3 DRD Controller Trace Support
- *
- * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
- *
- * Author: Felipe Balbi <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#define CREATE_TRACE_POINTS
-#include "trace.h"
drivers/usb/dwc3/trace.h deleted +0 -247

247 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#23 lore raw

PATCH 9/40 usb: dwc3: Modify the file headers to u-boot format

In reply to Kishon Vijay Abraham I

Modified the file header to the format that is used in u-boot. Also included in the header, the commit in linux kernel from which each of these files are added.

---
 drivers/usb/dwc3/core.c      |   15 +++++----------
 drivers/usb/dwc3/core.h      |   15 +++++++--------
 drivers/usb/dwc3/dwc3-omap.c |   14 ++++++--------
 drivers/usb/dwc3/ep0.c       |   14 ++++++--------
 drivers/usb/dwc3/gadget.c    |   14 ++++++--------
 drivers/usb/dwc3/gadget.h    |   16 ++++++++--------
 drivers/usb/dwc3/io.h        |   15 +++++++--------
 7 files changed, 45 insertions(+), 58 deletions(-)
drivers/usb/dwc3/core.c +5 -10
index 25ddc39..b79a8b3 100644
@@ -1,22 +1,17 @@
 /**
  * core.c - DesignWare USB3 DRD Controller Core file
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: Felipe Balbi <[email protected]>,
  *	    Sebastian Andrzej Siewior <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * commit cd72f890d2 : usb: dwc3: core: enable phy suspend quirk on non-FPGA
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier:     GPL-2.0
  */
 
 #include <linux/version.h>
drivers/usb/dwc3/core.h +7 -8
index 4bb9aa6..09cec53 100644
@@ -1,19 +1,18 @@
 /**
  * core.h - DesignWare USB3 DRD Core Header
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: Felipe Balbi <[email protected]>,
  *	    Sebastian Andrzej Siewior <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/core.h) and ported
+ * to uboot.
+ *
+ * commit 460d098cb6 : usb: dwc3: make HIRD threshold configurable
+ *
+ * SPDX-License-Identifier:     GPL-2.0
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #ifndef __DRIVERS_USB_DWC3_CORE_H
drivers/usb/dwc3/dwc3-omap.c +6 -8
index 172d64e..12b57cf 100644
@@ -1,19 +1,17 @@
 /**
  * dwc3-omap.c - OMAP Specific Glue layer
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: Felipe Balbi <[email protected]>,
  *	    Sebastian Andrzej Siewior <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/dwc3-omap.c) and ported
+ * to uboot.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * commit 7ee2566ff5 : usb: dwc3: dwc3-omap: get rid of ->prepare()/->complete()
+ *
+ * SPDX-License-Identifier:     GPL-2.0
  */
 
 #include <linux/module.h>
drivers/usb/dwc3/ep0.c +6 -8
index 1bc77a3..c9fcb77 100644
@@ -1,19 +1,17 @@
 /**
  * ep0.c - DesignWare USB3 DRD Controller Endpoint 0 Handling
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: Felipe Balbi <[email protected]>,
  *	    Sebastian Andrzej Siewior <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/ep0.c) and ported
+ * to uboot.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * commit c00552ebaf : Merge 3.18-rc7 into usb-next
+ *
+ * SPDX-License-Identifier:     GPL-2.0
  */
 
 #include <linux/kernel.h>
drivers/usb/dwc3/gadget.c +6 -8
index f03b136..0aefc5c 100644
@@ -1,19 +1,17 @@
 /**
  * gadget.c - DesignWare USB3 DRD Controller Gadget Framework Link
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: Felipe Balbi <[email protected]>,
  *	    Sebastian Andrzej Siewior <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/gadget.c) and ported
+ * to uboot.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * commit 8e74475b0e : usb: dwc3: gadget: use udc-core's reset notifier
+ *
+ * SPDX-License-Identifier:     GPL-2.0
  */
 
 #include <linux/kernel.h>
drivers/usb/dwc3/gadget.h +8 -8
index 18ae3ea..042e247 100644
@@ -1,19 +1,19 @@
 /**
  * gadget.h - DesignWare USB3 DRD Gadget Header
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: Felipe Balbi <[email protected]>,
  *	    Sebastian Andrzej Siewior <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/gadget.h) and ported
+ * to uboot.
+ *
+ * commit 7a60855972 : usb: dwc3: gadget: fix set_halt() bug with pending
+		       transfers
+ *
+ * SPDX-License-Identifier:     GPL-2.0
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #ifndef __DRIVERS_USB_DWC3_GADGET_H
drivers/usb/dwc3/io.h +7 -8
index 6a79c8e..87a1ae6 100644
@@ -1,19 +1,18 @@
 /**
  * io.h - DesignWare USB3 DRD IO Header
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: Felipe Balbi <[email protected]>,
  *	    Sebastian Andrzej Siewior <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/io.h) and ported
+ * to uboot.
+ *
+ * commit 2c4cbe6e5a : usb: dwc3: add tracepoints to aid debugging
+ *
+ * SPDX-License-Identifier:     GPL-2.0
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #ifndef __DRIVERS_USB_DWC3_IO_H
Signature · 1 line
1.7.9.5
#24 lore raw

PATCH 9/40 usb: dwc3: Modify the file headers to u-boot format

Hi Kishon,

Quoted 255 lines

Modified the file header to the format that is used in u-boot. Also included in the header, the commit in linux kernel from which each of these files are added.

---
 drivers/usb/dwc3/core.c      |   15 +++++----------
 drivers/usb/dwc3/core.h      |   15 +++++++--------
 drivers/usb/dwc3/dwc3-omap.c |   14 ++++++--------
 drivers/usb/dwc3/ep0.c       |   14 ++++++--------
 drivers/usb/dwc3/gadget.c    |   14 ++++++--------
 drivers/usb/dwc3/gadget.h    |   16 ++++++++--------
 drivers/usb/dwc3/io.h        |   15 +++++++--------
 7 files changed, 45 insertions(+), 58 deletions(-)
drivers/usb/dwc3/core.c +0 -1
index 25ddc39..b79a8b3 100644
@@ -1,22 +1,17 @@
 /**
  * core.c - DesignWare USB3 DRD Controller Core file
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated -

http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com *
* Authors: Felipe Balbi <[email protected]>,
* Sebastian Andrzej Siewior <[email protected]>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * commit cd72f890d2 : usb: dwc3: core: enable phy suspend quirk on non-FPGA *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
<http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0
*/

#include <linux/version.h>

drivers/usb/dwc3/core.h +0 -1
index 4bb9aa6..09cec53 100644
@@ -1,19 +1,18 @@
 /**
  * core.h - DesignWare USB3 DRD Core Header
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated -

http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com *
* Authors: Felipe Balbi <[email protected]>,
* Sebastian Andrzej Siewior <[email protected]>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/core.h) and ported
+ * to uboot.
+ *
+ * commit 460d098cb6 : usb: dwc3: make HIRD threshold configurable
+ *
+ * SPDX-License-Identifier: GPL-2.0
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*/

#ifndef __DRIVERS_USB_DWC3_CORE_H

(quoted diff) +0 -0

b/drivers/usb/dwc3/dwc3-omap.c index 172d64e..12b57cf 100644

drivers/usb/dwc3/dwc3-omap.c +0 -1
@@ -1,19 +1,17 @@
 /**
  * dwc3-omap.c - OMAP Specific Glue layer
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated -

http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com *
* Authors: Felipe Balbi <[email protected]>,
* Sebastian Andrzej Siewior <[email protected]>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/dwc3-omap.c) and ported
+ * to uboot.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * commit 7ee2566ff5 : usb: dwc3: dwc3-omap: get rid of ->prepare()/->complete()
+ *
+ * SPDX-License-Identifier: GPL-2.0
*/

#include <linux/module.h>

drivers/usb/dwc3/ep0.c +0 -1
index 1bc77a3..c9fcb77 100644
@@ -1,19 +1,17 @@
 /**
  * ep0.c - DesignWare USB3 DRD Controller Endpoint 0 Handling
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated -

http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com *
* Authors: Felipe Balbi <[email protected]>,
* Sebastian Andrzej Siewior <[email protected]>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/ep0.c) and ported
+ * to uboot.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * commit c00552ebaf : Merge 3.18-rc7 into usb-next
+ *
+ * SPDX-License-Identifier: GPL-2.0
*/

#include <linux/kernel.h>

drivers/usb/dwc3/gadget.c +0 -1
index f03b136..0aefc5c 100644
@@ -1,19 +1,17 @@
 /**
  * gadget.c - DesignWare USB3 DRD Controller Gadget Framework Link
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated -

http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com *
* Authors: Felipe Balbi <[email protected]>,
* Sebastian Andrzej Siewior <[email protected]>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/gadget.c) and ported
+ * to uboot.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * commit 8e74475b0e : usb: dwc3: gadget: use udc-core's reset notifier
+ *
+ * SPDX-License-Identifier: GPL-2.0
*/

#include <linux/kernel.h>

drivers/usb/dwc3/gadget.h +0 -1
index 18ae3ea..042e247 100644
@@ -1,19 +1,19 @@
 /**
  * gadget.h - DesignWare USB3 DRD Gadget Header
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated -

http://www.ti.com
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com *
* Authors: Felipe Balbi <[email protected]>,
* Sebastian Andrzej Siewior <[email protected]>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/gadget.h) and ported
+ * to uboot.
+ *
+ * commit 7a60855972 : usb: dwc3: gadget: fix set_halt() bug with pending

drivers/usb/dwc3/gadget.h +3 -4
+		       transfers
+ *
+ * SPDX-License-Identifier:     GPL-2.0
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #ifndef __DRIVERS_USB_DWC3_GADGET_H
drivers/usb/dwc3/io.h +0 -1
index 6a79c8e..87a1ae6 100644
@@ -1,19 +1,18 @@
 /**
  * io.h - DesignWare USB3 DRD IO Header
  *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated -

http://www.ti.com
+ * Copyright (C) 2014 Texas Instruments Incorporated -
http://www.ti.com *
* Authors: Felipe Balbi <[email protected]>,
* Sebastian Andrzej Siewior <[email protected]>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
+ * Taken from Linux Kernel v3.19-rc1 (drivers/usb/dwc3/io.h) and ported
+ * to uboot.
+ *
+ * commit 2c4cbe6e5a : usb: dwc3: add tracepoints to aid debugging
+ *
+ * SPDX-License-Identifier: GPL-2.0
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*/

Quoted 1 line

#ifndef __DRIVERS_USB_DWC3_IO_H

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#25 lore raw

PATCH 10/40 usb: dwc3: remove trace_* APIs from dwc3 driver

In reply to Kishon Vijay Abraham I

Removed most of the trace_* APIs from dwc3 driver since tracepoints are not supported in u-boot. Replaced some of the trace_* API with dev_dbg/dev/vdbg.

---
 drivers/usb/dwc3/Makefile |    5 +---
 drivers/usb/dwc3/ep0.c    |   70 ++++++++++++++++++---------------------------
 drivers/usb/dwc3/gadget.c |   17 -----------
 drivers/usb/dwc3/io.h     |   17 -----------
 4 files changed, 29 insertions(+), 80 deletions(-)
drivers/usb/dwc3/Makefile +1 -4
index bb34fbc..afaa767 100644
@@ -1,12 +1,9 @@
-# define_trace.h needs to know how to find our header
-CFLAGS_trace.o				:= -I$(src)
-
 ccflags-$(CONFIG_USB_DWC3_DEBUG)	:= -DDEBUG
 ccflags-$(CONFIG_USB_DWC3_VERBOSE)	+= -DVERBOSE_DEBUG
 
 obj-$(CONFIG_USB_DWC3)			+= dwc3.o
 
-dwc3-y					:= core.o debug.o trace.o
+dwc3-y					:= core.o debug.o
 
 ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
 	dwc3-y				+= host.o
drivers/usb/dwc3/ep0.c +28 -42

231 lines not on this page · raw message

drivers/usb/dwc3/gadget.c +0 -17
index 0aefc5c..ca0f0cd 100644
@@ -265,7 +265,6 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
 	dev_dbg(dwc->dev, "request %p from %s completed %d/%d ===> %d\n",
 			req, dep->name, req->request.actual,
 			req->request.length, status);
-	trace_dwc3_gadget_giveback(req);
 
 	spin_unlock(&dwc->lock);
 	usb_gadget_giveback_request(&dep->endpoint, &req->request);
@@ -277,8 +276,6 @@ int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param)
 	u32		timeout = 500;
 	u32		reg;
 
-	trace_dwc3_gadget_generic_cmd(cmd, param);
-
 	dwc3_writel(dwc->regs, DWC3_DGCMDPAR, param);
 	dwc3_writel(dwc->regs, DWC3_DGCMD, cmd | DWC3_DGCMD_CMDACT);
 
@@ -308,8 +305,6 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
 	u32			timeout = 500;
 	u32			reg;
 
-	trace_dwc3_gadget_ep_cmd(dep, cmd, params);
-
 	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(ep), params->param0);
 	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR1(ep), params->param1);
 	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR2(ep), params->param2);
@@ -704,8 +699,6 @@ static struct usb_request *dwc3_gadget_ep_alloc_request(struct usb_ep *ep,
 	req->epnum	= dep->number;
 	req->dep	= dep;
 
-	trace_dwc3_alloc_request(req);
-
 	return &req->request;
 }
 
@@ -714,7 +707,6 @@ static void dwc3_gadget_ep_free_request(struct usb_ep *ep,
 {
 	struct dwc3_request		*req = to_dwc3_request(request);
 
-	trace_dwc3_free_request(req);
 	kfree(req);
 }
 
@@ -796,8 +788,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
 		trb->ctrl |= DWC3_TRB_CTRL_SID_SOFN(req->request.stream_id);
 
 	trb->ctrl |= DWC3_TRB_CTRL_HWO;
-
-	trace_dwc3_prepare_trb(dep, trb);
 }
 
 /*
@@ -1150,7 +1140,6 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
 
 	dev_vdbg(dwc->dev, "queing request %p to %s length %d\n",
 			request, ep->name, request->length);
-	trace_dwc3_ep_queue(req);
 
 	ret = __dwc3_gadget_ep_queue(dep, req);
 
@@ -1172,8 +1161,6 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
 	unsigned long			flags;
 	int				ret = 0;
 
-	trace_dwc3_ep_dequeue(req);
-
 	spin_lock_irqsave(&dwc->lock, flags);
 
 	list_for_each_entry(r, &dep->request_list, list) {
@@ -1771,8 +1758,6 @@ static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep,
 	unsigned int		s_pkt = 0;
 	unsigned int		trb_status;
 
-	trace_dwc3_complete_trb(dep, trb);
-
 	if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN)
 		/*
 		 * We continue despite the error. There is not much we
@@ -2529,8 +2514,6 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc,
 static void dwc3_process_event_entry(struct dwc3 *dwc,
 		const union dwc3_event *event)
 {
-	trace_dwc3_event(event->raw);
-
 	/* Endpoint IRQ, handle it and return early */
 	if (event->type.is_devspec == 0) {
 		/* depevt */
drivers/usb/dwc3/io.h +0 -17
index 87a1ae6..f9f22b0 100644
@@ -19,7 +19,6 @@
 #define __DRIVERS_USB_DWC3_IO_H
 
 #include <linux/io.h>
-#include "trace.h"
 #include "debug.h"
 #include "core.h"
 
@@ -35,14 +34,6 @@ static inline u32 dwc3_readl(void __iomem *base, u32 offset)
 	 */
 	value = readl(base + offs);
 
-	/*
-	 * When tracing we want to make it easy to find the correct address on
-	 * documentation, so we revert it back to the proper addresses, the
-	 * same way they are described on SNPS documentation
-	 */
-	dwc3_trace(trace_dwc3_readl, "addr %p value %08x",
-			base - DWC3_GLOBALS_REGS_START + offset, value);
-
 	return value;
 }
 
@@ -56,14 +47,6 @@ static inline void dwc3_writel(void __iomem *base, u32 offset, u32 value)
 	 * However, the offsets are given starting from xHCI address space.
 	 */
 	writel(value, base + offs);
-
-	/*
-	 * When tracing we want to make it easy to find the correct address on
-	 * documentation, so we revert it back to the proper addresses, the
-	 * same way they are described on SNPS documentation
-	 */
-	dwc3_trace(trace_dwc3_writel, "addr %p value %08x",
-			base - DWC3_GLOBALS_REGS_START + offset, value);
 }
 
 #endif /* __DRIVERS_USB_DWC3_IO_H */
Signature · 1 line
1.7.9.5
#26 lore raw

PATCH 10/40 usb: dwc3: remove trace_* APIs from dwc3 driver

Hi Kishon,

Quoted 434 lines

Removed most of the trace_* APIs from dwc3 driver since tracepoints are not supported in u-boot. Replaced some of the trace_* API with dev_dbg/dev/vdbg.

---
 drivers/usb/dwc3/Makefile |    5 +---
 drivers/usb/dwc3/ep0.c    |   70
++++++++++++++++++---------------------------
drivers/usb/dwc3/gadget.c |   17 -----------
drivers/usb/dwc3/io.h     |   17 ----------- 4 files changed, 29

insertions(+), 80 deletions(-)

drivers/usb/dwc3/Makefile +0 -4
index bb34fbc..afaa767 100644
@@ -1,12 +1,9 @@
-# define_trace.h needs to know how to find our header
-CFLAGS_trace.o				:= -I$(src)
-
 ccflags-$(CONFIG_USB_DWC3_DEBUG)	:= -DDEBUG
 ccflags-$(CONFIG_USB_DWC3_VERBOSE)	+= -DVERBOSE_DEBUG
 
 obj-$(CONFIG_USB_DWC3)			+= dwc3.o
 
-dwc3-y					:= core.o debug.o

trace.o +dwc3-y := core.o
debug.o
ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST)
$(CONFIG_USB_DWC3_DUAL_ROLE)),) dwc3-y
+= host.o diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index c9fcb77..1751b1d 100644

drivers/usb/dwc3/ep0.c +1 -1
@@ -64,7 +64,7 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc,
 u8 epnum, dma_addr_t buf_dma, 
 	dep = dwc->eps[epnum];
 	if (dep->flags & DWC3_EP_BUSY) {
-		dwc3_trace(trace_dwc3_ep0, "%s still busy",
 dep->name);
+		dev_vdbg(dwc->dev, "%s still busy", dep->name);
 		return 0;
 	}
@@ -84,13 +84,10 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc,

u8 epnum, dma_addr_t buf_dma, params.param0 =
upper_32_bits(dwc->ep0_trb_addr); params.param1 =
lower_32_bits(dwc->ep0_trb_addr);

drivers/usb/dwc3/ep0.c +1 -4
-	trace_dwc3_prepare_trb(dep, trb);
-
 	ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
 			DWC3_DEPCMD_STARTTRANSFER, &params);
 	if (ret < 0) {
-		dwc3_trace(trace_dwc3_ep0, "%s STARTTRANSFER failed",
-				dep->name);
+		dev_dbg(dwc->dev, "%s STARTTRANSFER failed",

dep->name); return ret;

drivers/usb/dwc3/ep0.c +0 -0
 	}
@@ -155,8 +152,7 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep
 *dep, if (dwc->ep0state == EP0_STATUS_PHASE)
 			__dwc3_ep0_do_control_status(dwc,

dwc->eps[direction]); else

drivers/usb/dwc3/ep0.c +0 -2
-			dwc3_trace(trace_dwc3_ep0,
-					"too early for delayed

status");

drivers/usb/dwc3/ep0.c +1 -0
+			dev_dbg(dwc->dev, "too early for delayed

status");

drivers/usb/dwc3/ep0.c +1 -2
 		return 0;
 	}
@@ -220,8 +216,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep,
 struct usb_request *request, 
 	spin_lock_irqsave(&dwc->lock, flags);
 	if (!dep->endpoint.desc) {
-		dwc3_trace(trace_dwc3_ep0,
-				"trying to queue request %p to
 disabled %s",
+		dev_dbg(dwc->dev, "trying to queue request %p to
 disabled %s", request, dep->name);
 		ret = -ESHUTDOWN;
drivers/usb/dwc3/ep0.c +3 -5
 		goto out;
@@ -233,8 +228,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep,
 struct usb_request *request, goto out;
 	}
 
-	dwc3_trace(trace_dwc3_ep0,
-			"queueing request %p to %s length %d state
 '%s'",
+	dev_vdbg(dwc->dev, "queueing request %p to %s length %d
 state '%s'", request, dep->name, request->length,
 			dwc3_ep0_state_string(dwc->ep0state));
@@ -503,13 +497,12 @@ static int dwc3_ep0_set_address(struct dwc3
 *dwc, struct usb_ctrlrequest *ctrl) 
 	addr = le16_to_cpu(ctrl->wValue);
 	if (addr > 127) {
-		dwc3_trace(trace_dwc3_ep0, "invalid device address
 %d", addr);
+		dev_dbg(dwc->dev, "invalid device address %d", addr);
 		return -EINVAL;
 	}
 
 	if (state == USB_STATE_CONFIGURED) {
-		dwc3_trace(trace_dwc3_ep0,
-				"trying to set address when
 configured");
+		dev_dbg(dwc->dev, "trying to set address when
 configured"); return -EINVAL;
drivers/usb/dwc3/ep0.c +9 -9
 	}
@@ -574,7 +567,7 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc,
 struct usb_ctrlrequest *ctrl) dwc3_writel(dwc->regs, DWC3_DCTL, reg);
 
 			dwc->resize_fifos = true;
-			dwc3_trace(trace_dwc3_ep0, "resize FIFOs
 flag SET");
+			dev_dbg(dwc->dev, "resize FIFOs flag SET");
 		}
 		break;
@@ -698,35 +691,35 @@ static int dwc3_ep0_std_request(struct dwc3
 *dwc, struct usb_ctrlrequest *ctrl) 
 	switch (ctrl->bRequest) {
 	case USB_REQ_GET_STATUS:
-		dwc3_trace(trace_dwc3_ep0, "USB_REQ_GET_STATUS");
+		dev_vdbg(dwc->dev, "USB_REQ_GET_STATUS");
 		ret = dwc3_ep0_handle_status(dwc, ctrl);
 		break;
 	case USB_REQ_CLEAR_FEATURE:
-		dwc3_trace(trace_dwc3_ep0, "USB_REQ_CLEAR_FEATURE");
+		dev_vdbg(dwc->dev, "USB_REQ_CLEAR_FEATURE");
 		ret = dwc3_ep0_handle_feature(dwc, ctrl, 0);
 		break;
 	case USB_REQ_SET_FEATURE:
-		dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_FEATURE");
+		dev_vdbg(dwc->dev, "USB_REQ_SET_FEATURE");
 		ret = dwc3_ep0_handle_feature(dwc, ctrl, 1);
 		break;
 	case USB_REQ_SET_ADDRESS:
-		dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ADDRESS");
+		dev_vdbg(dwc->dev, "USB_REQ_SET_ADDRESS");
 		ret = dwc3_ep0_set_address(dwc, ctrl);
 		break;
 	case USB_REQ_SET_CONFIGURATION:
-		dwc3_trace(trace_dwc3_ep0,
 "USB_REQ_SET_CONFIGURATION");
+		dev_vdbg(dwc->dev, "USB_REQ_SET_CONFIGURATION");
 		ret = dwc3_ep0_set_config(dwc, ctrl);
 		break;
 	case USB_REQ_SET_SEL:
-		dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_SEL");
+		dev_vdbg(dwc->dev, "USB_REQ_SET_SEL");
 		ret = dwc3_ep0_set_sel(dwc, ctrl);
 		break;
 	case USB_REQ_SET_ISOCH_DELAY:
-		dwc3_trace(trace_dwc3_ep0,
 "USB_REQ_SET_ISOCH_DELAY");
+		dev_vdbg(dwc->dev, "USB_REQ_SET_ISOCH_DELAY");
 		ret = dwc3_ep0_set_isoch_delay(dwc, ctrl);
 		break;
 	default:
-		dwc3_trace(trace_dwc3_ep0, "Forwarding to gadget
 driver");
+		dev_vdbg(dwc->dev, "Forwarding to gadget driver");
drivers/usb/dwc3/ep0.c +2 -8
 		ret = dwc3_ep0_delegate_req(dwc, ctrl);
 		break;
 	}
@@ -744,8 +737,6 @@ static void dwc3_ep0_inspect_setup(struct dwc3
 *dwc, if (!dwc->gadget_driver)
 		goto out;
 
-	trace_dwc3_ctrl_req(ctrl);
-
 	len = le16_to_cpu(ctrl->wLength);
 	if (!len) {
 		dwc->three_stage_setup = false;
@@ -789,15 +780,13 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc, 
 	trb = dwc->ep0_trb;
 
-	trace_dwc3_complete_trb(ep0, trb);
-
 	r = next_request(&ep0->request_list);
 	if (!r)
 		return;
 
 	status = DWC3_TRB_SIZE_TRBSTS(trb->size);
 	if (status == DWC3_TRBSTS_SETUP_PENDING) {
-		dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
+		dev_dbg(dwc->dev, "Setup Pending received");
 
 		if (r)
 			dwc3_gadget_giveback(ep0, r, -ECONNRESET);
@@ -855,8 +844,6 @@ static void dwc3_ep0_complete_status(struct dwc3
 *dwc, dep = dwc->eps[0];
 	trb = dwc->ep0_trb;
 
-	trace_dwc3_complete_trb(dep, trb);
-
 	if (!list_empty(&dep->request_list)) {
 		r = next_request(&dep->request_list);
 
@@ -868,7 +855,7 @@ static void dwc3_ep0_complete_status(struct dwc3
 *dwc, 
 		ret = dwc3_gadget_set_test_mode(dwc,
 dwc->test_mode_nr); if (ret < 0) {
-			dwc3_trace(trace_dwc3_ep0, "Invalid Test
 #%d",
+			dev_dbg(dwc->dev, "Invalid Test #%d",
 					dwc->test_mode_nr);
 			dwc3_ep0_stall_and_restart(dwc);
drivers/usb/dwc3/ep0.c +4 -4
 			return;
@@ -877,7 +864,7 @@ static void dwc3_ep0_complete_status(struct dwc3
 *dwc, 
 	status = DWC3_TRB_SIZE_TRBSTS(trb->size);
 	if (status == DWC3_TRBSTS_SETUP_PENDING)
-		dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
+		dev_dbg(dwc->dev, "Setup Pending received");
 
 	dwc->ep0state = EP0_SETUP_PHASE;
 	dwc3_ep0_out_start(dwc);
@@ -894,17 +881,17 @@ static void dwc3_ep0_xfer_complete(struct dwc3
 *dwc, 
 	switch (dwc->ep0state) {
 	case EP0_SETUP_PHASE:
-		dwc3_trace(trace_dwc3_ep0, "Setup Phase");
+		dev_vdbg(dwc->dev, "Setup Phase");
 		dwc3_ep0_inspect_setup(dwc, event);
 		break;
 
 	case EP0_DATA_PHASE:
-		dwc3_trace(trace_dwc3_ep0, "Data Phase");
+		dev_vdbg(dwc->dev, "Data Phase");
 		dwc3_ep0_complete_data(dwc, event);
 		break;
 
 	case EP0_STATUS_PHASE:
-		dwc3_trace(trace_dwc3_ep0, "Status Phase");
+		dev_vdbg(dwc->dev, "Status Phase");
 		dwc3_ep0_complete_status(dwc, event);
 		break;
 	default:
@@ -980,7 +967,7 @@ static int dwc3_ep0_start_control_status(struct

dwc3_ep *dep) static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep) {

drivers/usb/dwc3/ep0.c +2 -2
 	if (dwc->resize_fifos) {
-		dwc3_trace(trace_dwc3_ep0, "Resizing FIFOs");
+		dev_dbg(dwc->dev, "Resizing FIFOs");
 		dwc3_gadget_resize_tx_fifos(dwc);
 		dwc->resize_fifos = 0;
 	}
@@ -1021,7 +1008,7 @@ static void dwc3_ep0_xfernotready(struct dwc3
 *dwc, 
 	switch (event->status) {
 	case DEPEVT_STATUS_CONTROL_DATA:
-		dwc3_trace(trace_dwc3_ep0, "Control Data");
+		dev_vdbg(dwc->dev, "Control Data");
 
 		/*
 		 * We already have a DATA transfer in the

controller's cache, @@ -1035,8 +1022,7 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc, if (dwc->ep0_expect_in !=
event->endpoint_number) { struct dwc3_ep *dep =
dwc->eps[dwc->ep0_expect_in];

drivers/usb/dwc3/ep0.c +0 -2
-			dwc3_trace(trace_dwc3_ep0,
-					"Wrong direction for Data

phase");

drivers/usb/dwc3/ep0.c +1 -0
+			dev_vdbg(dwc->dev, "Wrong direction for Data

phase"); dwc3_ep0_end_control_data(dwc, dep);

drivers/usb/dwc3/ep0.c +3 -3
 			dwc3_ep0_stall_and_restart(dwc);
 			return;
@@ -1048,13 +1034,13 @@ static void dwc3_ep0_xfernotready(struct dwc3
 *dwc, if (dwc->ep0_next_event != DWC3_EP0_NRDY_STATUS)
 			return;
 
-		dwc3_trace(trace_dwc3_ep0, "Control Status");
+		dev_vdbg(dwc->dev, "Control Status");
 
 		dwc->ep0state = EP0_STATUS_PHASE;
 
 		if (dwc->delayed_status) {
 			WARN_ON_ONCE(event->endpoint_number != 1);
-			dwc3_trace(trace_dwc3_ep0, "Delayed Status");
+			dev_vdbg(dwc->dev, "Delayed Status");
 			return;
 		}
 
@@ -1067,7 +1053,7 @@ void dwc3_ep0_interrupt(struct dwc3 *dwc,
 {
 	u8			epnum = event->endpoint_number;
 
-	dwc3_trace(trace_dwc3_ep0, "%s while ep%d%s in state '%s'",
+	dev_dbg(dwc->dev, "%s while ep%d%s in state '%s'",
 			dwc3_ep_event_string(event->endpoint_event),
 			epnum >> 1, (epnum & 1) ? "in" : "out",
 			dwc3_ep0_state_string(dwc->ep0state));
drivers/usb/dwc3/gadget.c +0 -0
index 0aefc5c..ca0f0cd 100644
@@ -265,7 +265,6 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep,

struct dwc3_request *req, dev_dbg(dwc->dev, "request %p from %s completed %d/%d ===> %d\n", req, dep->name, req->request.actual,

drivers/usb/dwc3/gadget.c +0 -15
 			req->request.length, status);
-	trace_dwc3_gadget_giveback(req);
 
 	spin_unlock(&dwc->lock);
 	usb_gadget_giveback_request(&dep->endpoint, &req->request);
@@ -277,8 +276,6 @@ int dwc3_send_gadget_generic_command(struct dwc3
 *dwc, unsigned cmd, u32 param) u32		timeout = 500;
 	u32		reg;
 
-	trace_dwc3_gadget_generic_cmd(cmd, param);
-
 	dwc3_writel(dwc->regs, DWC3_DGCMDPAR, param);
 	dwc3_writel(dwc->regs, DWC3_DGCMD, cmd | DWC3_DGCMD_CMDACT);
 
@@ -308,8 +305,6 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc,
 unsigned ep, u32			timeout = 500;
 	u32			reg;
 
-	trace_dwc3_gadget_ep_cmd(dep, cmd, params);
-
 	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(ep), params->param0);
 	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR1(ep), params->param1);
 	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR2(ep), params->param2);
@@ -704,8 +699,6 @@ static struct usb_request
 *dwc3_gadget_ep_alloc_request(struct usb_ep *ep, req->epnum	=
 dep->number; req->dep	= dep;
 
-	trace_dwc3_alloc_request(req);
-
 	return &req->request;
 }
 
@@ -714,7 +707,6 @@ static void dwc3_gadget_ep_free_request(struct
 usb_ep *ep, {
 	struct dwc3_request		*req =
 to_dwc3_request(request); 
-	trace_dwc3_free_request(req);
 	kfree(req);
 }
 
@@ -796,8 +788,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep
 *dep, trb->ctrl |= DWC3_TRB_CTRL_SID_SOFN(req->request.stream_id);
 
 	trb->ctrl |= DWC3_TRB_CTRL_HWO;
-
-	trace_dwc3_prepare_trb(dep, trb);
 }
 
 /*
@@ -1150,7 +1140,6 @@ static int dwc3_gadget_ep_queue(struct usb_ep
 *ep, struct usb_request *request, 
 	dev_vdbg(dwc->dev, "queing request %p to %s length %d\n",
 			request, ep->name, request->length);
-	trace_dwc3_ep_queue(req);
 
 	ret = __dwc3_gadget_ep_queue(dep, req);
 
@@ -1172,8 +1161,6 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep
 *ep, unsigned long			flags;
 	int				ret = 0;
 
-	trace_dwc3_ep_dequeue(req);
-
 	spin_lock_irqsave(&dwc->lock, flags);
 
 	list_for_each_entry(r, &dep->request_list, list) {
@@ -1771,8 +1758,6 @@ static int __dwc3_cleanup_done_trbs(struct dwc3
 *dwc, struct dwc3_ep *dep, unsigned int		s_pkt = 0;
 	unsigned int		trb_status;
 
-	trace_dwc3_complete_trb(dep, trb);
-
 	if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN)
 		/*
 		 * We continue despite the error. There is not much

we @@ -2529,8 +2514,6 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc, static void dwc3_process_event_entry(struct dwc3 *dwc,

drivers/usb/dwc3/gadget.c +0 -2
 		const union dwc3_event *event)
 {
-	trace_dwc3_event(event->raw);
-
 	/* Endpoint IRQ, handle it and return early */
 	if (event->type.is_devspec == 0) {
 		/* depevt */
drivers/usb/dwc3/io.h +0 -1
index 87a1ae6..f9f22b0 100644
@@ -19,7 +19,6 @@
 #define __DRIVERS_USB_DWC3_IO_H
 
 #include <linux/io.h>
-#include "trace.h"
 #include "debug.h"
 #include "core.h"
 
@@ -35,14 +34,6 @@ static inline u32 dwc3_readl(void __iomem *base,

u32 offset) */

drivers/usb/dwc3/io.h +0 -2
 	value = readl(base + offs);
 
-	/*
-	 * When tracing we want to make it easy to find the correct

address on

drivers/usb/dwc3/io.h +0 -1
-	 * documentation, so we revert it back to the proper

addresses, the

drivers/usb/dwc3/io.h +0 -4
-	 * same way they are described on SNPS documentation
-	 */
-	dwc3_trace(trace_dwc3_readl, "addr %p value %08x",
-			base - DWC3_GLOBALS_REGS_START + offset,

value); -

drivers/usb/dwc3/io.h +0 -0
 	return value;
 }
@@ -56,14 +47,6 @@ static inline void dwc3_writel(void __iomem *base,
 u32 offset, u32 value)
 	 * However, the offsets are given starting from xHCI address

space. */

drivers/usb/dwc3/io.h +0 -3
 	writel(value, base + offs);
-
-	/*
-	 * When tracing we want to make it easy to find the correct

address on

drivers/usb/dwc3/io.h +0 -1
-	 * documentation, so we revert it back to the proper

addresses, the

drivers/usb/dwc3/io.h +0 -4
-	 * same way they are described on SNPS documentation
-	 */
-	dwc3_trace(trace_dwc3_writel, "addr %p value %08x",
-			base - DWC3_GLOBALS_REGS_START + offset,

value); }

Quoted 1 line

#endif /* __DRIVERS_USB_DWC3_IO_H */

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#27 lore raw

PATCH 11/40 usb: dwc3: fix dwc3 header files

In reply to Kishon Vijay Abraham I

Changed the header files included in core.h and io.h to the u-boot header files so that these files can be included in other dwc3 source files and be compiled in uboot. Also added otg.h which has the defines for dr_mode.

---
 drivers/usb/dwc3/core.h |   13 ++-----------
 drivers/usb/dwc3/io.h   |    4 +---
 include/linux/usb/otg.h |   20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 include/linux/usb/otg.h
drivers/usb/dwc3/core.h +2 -11
index 09cec53..a7a7082 100644
@@ -18,20 +18,11 @@
 #ifndef __DRIVERS_USB_DWC3_CORE_H
 #define __DRIVERS_USB_DWC3_CORE_H
 
-#include <linux/device.h>
-#include <linux/spinlock.h>
 #include <linux/ioport.h>
-#include <linux/list.h>
-#include <linux/dma-mapping.h>
-#include <linux/mm.h>
-#include <linux/debugfs.h>
 
 #include <linux/usb/ch9.h>
-#include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
 
-#include <linux/phy/phy.h>
-
 #define DWC3_MSG_MAX	500
 
 /* Global constants */
@@ -981,7 +972,7 @@ struct dwc3_gadget_ep_cmd_params {
 void dwc3_set_mode(struct dwc3 *dwc, u32 mode);
 int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc);
 
-#if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)
+#ifdef CONFIG_USB_DWC3_HOST
 int dwc3_host_init(struct dwc3 *dwc);
 void dwc3_host_exit(struct dwc3 *dwc);
 #else
@@ -991,7 +982,7 @@ static inline void dwc3_host_exit(struct dwc3 *dwc)
 { }
 #endif
 
-#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)
+#ifdef CONFIG_USB_DWC3_GADGET
 int dwc3_gadget_init(struct dwc3 *dwc);
 void dwc3_gadget_exit(struct dwc3 *dwc);
 int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode);
drivers/usb/dwc3/io.h +1 -3
index f9f22b0..b6da135 100644
@@ -18,9 +18,7 @@
 #ifndef __DRIVERS_USB_DWC3_IO_H
 #define __DRIVERS_USB_DWC3_IO_H
 
-#include <linux/io.h>
-#include "debug.h"
-#include "core.h"
+#include <asm/io.h>
 
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
 {
include/linux/usb/otg.h new file +20 -0
new file mode 100644
index 0000000..7ec5550
@@ -0,0 +1,20 @@
+/* include/linux/usb/otg.h
+ *
+ * Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * USB OTG (On The Go) defines
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __LINUX_USB_OTG_H
+#define __LINUX_USB_OTG_H
+
+enum usb_dr_mode {
+	USB_DR_MODE_UNKNOWN,
+	USB_DR_MODE_HOST,
+	USB_DR_MODE_PERIPHERAL,
+	USB_DR_MODE_OTG,
+};
+
+#endif /* __LINUX_USB_OTG_H */
Signature · 1 line
1.7.9.5
#28 lore raw

PATCH 11/40 usb: dwc3: fix dwc3 header files

Hi Kishon,

Quoted 88 lines

Changed the header files included in core.h and io.h to the u-boot header files so that these files can be included in other dwc3 source files and be compiled in uboot. Also added otg.h which has the defines for dr_mode.

---
 drivers/usb/dwc3/core.h |   13 ++-----------
 drivers/usb/dwc3/io.h   |    4 +---
 include/linux/usb/otg.h |   20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 include/linux/usb/otg.h
drivers/usb/dwc3/core.h +0 -10
index 09cec53..a7a7082 100644
@@ -18,20 +18,11 @@
 #ifndef __DRIVERS_USB_DWC3_CORE_H
 #define __DRIVERS_USB_DWC3_CORE_H
 
-#include <linux/device.h>
-#include <linux/spinlock.h>
 #include <linux/ioport.h>
-#include <linux/list.h>
-#include <linux/dma-mapping.h>
-#include <linux/mm.h>
-#include <linux/debugfs.h>
 
 #include <linux/usb/ch9.h>
-#include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
 
-#include <linux/phy/phy.h>
-
 #define DWC3_MSG_MAX	500
 
 /* Global constants */
@@ -981,7 +972,7 @@ struct dwc3_gadget_ep_cmd_params {
 void dwc3_set_mode(struct dwc3 *dwc, u32 mode);
 int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc);
 
-#if IS_ENABLED(CONFIG_USB_DWC3_HOST) ||

IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) +#ifdef CONFIG_USB_DWC3_HOST
int dwc3_host_init(struct dwc3 *dwc);
void dwc3_host_exit(struct dwc3 *dwc);
#else

drivers/usb/dwc3/core.h +0 -1
@@ -991,7 +982,7 @@ static inline void dwc3_host_exit(struct dwc3
 *dwc) { }
 #endif
 
-#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) ||

IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) +#ifdef CONFIG_USB_DWC3_GADGET
int dwc3_gadget_init(struct dwc3 *dwc);
void dwc3_gadget_exit(struct dwc3 *dwc);
int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode);

drivers/usb/dwc3/io.h +1 -3
index f9f22b0..b6da135 100644
@@ -18,9 +18,7 @@
 #ifndef __DRIVERS_USB_DWC3_IO_H
 #define __DRIVERS_USB_DWC3_IO_H
 
-#include <linux/io.h>
-#include "debug.h"
-#include "core.h"
+#include <asm/io.h>
 
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
 {
include/linux/usb/otg.h new file +3 -0
new file mode 100644
index 0000000..7ec5550
@@ -0,0 +1,20 @@
+/* include/linux/usb/otg.h
+ *
+ * Copyright (c) 2015 Texas Instruments Incorporated -

http://www.ti.com
+ *
+ * USB OTG (On The Go) defines
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */

include/linux/usb/otg.h new file +2 -0
+
+#ifndef __LINUX_USB_OTG_H

include/linux/usb/otg.h line 20

Quoted 10 lines
include/linux/usb/otg.h new file +10 -0
+#define __LINUX_USB_OTG_H
+
+enum usb_dr_mode {
+	USB_DR_MODE_UNKNOWN,
+	USB_DR_MODE_HOST,
+	USB_DR_MODE_PERIPHERAL,
+	USB_DR_MODE_OTG,
+};
+
+#endif /* __LINUX_USB_OTG_H */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#29 lore raw

PATCH 12/40 usb: dwc3: remove pm related operations from dwc3 driver

In reply to Kishon Vijay Abraham I

Removed all pm related operations including pm_runtime APIs, suspend/resume hooks as support for these are not present in u-boot.

---
 drivers/usb/dwc3/core.c      |   96 ------------------------------------------
 drivers/usb/dwc3/core.h      |   16 -------
 drivers/usb/dwc3/dwc3-omap.c |   61 +++------------------------
 drivers/usb/dwc3/gadget.c    |   55 ------------------------
 4 files changed, 5 insertions(+), 223 deletions(-)
drivers/usb/dwc3/core.c +0 -96
index b79a8b3..ebfb6ca 100644
@@ -20,7 +20,6 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
@@ -884,10 +883,6 @@ static int dwc3_probe(struct platform_device *pdev)
 		dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
 	}
 
-	pm_runtime_enable(dev);
-	pm_runtime_get_sync(dev);
-	pm_runtime_forbid(dev);
-
 	dwc3_cache_hwparams(dwc);
 
 	ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
@@ -937,8 +932,6 @@ static int dwc3_probe(struct platform_device *pdev)
 		goto err3;
 	}
 
-	pm_runtime_allow(dev);
-
 	return 0;
 
 err3:
@@ -980,97 +973,9 @@ static int dwc3_remove(struct platform_device *pdev)
 
 	dwc3_core_exit(dwc);
 
-	pm_runtime_put_sync(&pdev->dev);
-	pm_runtime_disable(&pdev->dev);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int dwc3_suspend(struct device *dev)
-{
-	struct dwc3	*dwc = dev_get_drvdata(dev);
-	unsigned long	flags;
-
-	spin_lock_irqsave(&dwc->lock, flags);
-
-	switch (dwc->dr_mode) {
-	case USB_DR_MODE_PERIPHERAL:
-	case USB_DR_MODE_OTG:
-		dwc3_gadget_suspend(dwc);
-		/* FALLTHROUGH */
-	case USB_DR_MODE_HOST:
-	default:
-		dwc3_event_buffers_cleanup(dwc);
-		break;
-	}
-
-	dwc->gctl = dwc3_readl(dwc->regs, DWC3_GCTL);
-	spin_unlock_irqrestore(&dwc->lock, flags);
-
-	usb_phy_shutdown(dwc->usb3_phy);
-	usb_phy_shutdown(dwc->usb2_phy);
-	phy_exit(dwc->usb2_generic_phy);
-	phy_exit(dwc->usb3_generic_phy);
-
 	return 0;
 }
 
-static int dwc3_resume(struct device *dev)
-{
-	struct dwc3	*dwc = dev_get_drvdata(dev);
-	unsigned long	flags;
-	int		ret;
-
-	usb_phy_init(dwc->usb3_phy);
-	usb_phy_init(dwc->usb2_phy);
-	ret = phy_init(dwc->usb2_generic_phy);
-	if (ret < 0)
-		return ret;
-
-	ret = phy_init(dwc->usb3_generic_phy);
-	if (ret < 0)
-		goto err_usb2phy_init;
-
-	spin_lock_irqsave(&dwc->lock, flags);
-
-	dwc3_event_buffers_setup(dwc);
-	dwc3_writel(dwc->regs, DWC3_GCTL, dwc->gctl);
-
-	switch (dwc->dr_mode) {
-	case USB_DR_MODE_PERIPHERAL:
-	case USB_DR_MODE_OTG:
-		dwc3_gadget_resume(dwc);
-		/* FALLTHROUGH */
-	case USB_DR_MODE_HOST:
-	default:
-		/* do nothing */
-		break;
-	}
-
-	spin_unlock_irqrestore(&dwc->lock, flags);
-
-	pm_runtime_disable(dev);
-	pm_runtime_set_active(dev);
-	pm_runtime_enable(dev);
-
-	return 0;
-
-err_usb2phy_init:
-	phy_exit(dwc->usb2_generic_phy);
-
-	return ret;
-}
-
-static const struct dev_pm_ops dwc3_dev_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume)
-};
-
-#define DWC3_PM_OPS	&(dwc3_dev_pm_ops)
-#else
-#define DWC3_PM_OPS	NULL
-#endif
-
 #ifdef CONFIG_OF
 static const struct of_device_id of_dwc3_match[] = {
 	{
@@ -1102,7 +1007,6 @@ static struct platform_driver dwc3_driver = {
 		.name	= "dwc3",
 		.of_match_table	= of_match_ptr(of_dwc3_match),
 		.acpi_match_table = ACPI_PTR(dwc3_acpi_match),
-		.pm	= DWC3_PM_OPS,
 	},
 };
 
drivers/usb/dwc3/core.h +0 -16
index a7a7082..97f71ad 100644
@@ -1012,20 +1012,4 @@ static inline int dwc3_send_gadget_generic_command(struct dwc3 *dwc,
 { return 0; }
 #endif
 
-/* power management interface */
-#if !IS_ENABLED(CONFIG_USB_DWC3_HOST)
-int dwc3_gadget_suspend(struct dwc3 *dwc);
-int dwc3_gadget_resume(struct dwc3 *dwc);
-#else
-static inline int dwc3_gadget_suspend(struct dwc3 *dwc)
-{
-	return 0;
-}
-
-static inline int dwc3_gadget_resume(struct dwc3 *dwc)
-{
-	return 0;
-}
-#endif /* !IS_ENABLED(CONFIG_USB_DWC3_HOST) */
-
 #endif /* __DRIVERS_USB_DWC3_CORE_H */
drivers/usb/dwc3/dwc3-omap.c +5 -56

119 lines not on this page · raw message

drivers/usb/dwc3/gadget.c +0 -55

58 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#30 lore raw

PATCH 12/40 usb: dwc3: remove pm related operations from dwc3 driver

Hi Kishon,

Quoted 359 lines

Removed all pm related operations including pm_runtime APIs, suspend/resume hooks as support for these are not present in u-boot.

---
 drivers/usb/dwc3/core.c      |   96
------------------------------------------
drivers/usb/dwc3/core.h      |   16 -------
drivers/usb/dwc3/dwc3-omap.c |   61 +++------------------------
drivers/usb/dwc3/gadget.c    |   55 ------------------------ 4 files

changed, 5 insertions(+), 223 deletions(-)

drivers/usb/dwc3/core.c +0 -96
index b79a8b3..ebfb6ca 100644
@@ -20,7 +20,6 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
@@ -884,10 +883,6 @@ static int dwc3_probe(struct platform_device
 *pdev) dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
 	}
 
-	pm_runtime_enable(dev);
-	pm_runtime_get_sync(dev);
-	pm_runtime_forbid(dev);
-
 	dwc3_cache_hwparams(dwc);
 
 	ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
@@ -937,8 +932,6 @@ static int dwc3_probe(struct platform_device
 *pdev) goto err3;
 	}
 
-	pm_runtime_allow(dev);
-
 	return 0;
 
 err3:
@@ -980,97 +973,9 @@ static int dwc3_remove(struct platform_device
 *pdev) 
 	dwc3_core_exit(dwc);
 
-	pm_runtime_put_sync(&pdev->dev);
-	pm_runtime_disable(&pdev->dev);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int dwc3_suspend(struct device *dev)
-{
-	struct dwc3	*dwc = dev_get_drvdata(dev);
-	unsigned long	flags;
-
-	spin_lock_irqsave(&dwc->lock, flags);
-
-	switch (dwc->dr_mode) {
-	case USB_DR_MODE_PERIPHERAL:
-	case USB_DR_MODE_OTG:
-		dwc3_gadget_suspend(dwc);
-		/* FALLTHROUGH */
-	case USB_DR_MODE_HOST:
-	default:
-		dwc3_event_buffers_cleanup(dwc);
-		break;
-	}
-
-	dwc->gctl = dwc3_readl(dwc->regs, DWC3_GCTL);
-	spin_unlock_irqrestore(&dwc->lock, flags);
-
-	usb_phy_shutdown(dwc->usb3_phy);
-	usb_phy_shutdown(dwc->usb2_phy);
-	phy_exit(dwc->usb2_generic_phy);
-	phy_exit(dwc->usb3_generic_phy);
-
 	return 0;
 }
 
-static int dwc3_resume(struct device *dev)
-{
-	struct dwc3	*dwc = dev_get_drvdata(dev);
-	unsigned long	flags;
-	int		ret;
-
-	usb_phy_init(dwc->usb3_phy);
-	usb_phy_init(dwc->usb2_phy);
-	ret = phy_init(dwc->usb2_generic_phy);
-	if (ret < 0)
-		return ret;
-
-	ret = phy_init(dwc->usb3_generic_phy);
-	if (ret < 0)
-		goto err_usb2phy_init;
-
-	spin_lock_irqsave(&dwc->lock, flags);
-
-	dwc3_event_buffers_setup(dwc);
-	dwc3_writel(dwc->regs, DWC3_GCTL, dwc->gctl);
-
-	switch (dwc->dr_mode) {
-	case USB_DR_MODE_PERIPHERAL:
-	case USB_DR_MODE_OTG:
-		dwc3_gadget_resume(dwc);
-		/* FALLTHROUGH */
-	case USB_DR_MODE_HOST:
-	default:
-		/* do nothing */
-		break;
-	}
-
-	spin_unlock_irqrestore(&dwc->lock, flags);
-
-	pm_runtime_disable(dev);
-	pm_runtime_set_active(dev);
-	pm_runtime_enable(dev);
-
-	return 0;
-
-err_usb2phy_init:
-	phy_exit(dwc->usb2_generic_phy);
-
-	return ret;
-}
-
-static const struct dev_pm_ops dwc3_dev_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume)
-};
-
-#define DWC3_PM_OPS	&(dwc3_dev_pm_ops)
-#else
-#define DWC3_PM_OPS	NULL
-#endif
-
 #ifdef CONFIG_OF
 static const struct of_device_id of_dwc3_match[] = {
 	{
@@ -1102,7 +1007,6 @@ static struct platform_driver dwc3_driver = {
 		.name	= "dwc3",
 		.of_match_table	= of_match_ptr(of_dwc3_match),
 		.acpi_match_table = ACPI_PTR(dwc3_acpi_match),
-		.pm	= DWC3_PM_OPS,
 	},
 };
 
drivers/usb/dwc3/core.h +0 -16
index a7a7082..97f71ad 100644
@@ -1012,20 +1012,4 @@ static inline int
 dwc3_send_gadget_generic_command(struct dwc3 *dwc, { return 0; }
 #endif
 
-/* power management interface */
-#if !IS_ENABLED(CONFIG_USB_DWC3_HOST)
-int dwc3_gadget_suspend(struct dwc3 *dwc);
-int dwc3_gadget_resume(struct dwc3 *dwc);
-#else
-static inline int dwc3_gadget_suspend(struct dwc3 *dwc)
-{
-	return 0;
-}
-
-static inline int dwc3_gadget_resume(struct dwc3 *dwc)
-{
-	return 0;
-}
-#endif /* !IS_ENABLED(CONFIG_USB_DWC3_HOST) */
-
 #endif /* __DRIVERS_USB_DWC3_CORE_H */
(quoted diff) +0 -0

b/drivers/usb/dwc3/dwc3-omap.c index 12b57cf..ce2d6a6 100644

drivers/usb/dwc3/dwc3-omap.c +5 -20
@@ -20,7 +20,6 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/dwc3-omap.h>
-#include <linux/pm_runtime.h>
 #include <linux/dma-mapping.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
@@ -509,13 +508,6 @@ static int dwc3_omap_probe(struct
 platform_device *pdev) omap->vbus_reg	= vbus_reg;
 	dev->dma_mask	= &dwc3_omap_dma_mask;
 
-	pm_runtime_enable(dev);
-	ret = pm_runtime_get_sync(dev);
-	if (ret < 0) {
-		dev_err(dev, "get_sync failed with err %d\n", ret);
-		goto err0;
-	}
-
 	dwc3_omap_map_offset(omap);
 	dwc3_omap_set_utmi_mode(omap);
 
@@ -528,38 +520,33 @@ static int dwc3_omap_probe(struct
 platform_device *pdev) if (ret) {
 		dev_err(dev, "failed to request IRQ #%d --> %d\n",
 				omap->irq, ret);
-		goto err1;
+		goto err0;
 	}
 
 	dwc3_omap_enable_irqs(omap);
 
 	ret = dwc3_omap_extcon_register(omap);
 	if (ret < 0)
-		goto err2;
+		goto err1;
 
 	ret = of_platform_populate(node, NULL, NULL, dev);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to create dwc3 core\n");
-		goto err3;
+		goto err2;
 	}
 
 	return 0;
 
-err3:
+err2:
 	if (omap->extcon_vbus_dev.edev)
 		extcon_unregister_interest(&omap->extcon_vbus_dev);
 	if (omap->extcon_id_dev.edev)
 		extcon_unregister_interest(&omap->extcon_id_dev);
 
-err2:
-	dwc3_omap_disable_irqs(omap);
-
 err1:
-	pm_runtime_put_sync(dev);
+	dwc3_omap_disable_irqs(omap);
 
 err0:
-	pm_runtime_disable(dev);
-
 	return ret;
 }
 
@@ -573,8 +560,6 @@ static int dwc3_omap_remove(struct
 platform_device *pdev)
 extcon_unregister_interest(&omap->extcon_id_dev);
 dwc3_omap_disable_irqs(omap); device_for_each_child(&pdev->dev, NULL,
 dwc3_omap_remove_core);
-	pm_runtime_put_sync(&pdev->dev);
-	pm_runtime_disable(&pdev->dev);
 
 	return 0;

}

drivers/usb/dwc3/dwc3-omap.c +0 -36
@@ -590,48 +575,12 @@ static const struct of_device_id
 of_dwc3_match[] = { };
 MODULE_DEVICE_TABLE(of, of_dwc3_match);
 
-#ifdef CONFIG_PM_SLEEP
-static int dwc3_omap_suspend(struct device *dev)
-{
-	struct dwc3_omap	*omap = dev_get_drvdata(dev);
-
-	omap->utmi_otg_status = dwc3_omap_read_utmi_status(omap);
-	dwc3_omap_disable_irqs(omap);
-
-	return 0;
-}
-
-static int dwc3_omap_resume(struct device *dev)
-{
-	struct dwc3_omap	*omap = dev_get_drvdata(dev);
-
-	dwc3_omap_write_utmi_status(omap, omap->utmi_otg_status);
-	dwc3_omap_enable_irqs(omap);
-
-	pm_runtime_disable(dev);
-	pm_runtime_set_active(dev);
-	pm_runtime_enable(dev);
-
-	return 0;
-}
-
-static const struct dev_pm_ops dwc3_omap_dev_pm_ops = {
-
-	SET_SYSTEM_SLEEP_PM_OPS(dwc3_omap_suspend, dwc3_omap_resume)
-};
-
-#define DEV_PM_OPS	(&dwc3_omap_dev_pm_ops)
-#else
-#define DEV_PM_OPS	NULL
-#endif /* CONFIG_PM_SLEEP */
-
 static struct platform_driver dwc3_omap_driver = {
 	.probe		= dwc3_omap_probe,
 	.remove		= dwc3_omap_remove,
 	.driver		= {
 		.name	= "omap-dwc3",
 		.of_match_table	= of_dwc3_match,
-		.pm	= DEV_PM_OPS,
 	},
 };
 
drivers/usb/dwc3/gadget.c +0 -26
index ca0f0cd..7c932c6 100644
@@ -2748,58 +2748,3 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
 	dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
 			dwc->ctrl_req, dwc->ctrl_req_addr);
 }
-
-int dwc3_gadget_suspend(struct dwc3 *dwc)
-{
-	if (dwc->pullups_connected) {
-		dwc3_gadget_disable_irq(dwc);
-		dwc3_gadget_run_stop(dwc, true, true);
-	}
-
-	__dwc3_gadget_ep_disable(dwc->eps[0]);
-	__dwc3_gadget_ep_disable(dwc->eps[1]);
-
-	dwc->dcfg = dwc3_readl(dwc->regs, DWC3_DCFG);
-
-	return 0;
-}
-
-int dwc3_gadget_resume(struct dwc3 *dwc)
-{
-	struct dwc3_ep		*dep;
-	int			ret;
-
-	/* Start with SuperSpeed Default */
-	dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
-
-	dep = dwc->eps[0];
-	ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc,

NULL, false,

drivers/usb/dwc3/gadget.c +0 -6
-			false);
-	if (ret)
-		goto err0;
-
-	dep = dwc->eps[1];
-	ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc,

NULL, false,

drivers/usb/dwc3/gadget.c +0 -13
-			false);
-	if (ret)
-		goto err1;
-
-	/* begin to receive SETUP packets */
-	dwc->ep0state = EP0_SETUP_PHASE;
-	dwc3_ep0_out_start(dwc);
-
-	dwc3_writel(dwc->regs, DWC3_DCFG, dwc->dcfg);
-
-	if (dwc->pullups_connected) {
-		dwc3_gadget_enable_irq(dwc);
-		dwc3_gadget_run_stop(dwc, true, false);

drivers/usb/dwc3/gadget.c void dwc3_gadget_exit(struct dwc3 *dwc) · line 2805

Quoted 10 lines
drivers/usb/dwc3/gadget.c +0 -10
-	}
-
-	return 0;
-
-err1:
-	__dwc3_gadget_ep_disable(dwc->eps[0]);
-
-err0:
-	return ret;
-}
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#31 lore raw

PATCH 13/40 arm: asm: dma-mapping: added dma_free_coherent API

In reply to Kishon Vijay Abraham I

Added dma_free_coherent corresponding to the dma_alloc_coherent in dma-mapping.h in order to free memory allocated using dma_alloc_coherent. This API is used in dwc3 driver.

---
 arch/arm/include/asm/dma-mapping.h |    7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/include/asm/dma-mapping.h +7 -0
index 14f00efd2..a5821f5 100644
@@ -8,6 +8,8 @@
 #ifndef __ASM_ARM_DMA_MAPPING_H
 #define __ASM_ARM_DMA_MAPPING_H
 
+#define	dma_mapping_error(x, y)	0
+
 enum dma_data_direction {
 	DMA_BIDIRECTIONAL	= 0,
 	DMA_TO_DEVICE		= 1,
@@ -20,6 +22,11 @@ static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
 	return (void *)*handle;
 }
 
+static inline void dma_free_coherent(void *addr)
+{
+	free(addr);
+}
+
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
 					   enum dma_data_direction dir)
 {
Signature · 1 line
1.7.9.5
#32 lore raw

PATCH 13/40 arm: asm: dma-mapping: added dma_free_coherent API

Hi Kishon,

Quoted 24 lines

Added dma_free_coherent corresponding to the dma_alloc_coherent in dma-mapping.h in order to free memory allocated using dma_alloc_coherent. This API is used in dwc3 driver.

---
 arch/arm/include/asm/dma-mapping.h |    7 +++++++
 1 file changed, 7 insertions(+)
(quoted diff) +0 -0

b/arch/arm/include/asm/dma-mapping.h index 14f00efd2..a5821f5 100644

arch/arm/include/asm/dma-mapping.h +2 -0
@@ -8,6 +8,8 @@
 #ifndef __ASM_ARM_DMA_MAPPING_H
 #define __ASM_ARM_DMA_MAPPING_H
 
+#define	dma_mapping_error(x, y)	0
+
 enum dma_data_direction {
 	DMA_BIDIRECTIONAL	= 0,
 	DMA_TO_DEVICE		= 1,
@@ -20,6 +22,11 @@ static inline void *dma_alloc_coherent(size_t len,
 unsigned long *handle) return (void *)*handle;

arch/arm/include/asm/dma-mapping.h static inline void *dma_alloc_coherent(size_t len, · line 32

Quoted 10 lines
arch/arm/include/asm/dma-mapping.h +5 -0
 }
 
+static inline void dma_free_coherent(void *addr)
+{
+	free(addr);
+}
+
 static inline unsigned long dma_map_single(volatile void *vaddr,
 size_t len, enum dma_data_direction dir)
 {
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#33 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

In reply to Kishon Vijay Abraham I

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---
 drivers/usb/dwc3/linux-compat.h |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 drivers/usb/dwc3/linux-compat.h
drivers/usb/dwc3/linux-compat.h new file +30 -0
new file mode 100644
index 0000000..58c4716
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy Adapter  Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier:	GPL-2.0
+ *
+ */
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format, ##arg)
+#define WARN_ON_ONCE(val)		debug("Error %d\n", val)
+
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src, size_t n)
+{
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif
Signature · 1 line
1.7.9.5
#34 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Hi Kishon, Marek

Quoted 38 lines

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---
 drivers/usb/dwc3/linux-compat.h |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 drivers/usb/dwc3/linux-compat.h
(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..58c4716

drivers/usb/dwc3/linux-compat.h new file +2 -0
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy Adapter

Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ */

drivers/usb/dwc3/linux-compat.h new file +7 -0
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format, ##arg)
+#define WARN_ON_ONCE(val)		debug("Error %d\n", val)

drivers/usb/dwc3/linux-compat.h line 30

Quoted 10 lines
drivers/usb/dwc3/linux-compat.h new file +10 -0
+
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src, size_t n)
+{
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif

Similar file has been already added to u-boot. Please look into ./drivers/usb/musb-new/linux-compat.h

@Marek - maybe it is time to have a common one?

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#35 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Hi,

Quoted 54 lines · Lukasz Majewski

Hi Kishon, Marek

Quoted 38 lines

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---
  drivers/usb/dwc3/linux-compat.h |   30 ++++++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)

create mode 100644 drivers/usb/dwc3/linux-compat.h

(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..58c4716

drivers/usb/dwc3/linux-compat.h new file +2 -0
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy Adapter

Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ */

drivers/usb/dwc3/linux-compat.h new file +7 -0
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format, ##arg)
+#define WARN_ON_ONCE(val)		debug("Error %d\n", val)

drivers/usb/dwc3/linux-compat.h line 30

Quoted 10 lines
drivers/usb/dwc3/linux-compat.h new file +10 -0
+
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src, size_t n)
+{
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif

Similar file has been already added to u-boot. Please look into ./drivers/usb/musb-new/linux-compat.h

Quoted 1 line

@Marek - maybe it is time to have a common one?

Can we do this separately?

-Kishon

#36 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Quoted 58 lines · Kishon Vijay Abraham I

Hi,

Quoted 55 lines · Lukasz Majewski

Hi Kishon, Marek

Quoted 39 lines

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---

  drivers/usb/dwc3/linux-compat.h |   30 ++++++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)

create mode 100644 drivers/usb/dwc3/linux-compat.h

(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..58c4716

drivers/usb/dwc3/linux-compat.h new file +2 -0
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy Adapter

Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ */

drivers/usb/dwc3/linux-compat.h new file +7 -0
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format, ##arg)
+#define WARN_ON_ONCE(val)		debug("Error %d\n", val)

drivers/usb/dwc3/linux-compat.h line 30

Quoted 10 lines
drivers/usb/dwc3/linux-compat.h new file +10 -0
+
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src, size_t n)
+{
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif

Similar file has been already added to u-boot. Please look into ./drivers/usb/musb-new/linux-compat.h

Quoted 3 lines
Quoted 1 line

@Marek - maybe it is time to have a common one?

Can we do this separately?

Would it be too much of a hassle to make a common one please ?

The musb-new (and musb) is a fine example why I don't want to let new drivers add duplicit code. It was the same with musb-new -- this driver was supposed to replace musb, but this never happened and now we have two drivers in various state of support.

Best regards,
Marek Vasut

#37 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Hi,

Quoted 59 lines · Marek Vasut
Quoted 58 lines · Kishon Vijay Abraham I

Hi,

Quoted 55 lines · Lukasz Majewski

Hi Kishon, Marek

Quoted 39 lines

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---

   drivers/usb/dwc3/linux-compat.h |   30 ++++++++++++++++++++++++++++++
   1 file changed, 30 insertions(+)

create mode 100644 drivers/usb/dwc3/linux-compat.h

(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..58c4716

drivers/usb/dwc3/linux-compat.h new file +2 -0
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy Adapter

Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ */

drivers/usb/dwc3/linux-compat.h new file +7 -0
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format, ##arg)
+#define WARN_ON_ONCE(val)		debug("Error %d\n", val)

drivers/usb/dwc3/linux-compat.h line 30

Quoted 10 lines
drivers/usb/dwc3/linux-compat.h new file +10 -0
+
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src, size_t n)
+{
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif

Similar file has been already added to u-boot. Please look into ./drivers/usb/musb-new/linux-compat.h

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

@Marek - maybe it is time to have a common one?

Can we do this separately?

Would it be too much of a hassle to make a common one please ?

Okay. I sent a new patch which should be applied on top of my v2 that removes creating a new linux compatibility header file for dwc3.

Thanks
Kishon

#38 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Quoted 62 lines · Kishon Vijay Abraham I

Hi,

Quoted 59 lines · Marek Vasut
Quoted 58 lines · Kishon Vijay Abraham I

Hi,

Quoted 55 lines · Lukasz Majewski

Hi Kishon, Marek

Quoted 39 lines

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---

   drivers/usb/dwc3/linux-compat.h |   30

++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 drivers/usb/dwc3/linux-compat.h

(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..58c4716

drivers/usb/dwc3/linux-compat.h new file +2 -0
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy Adapter

Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ */

drivers/usb/dwc3/linux-compat.h new file +7 -0
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format, ##arg)
+#define WARN_ON_ONCE(val)		debug("Error %d\n", val)

drivers/usb/dwc3/linux-compat.h line 30

Quoted 10 lines
drivers/usb/dwc3/linux-compat.h new file +10 -0
+
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src, size_t n)
+{
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif

Similar file has been already added to u-boot. Please look into ./drivers/usb/musb-new/linux-compat.h

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

@Marek - maybe it is time to have a common one?

Can we do this separately?

Would it be too much of a hassle to make a common one please ?

Okay. I sent a new patch which should be applied on top of my v2 that removes creating a new linux compatibility header file for dwc3.

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

#39 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Hi Marek,

Quoted 73 lines
Quoted 71 lines · Kishon Vijay Abraham I

Hi,

Quoted 67 lines · Marek Vasut
Quoted 60 lines · Kishon Vijay Abraham I

Hi,

Quoted 57 lines · Lukasz Majewski

Hi Kishon, Marek

Quoted 46 lines

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---

   drivers/usb/dwc3/linux-compat.h |   30

++++++++++++++++++++++++++++++ 1 file changed, 30
insertions(+) create mode 100644 drivers/usb/dwc3/linux-compat.h

(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..58c4716

drivers/usb/dwc3/linux-compat.h new file +2 -0
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy

Adapter Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ */

drivers/usb/dwc3/linux-compat.h new file +7 -0
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format, ##arg)
+#define WARN_ON_ONCE(val)		debug("Error %d\n",

val) +

drivers/usb/dwc3/linux-compat.h new file +3 -0
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src,

size_t n) +{

drivers/usb/dwc3/linux-compat.h line 30

Quoted 5 lines
drivers/usb/dwc3/linux-compat.h new file +5 -0
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif

Similar file has been already added to u-boot. Please look into ./drivers/usb/musb-new/linux-compat.h

Quoted 3 lines
Quoted 1 line

@Marek - maybe it is time to have a common one?

Can we do this separately?

Would it be too much of a hassle to make a common one please ?

Quoted 8 lines
Quoted 3 lines

Okay. I sent a new patch which should be applied on top of my v2 that removes creating a new linux compatibility header file for dwc3.

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

It thought that it would be directly taken to -usb tree.

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#40 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Quoted 82 lines · Lukasz Majewski

Hi Marek,

Quoted 80 lines

On Tuesday, February 24, 2015 at 02:21:40 PM, Kishon Vijay Abraham I

Quoted 76 lines · wrote:

Hi,

Quoted 64 lines · Marek Vasut

On Monday, February 23, 2015 at 07:19:03 AM, Kishon Vijay Abraham

Quoted 61 lines · I wrote:

Hi,

Quoted 58 lines · Lukasz Majewski

Hi Kishon, Marek

Quoted 47 lines

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---

   drivers/usb/dwc3/linux-compat.h |   30

++++++++++++++++++++++++++++++ 1 file changed, 30

insertions(+) create mode 100644
drivers/usb/dwc3/linux-compat.h

(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..58c4716

drivers/usb/dwc3/linux-compat.h new file +2 -0
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy

Adapter Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ */

drivers/usb/dwc3/linux-compat.h new file +7 -0
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format, ##arg)
+#define WARN_ON_ONCE(val)		debug("Error %d\n",

val) +

drivers/usb/dwc3/linux-compat.h new file +3 -0
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src,

size_t n) +{

drivers/usb/dwc3/linux-compat.h

Quoted 5 lines
drivers/usb/dwc3/linux-compat.h new file +5 -0
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif

Similar file has been already added to u-boot. Please look into ./drivers/usb/musb-new/linux-compat.h

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

@Marek - maybe it is time to have a common one?

Can we do this separately?

Would it be too much of a hassle to make a common one please ?

Okay. I sent a new patch which should be applied on top of my v2 that removes creating a new linux compatibility header file for dwc3.

Quoted 6 lines
Quoted 4 lines

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

It thought that it would be directly taken to -usb tree.

Oh, oops, right. You're OK with the patchset as-is, right ?

#41 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Hi Marek,

Quoted 85 lines · Lukasz Majewski
Quoted 84 lines

Hi Marek,

Quoted 82 lines

On Tuesday, February 24, 2015 at 02:21:40 PM, Kishon Vijay Abraham I

Quoted 77 lines · wrote:

Hi,

Quoted 65 lines · Marek Vasut

On Monday, February 23, 2015 at 07:19:03 AM, Kishon Vijay Abraham

Quoted 61 lines · I wrote:

Hi,

Quoted 58 lines · Lukasz Majewski

Hi Kishon, Marek

Quoted 47 lines

Added a header file to include various linux specific APIs like pr_debug, WARN_ WARN_ON_ONCE etc.. in order to avoid compilation error while building dwc3 driver.

---

   drivers/usb/dwc3/linux-compat.h |   30

++++++++++++++++++++++++++++++ 1 file changed, 30

insertions(+) create mode 100644
drivers/usb/dwc3/linux-compat.h

(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..58c4716

drivers/usb/dwc3/linux-compat.h new file +2 -0
@@ -0,0 +1,30 @@
+/**
+ * linux-compat.h - DesignWare USB3 Linux Compatibiltiy

Adapter Header
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -
http://www.ti.com
+ *
+ * Authors: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
+ * to uboot.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ */

drivers/usb/dwc3/linux-compat.h new file +6 -0
+
+#ifndef __DWC3_LINUX_COMPAT__
+#define __DWC3_LINUX_COMPAT__
+
+#define pr_debug(format)                debug(format)
+#define WARN(val, format, arg...)	debug(format,

##arg) +#define WARN_ON_ONCE(val)
debug("Error %d\n", val) +

drivers/usb/dwc3/linux-compat.h new file +3 -0
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+
+static inline size_t strlcat(char *dest, const char *src,

size_t n) +{

drivers/usb/dwc3/linux-compat.h

Quoted 5 lines
drivers/usb/dwc3/linux-compat.h new file +5 -0
+	strcat(dest, src);
+	return strlen(dest) + strlen(src);
+}
+
+#endif

Similar file has been already added to u-boot. Please look into ./drivers/usb/musb-new/linux-compat.h

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

@Marek - maybe it is time to have a common one?

Can we do this separately?

Would it be too much of a hassle to make a common one please ?

Okay. I sent a new patch which should be applied on top of my v2 that removes creating a new linux compatibility header file for dwc3.

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

It thought that it would be directly taken to -usb tree.

Oh, oops, right. You're OK with the patchset as-is, right ?

I have no objections to version 2 of this patch. Feel free to apply it to -usb tree.

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#42 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Quoted 1 line · Lukasz Majewski

Hi Marek,

Hi

[...]

Quoted 11 lines
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

It thought that it would be directly taken to -usb tree.

Oh, oops, right. You're OK with the patchset as-is, right ?

I have no objections to version 2 of this patch. Feel free to apply it to -usb tree.

Should be in topic/dwc3 , everyone please check if all is good there.

Best regards,
Marek Vasut

#43 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Hi Marek,

Quoted 12 lines · Lukasz Majewski
Quoted 1 line

Hi Marek,

Hi

[...]

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

It thought that it would be directly taken to -usb tree.

Oh, oops, right. You're OK with the patchset as-is, right ?

I have no objections to version 2 of this patch. Feel free to apply it to -usb tree.

Should be in topic/dwc3 , everyone please check if all is good there.

I think that I've written some comments in the other mail.

In short:

In the topic/dwc3 we are missing linux compatibility rework done by Kishon.

Only on top of it we could add my fixes for dwc3.

So, it should go as follow:
1. Kishon's 40 patches (dwc3 port)
2. Kishin's linux compat rework
3. Mine: usb: composite: Add .reset callback to usb_gadget_driver structur

4. On top of point 3 I would need to prepare new patch set with fixes.

Quoted 2 lines

Best regards,
Marek Vasut

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#44 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Quoted 1 line · Lukasz Majewski

Hi Marek,

Hi!

Quoted 30 lines
Quoted 12 lines · Lukasz Majewski
Quoted 1 line

Hi Marek,

Hi

[...]

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

It thought that it would be directly taken to -usb tree.

Oh, oops, right. You're OK with the patchset as-is, right ?

I have no objections to version 2 of this patch. Feel free to apply it to -usb tree.

Should be in topic/dwc3 , everyone please check if all is good there.

I think that I've written some comments in the other mail.

In short:

In the topic/dwc3 we are missing linux compatibility rework done by Kishon.

Only on top of it we could add my fixes for dwc3.

Quoted 7 lines

So, it should go as follow:
1. Kishon's 40 patches (dwc3 port)
2. Kishin's linux compat rework
3. Mine: usb: composite: Add .reset callback to usb_gadget_driver structur

4. On top of point 3 I would need to prepare new patch set with fixes.

Maybe you can prepare those fixes on top of the current ones ? Would that work?

Also, I'm a bit inclined to postpone applying all this stuff until 2015.04 is out, what do you think ?

Best regards,
Marek Vasut

#45 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Hi Marek,

Quoted 43 lines · Lukasz Majewski
Quoted 1 line

Hi Marek,

Hi!

Quoted 38 lines
Quoted 15 lines
Quoted 1 line · Lukasz Majewski

Hi Marek,

Hi

[...]

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

It thought that it would be directly taken to -usb tree.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Oh, oops, right. You're OK with the patchset as-is, right ?

I have no objections to version 2 of this patch. Feel free to apply it to -usb tree.

Should be in topic/dwc3 , everyone please check if all is good there.

I think that I've written some comments in the other mail.

In short:

In the topic/dwc3 we are missing linux compatibility rework done by Kishon.

Only on top of it we could add my fixes for dwc3.

So, it should go as follow:
1. Kishon's 40 patches (dwc3 port)
2. Kishin's linux compat rework
3. Mine: usb: composite: Add .reset callback to usb_gadget_driver structur

Quoted 5 lines
Quoted 2 lines

4. On top of point 3 I would need to prepare new patch set with fixes.

Maybe you can prepare those fixes on top of the current ones ? Would that work?

The problem here is with point 2. When do we want to apply linux-compat rework from Kishon?

Marek, does the presented above scheme work for you?

Quoted 3 lines

Also, I'm a bit inclined to postpone applying all this stuff until 2015.04 is out, what do you think ?

We may look how things would go. I've scheduled some time in a very near future to work on upstreaming dwc3.

Quoted 3 lines

Best regards,
Marek Vasut

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#46 lore raw

PATCH 14/40 usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy

Quoted 1 line · Lukasz Majewski

Hi Marek,

Hi!

Quoted 44 lines
Quoted 44 lines · Lukasz Majewski
Quoted 1 line

Hi Marek,

Hi!

Quoted 39 lines
Quoted 16 lines

On Wednesday, February 25, 2015 at 02:04:54 PM, Lukasz Majewski

Quoted 1 line · wrote:

Hi Marek,

Hi

[...]

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines

Well you know that such patch should really go in first, right ? But it's pretty pointless to push you to rework the entire thing I'd say, so let's just apply all this stuff as is. Lukasz, do you plan to pick it all up?

It thought that it would be directly taken to -usb tree.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Oh, oops, right. You're OK with the patchset as-is, right ?

I have no objections to version 2 of this patch. Feel free to apply it to -usb tree.

Should be in topic/dwc3 , everyone please check if all is good there.

I think that I've written some comments in the other mail.

In short:

In the topic/dwc3 we are missing linux compatibility rework done by Kishon.

Only on top of it we could add my fixes for dwc3.

So, it should go as follow:
1. Kishon's 40 patches (dwc3 port)
2. Kishin's linux compat rework
3. Mine: usb: composite: Add .reset callback to usb_gadget_driver structur

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

4. On top of point 3 I would need to prepare new patch set with fixes.

Maybe you can prepare those fixes on top of the current ones ? Would that work?

The problem here is with point 2. When do we want to apply linux-compat rework from Kishon?

I see we have at least 1. and 3. in topic/dwc3 already, right ? When is the linux-compat rework coming and when are your patches coming ? Are either patchsets gonna interfere with one another ?

Quoted 7 lines

Marek, does the presented above scheme work for you?

Quoted 2 lines

Also, I'm a bit inclined to postpone applying all this stuff until 2015.04 is out, what do you think ?

We may look how things would go. I've scheduled some time in a very near future to work on upstreaming dwc3.

OK, but the RC is already out and there are still issues with the DWC3, so I am inclined to simply merge apply this after 2015.04 .

Best regards,
Marek Vasut

#47 lore raw

PATCH 15/40 usb: dwc3: gadget: make dwc3 gadget build in uboot

In reply to Kishon Vijay Abraham I

Did a bunch of things to get dwc3/gadget.c compile in u-boot without build errors and warnings
*) Changed the included header files to that used in u-boot.
*) Used dma_alloc_coherent and dma_free_coherent APIs of u-boot *) removed sg support
*) remove jiffies and used a simple while loop
*) removed irq support and added a function to call these interrupt handler.

---
 drivers/usb/dwc3/gadget.c       |  244 ++++++++++++++-------------------------
 drivers/usb/dwc3/gadget.h       |    1 +
 drivers/usb/dwc3/linux-compat.h |    3 -
 include/linux/compat.h          |    1 +
 include/linux/usb/gadget.h      |   39 +++++++
 5 files changed, 125 insertions(+), 163 deletions(-)
drivers/usb/dwc3/gadget.c +84 -160
index 7c932c6..1f97729 100644
@@ -14,25 +14,22 @@
  * SPDX-License-Identifier:     GPL-2.0
  */
 
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
+#include <common.h>
+#include <malloc.h>
+#include <asm/dma-mapping.h>
+#include <usb/lin_gadget_compat.h>
 #include <linux/list.h>
-#include <linux/dma-mapping.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <asm/arch/sys_proto.h>
 
-#include "debug.h"
 #include "core.h"
 #include "gadget.h"
 #include "io.h"
 
+#include "linux-compat.h"
+
 /**
  * dwc3_gadget_set_test_mode - Enables USB2 Test Modes
  * @dwc: pointer to our context structure
@@ -166,7 +163,6 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state)
 int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc)
 {
 	int		last_fifo_depth = 0;
-	int		ram1_depth;
 	int		fifo_size;
 	int		mdwidth;
 	int		num;
@@ -174,7 +170,6 @@ int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc)
 	if (!dwc->needs_fifo_resize)
 		return 0;
 
-	ram1_depth = DWC3_RAM1_DEPTH(dwc->hwparams.hwparams7);
 	mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);
 
 	/* MDWIDTH is represented in bits, we need it in bytes */
@@ -232,24 +227,21 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
 		int status)
 {
 	struct dwc3			*dwc = dep->dwc;
-	int				i;
 
 	if (req->queued) {
-		i = 0;
-		do {
+		dep->busy_slot++;
+		/*
+		 * Skip LINK TRB. We can't use req->trb and check for
+		 * DWC3_TRBCTL_LINK_TRB because it points the TRB we
+		 * just completed (not the LINK TRB).
+		 */
+		if (((dep->busy_slot & DWC3_TRB_MASK) ==
+			DWC3_TRB_NUM- 1) &&
+			usb_endpoint_xfer_isoc(dep->endpoint.desc))
 			dep->busy_slot++;
-			/*
-			 * Skip LINK TRB. We can't use req->trb and check for
-			 * DWC3_TRBCTL_LINK_TRB because it points the TRB we
-			 * just completed (not the LINK TRB).
-			 */
-			if (((dep->busy_slot & DWC3_TRB_MASK) ==
-				DWC3_TRB_NUM- 1) &&
-				usb_endpoint_xfer_isoc(dep->endpoint.desc))
-				dep->busy_slot++;
-		} while(++i < req->request.num_mapped_sgs);
 		req->queued = false;
 	}
+
 	list_del(&req->list);
 	req->trb = NULL;
 
@@ -301,7 +293,6 @@ int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param)
 int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
 		unsigned cmd, struct dwc3_gadget_ep_cmd_params *params)
 {
-	struct dwc3_ep		*dep = dwc->eps[ep];
 	u32			timeout = 500;
 	u32			reg;
 
@@ -340,17 +331,15 @@ static dma_addr_t dwc3_trb_dma_offset(struct dwc3_ep *dep,
 
 static int dwc3_alloc_trb_pool(struct dwc3_ep *dep)
 {
-	struct dwc3		*dwc = dep->dwc;
-
 	if (dep->trb_pool)
 		return 0;
 
 	if (dep->number == 0 || dep->number == 1)
 		return 0;
 
-	dep->trb_pool = dma_alloc_coherent(dwc->dev,
-			sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
-			&dep->trb_pool_dma, GFP_KERNEL);
+	dep->trb_pool = dma_alloc_coherent(sizeof(struct dwc3_trb) *
+					   DWC3_TRB_NUM,
+					   (unsigned long *)&dep->trb_pool_dma);
 	if (!dep->trb_pool) {
 		dev_err(dep->dwc->dev, "failed to allocate trb pool for %s\n",
 				dep->name);
@@ -362,10 +351,7 @@ static int dwc3_alloc_trb_pool(struct dwc3_ep *dep)
 
 static void dwc3_free_trb_pool(struct dwc3_ep *dep)
 {
-	struct dwc3		*dwc = dep->dwc;
-
-	dma_free_coherent(dwc->dev, sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
-			dep->trb_pool, dep->trb_pool_dma);
+	dma_free_coherent(dep->trb_pool);
 
 	dep->trb_pool = NULL;
 	dep->trb_pool_dma = 0;
@@ -607,7 +593,6 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,
 		const struct usb_endpoint_descriptor *desc)
 {
 	struct dwc3_ep			*dep;
-	struct dwc3			*dwc;
 	unsigned long			flags;
 	int				ret;
 
@@ -622,10 +607,9 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,
 	}
 
 	dep = to_dwc3_ep(ep);
-	dwc = dep->dwc;
 
 	if (dep->flags & DWC3_EP_ENABLED) {
-		dev_WARN_ONCE(dwc->dev, true, "%s is already enabled\n",
+		WARN(true, "%s is already enabled\n",
 				dep->name);
 		return 0;
 	}
@@ -657,7 +641,6 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,
 static int dwc3_gadget_ep_disable(struct usb_ep *ep)
 {
 	struct dwc3_ep			*dep;
-	struct dwc3			*dwc;
 	unsigned long			flags;
 	int				ret;
 
@@ -667,10 +650,9 @@ static int dwc3_gadget_ep_disable(struct usb_ep *ep)
 	}
 
 	dep = to_dwc3_ep(ep);
-	dwc = dep->dwc;
 
 	if (!(dep->flags & DWC3_EP_ENABLED)) {
-		dev_WARN_ONCE(dwc->dev, true, "%s is already disabled\n",
+		WARN(true, "%s is already disabled\n",
 				dep->name);
 		return 0;
 	}
@@ -719,7 +701,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
 		struct dwc3_request *req, dma_addr_t dma,
 		unsigned length, unsigned last, unsigned chain, unsigned node)
 {
-	struct dwc3		*dwc = dep->dwc;
 	struct dwc3_trb		*trb;
 
 	dev_vdbg(dwc->dev, "%s: req %p dma %08llx length %d%s%s\n",
@@ -856,57 +837,22 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
 		dma_addr_t	dma;
 		last_one = false;
 
-		if (req->request.num_mapped_sgs > 0) {
-			struct usb_request *request = &req->request;
-			struct scatterlist *sg = request->sg;
-			struct scatterlist *s;
-			int		i;
-
-			for_each_sg(sg, s, request->num_mapped_sgs, i) {
-				unsigned chain = true;
+		dma = req->request.dma;
+		length = req->request.length;
+		trbs_left--;
 
-				length = sg_dma_len(s);
-				dma = sg_dma_address(s);
+		if (!trbs_left)
+			last_one = 1;
 
-				if (i == (request->num_mapped_sgs - 1) ||
-						sg_is_last(s)) {
-					if (list_is_last(&req->list,
-							&dep->request_list))
-						last_one = true;
-					chain = false;
-				}
+		/* Is this the last request? */
+		if (list_is_last(&req->list, &dep->request_list))
+			last_one = 1;
 
-				trbs_left--;
-				if (!trbs_left)
-					last_one = true;
+		dwc3_prepare_one_trb(dep, req, dma, length,
+				last_one, false, 0);
 
-				if (last_one)
-					chain = false;
-
-				dwc3_prepare_one_trb(dep, req, dma, length,
-						last_one, chain, i);
-
-				if (last_one)
-					break;
-			}
-		} else {
-			dma = req->request.dma;
-			length = req->request.length;
-			trbs_left--;
-
-			if (!trbs_left)
-				last_one = 1;
-
-			/* Is this the last request? */
-			if (list_is_last(&req->list, &dep->request_list))
-				last_one = 1;
-
-			dwc3_prepare_one_trb(dep, req, dma, length,
-					last_one, false, 0);
-
-			if (last_one)
-				break;
-		}
+		if (last_one)
+			break;
 	}
 }
 
@@ -1103,8 +1049,6 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
 
 		ret = __dwc3_gadget_kick_transfer(dep, 0, true);
 		if (ret && ret != -EBUSY) {
-			struct dwc3	*dwc = dep->dwc;
-
 			dev_dbg(dwc->dev, "%s: failed to kick transfers\n",
 					dep->name);
 		}
@@ -1118,7 +1062,6 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
 {
 	struct dwc3_request		*req = to_dwc3_request(request);
 	struct dwc3_ep			*dep = to_dwc3_ep(ep);
-	struct dwc3			*dwc = dep->dwc;
 
 	unsigned long			flags;
 
@@ -1132,8 +1075,9 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
 		goto out;
 	}
 
-	if (WARN(req->dep != dep, "request %p belongs to '%s'\n",
-				request, req->dep->name)) {
+	if (req->dep != dep) {
+		WARN(true, "request %p belongs to '%s'\n",
+				request, req->dep->name);
 		ret = -EINVAL;
 		goto out;
 	}
@@ -1239,7 +1183,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
 static int dwc3_gadget_ep_set_halt(struct usb_ep *ep, int value)
 {
 	struct dwc3_ep			*dep = to_dwc3_ep(ep);
-	struct dwc3			*dwc = dep->dwc;
 
 	unsigned long			flags;
 
@@ -1255,7 +1198,6 @@ static int dwc3_gadget_ep_set_halt(struct usb_ep *ep, int value)
 static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep)
 {
 	struct dwc3_ep			*dep = to_dwc3_ep(ep);
-	struct dwc3			*dwc = dep->dwc;
 	unsigned long			flags;
 	int				ret;
 
@@ -1371,9 +1313,9 @@ static int dwc3_gadget_wakeup(struct usb_gadget *g)
 	}
 
 	/* poll until Link State changes to ON */
-	timeout = jiffies + msecs_to_jiffies(100);
+	timeout = 1000;
 
-	while (!time_after(jiffies, timeout)) {
+	while (timeout--) {
 		reg = dwc3_readl(dwc->regs, DWC3_DSTS);
 
 		/* in HS, means ON */
@@ -1498,9 +1440,6 @@ static void dwc3_gadget_disable_irq(struct dwc3 *dwc)
 	dwc3_writel(dwc->regs, DWC3_DEVTEN, 0x00);
 }
 
-static irqreturn_t dwc3_interrupt(int irq, void *_dwc);
-static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc);
-
 static int dwc3_gadget_start(struct usb_gadget *g,
 		struct usb_gadget_driver *driver)
 {
@@ -1508,24 +1447,14 @@ static int dwc3_gadget_start(struct usb_gadget *g,
 	struct dwc3_ep		*dep;
 	unsigned long		flags;
 	int			ret = 0;
-	int			irq;
 	u32			reg;
 
-	irq = platform_get_irq(to_platform_device(dwc->dev), 0);
-	ret = request_threaded_irq(irq, dwc3_interrupt, dwc3_thread_interrupt,
-			IRQF_SHARED, "dwc3", dwc);
-	if (ret) {
-		dev_err(dwc->dev, "failed to request irq #%d --> %d\n",
-				irq, ret);
-		goto err0;
-	}
-
 	spin_lock_irqsave(&dwc->lock, flags);
 
 	if (dwc->gadget_driver) {
 		dev_err(dwc->dev, "%s is already bound to %s\n",
 				dwc->gadget.name,
-				dwc->gadget_driver->driver.name);
+				dwc->gadget_driver->function);
 		ret = -EBUSY;
 		goto err1;
 	}
@@ -1609,9 +1538,6 @@ err2:
 err1:
 	spin_unlock_irqrestore(&dwc->lock, flags);
 
-	free_irq(irq, dwc);
-
-err0:
 	return ret;
 }
 
@@ -1619,7 +1545,6 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
 {
 	struct dwc3		*dwc = gadget_to_dwc(g);
 	unsigned long		flags;
-	int			irq;
 
 	spin_lock_irqsave(&dwc->lock, flags);
 
@@ -1631,9 +1556,6 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
 
 	spin_unlock_irqrestore(&dwc->lock, flags);
 
-	irq = platform_get_irq(to_platform_device(dwc->dev), 0);
-	free_irq(irq, dwc);
-
 	return 0;
 }
 
@@ -1832,7 +1754,6 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
 	struct dwc3_request	*req;
 	struct dwc3_trb		*trb;
 	unsigned int		slot;
-	unsigned int		i;
 	int			ret;
 
 	do {
@@ -1841,20 +1762,18 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
 			WARN_ON_ONCE(1);
 			return 1;
 		}
-		i = 0;
-		do {
-			slot = req->start_slot + i;
-			if ((slot == DWC3_TRB_NUM - 1) &&
-				usb_endpoint_xfer_isoc(dep->endpoint.desc))
-				slot++;
-			slot %= DWC3_TRB_NUM;
-			trb = &dep->trb_pool[slot];
-
-			ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb,
-					event, status);
-			if (ret)
-				break;
-		}while (++i < req->request.num_mapped_sgs);
+
+		slot = req->start_slot;
+		if ((slot == DWC3_TRB_NUM - 1) &&
+			usb_endpoint_xfer_isoc(dep->endpoint.desc))
+			slot++;
+		slot %= DWC3_TRB_NUM;
+		trb = &dep->trb_pool[slot];
+
+		ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb,
+				event, status);
+		if (ret)
+			break;
 
 		dwc3_gadget_giveback(dep, req, status);
 
@@ -2293,9 +2212,8 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
 		 * BESL value in the LPM token is less than or equal to LPM
 		 * NYET threshold.
 		 */
-		WARN_ONCE(dwc->revision < DWC3_REVISION_240A
-				&& dwc->has_lpm_erratum,
-				"LPM Erratum not available on dwc3 revisisions < 2.40a\n");
+		if (dwc->revision < DWC3_REVISION_240A 	&& dwc->has_lpm_erratum)
+			WARN(true, "LPM Erratum not available on dwc3 revisisions < 2.40a\n");
 
 		if (dwc->has_lpm_erratum && dwc->revision >= DWC3_REVISION_240A)
 			reg |= DWC3_DCTL_LPM_ERRATA(dwc->lpm_nyet_threshold);
@@ -2482,10 +2400,10 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc,
 		dwc3_gadget_wakeup_interrupt(dwc);
 		break;
 	case DWC3_DEVICE_EVENT_HIBER_REQ:
-		if (dev_WARN_ONCE(dwc->dev, !dwc->has_hibernation,
-					"unexpected hibernation event\n"))
+		if (!dwc->has_hibernation) {
+			WARN(1 ,"unexpected hibernation event\n");
 			break;
-
+		}
 		dwc3_gadget_hibernation_interrupt(dwc, event->event_info);
 		break;
 	case DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE:
@@ -2649,16 +2567,16 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 {
 	int					ret;
 
-	dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
-			&dwc->ctrl_req_addr, GFP_KERNEL);
+	dwc->ctrl_req = dma_alloc_coherent(sizeof(*dwc->ctrl_req),
+					(unsigned long *)&dwc->ctrl_req_addr);
 	if (!dwc->ctrl_req) {
 		dev_err(dwc->dev, "failed to allocate ctrl request\n");
 		ret = -ENOMEM;
 		goto err0;
 	}
 
-	dwc->ep0_trb = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ep0_trb),
-			&dwc->ep0_trb_addr, GFP_KERNEL);
+	dwc->ep0_trb = dma_alloc_coherent(sizeof(*dwc->ep0_trb),
+					  (unsigned long *)&dwc->ep0_trb_addr);
 	if (!dwc->ep0_trb) {
 		dev_err(dwc->dev, "failed to allocate ep0 trb\n");
 		ret = -ENOMEM;
@@ -2671,9 +2589,8 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 		goto err2;
 	}
 
-	dwc->ep0_bounce = dma_alloc_coherent(dwc->dev,
-			DWC3_EP0_BOUNCE_SIZE, &dwc->ep0_bounce_addr,
-			GFP_KERNEL);
+	dwc->ep0_bounce = dma_alloc_coherent(DWC3_EP0_BOUNCE_SIZE,
+					(unsigned long *)&dwc->ep0_bounce_addr);
 	if (!dwc->ep0_bounce) {
 		dev_err(dwc->dev, "failed to allocate ep0 bounce buffer\n");
 		ret = -ENOMEM;
@@ -2683,7 +2600,6 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 	dwc->gadget.ops			= &dwc3_gadget_ops;
 	dwc->gadget.max_speed		= USB_SPEED_SUPER;
 	dwc->gadget.speed		= USB_SPEED_UNKNOWN;
-	dwc->gadget.sg_supported	= true;
 	dwc->gadget.name		= "dwc3-gadget";
 
 	/*
@@ -2711,19 +2627,16 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 
 err4:
 	dwc3_gadget_free_endpoints(dwc);
-	dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
-			dwc->ep0_bounce, dwc->ep0_bounce_addr);
+	dma_free_coherent(dwc->ep0_bounce);
 
 err3:
 	kfree(dwc->setup_buf);
 
 err2:
-	dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb),
-			dwc->ep0_trb, dwc->ep0_trb_addr);
+	dma_free_coherent(dwc->ep0_trb);
 
 err1:
-	dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
-			dwc->ctrl_req, dwc->ctrl_req_addr);
+	dma_free_coherent(dwc->ctrl_req);
 
 err0:
 	return ret;
@@ -2737,14 +2650,25 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
 
 	dwc3_gadget_free_endpoints(dwc);
 
-	dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
-			dwc->ep0_bounce, dwc->ep0_bounce_addr);
+	dma_free_coherent(dwc->ep0_bounce);
 
 	kfree(dwc->setup_buf);
 
-	dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb),
-			dwc->ep0_trb, dwc->ep0_trb_addr);
+	dma_free_coherent(dwc->ep0_trb);
 
-	dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
-			dwc->ctrl_req, dwc->ctrl_req_addr);
+	dma_free_coherent(dwc->ctrl_req);
+}
+
+/**
+ * dwc3_gadget_uboot_handle_interrupt - handle dwc3 gadget interrupt
+ * @dwc: struct dwce *
+ *
+ * Handles ep0 and gadget interrupt
+ *
+ * Should be called from dwc3 core.
+ */
+void dwc3_gadget_uboot_handle_interrupt(struct dwc3 *dwc)
+{
+	dwc3_interrupt(0, dwc);
+	dwc3_thread_interrupt(0, dwc);
 }
drivers/usb/dwc3/gadget.h +1 -0
index 042e247..c7db219 100644
@@ -87,6 +87,7 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value);
 int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
 		gfp_t gfp_flags);
 int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol);
+void dwc3_gadget_uboot_handle_interrupt(struct dwc3 *dwc);
 
 /**
  * dwc3_gadget_ep_get_transfer_index - Gets transfer index from HW
drivers/usb/dwc3/linux-compat.h +0 -3
index 58c4716..719e82e 100644
@@ -5,9 +5,6 @@
  *
  * Authors: Kishon Vijay Abraham I <[email protected]>
  *
- * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
- * to uboot.
- *
  * SPDX-License-Identifier:	GPL-2.0
  *
  */
include/linux/compat.h +1 -0
index b40133c..904425a 100644
@@ -327,6 +327,7 @@ typedef unsigned long dmaaddr_t;
 
 #define IRQ_NONE 0
 #define IRQ_HANDLED 1
+#define IRQ_WAKE_THREAD 2
 
 #define dev_set_drvdata(dev, data) do {} while (0)
 
include/linux/usb/gadget.h +39 -0
index 1960958..93a5ffc 100644
@@ -31,6 +31,7 @@ struct usb_ep;
  * @dma: DMA address corresponding to 'buf'.  If you don't set this
  *	field, and the usb controller needs one, it is responsible
  *	for mapping and unmapping the buffer.
+ * @stream_id: The stream id, when USB3.0 bulk streams are being used
  * @length: Length of that data
  * @no_interrupt: If true, hints that no completion irq is needed.
  *	Helpful sometimes with deep request queues that are handled
@@ -85,6 +86,7 @@ struct usb_request {
 	unsigned		length;
 	dma_addr_t		dma;
 
+	unsigned		stream_id:16;
 	unsigned		no_interrupt:1;
 	unsigned		zero:1;
 	unsigned		short_not_ok:1;
@@ -121,6 +123,7 @@ struct usb_ep_ops {
 	int (*dequeue) (struct usb_ep *ep, struct usb_request *req);
 
 	int (*set_halt) (struct usb_ep *ep, int value);
+	int (*set_wedge)(struct usb_ep *ep);
 	int (*fifo_status) (struct usb_ep *ep);
 	void (*fifo_flush) (struct usb_ep *ep);
 };
@@ -133,8 +136,18 @@ struct usb_ep_ops {
  * @maxpacket:The maximum packet size used on this endpoint.  The initial
  *	value can sometimes be reduced (hardware allowing), according to
  *      the endpoint descriptor used to configure the endpoint.
+ * @maxpacket_limit:The maximum packet size value which can be handled by this
+ *	endpoint. It's set once by UDC driver when endpoint is initialized, and
+ *	should not be changed. Should not be confused with maxpacket.
+ * @max_streams: The maximum number of streams supported
+ * 	by this EP (0 - 16, actual number is 2^n)
+ * @maxburst: the maximum number of bursts supported by this EP (for usb3)
  * @driver_data:for use by the gadget driver.  all other fields are
  *	read-only to gadget drivers.
+ * @desc: endpoint descriptor.  This pointer is set before the endpoint is
+ * 	enabled and remains valid until the endpoint is disabled.
+ * @comp_desc: In case of SuperSpeed support, this is the endpoint companion
+ * 	descriptor that is used to configure the endpoint
  *
  * the bus controller driver lists all the general purpose endpoints in
  * gadget->ep_list.  the control endpoint (gadget->ep0) is not in that list,
@@ -146,11 +159,31 @@ struct usb_ep {
 	const struct usb_ep_ops	*ops;
 	struct list_head	ep_list;
 	unsigned		maxpacket:16;
+	unsigned		maxpacket_limit:16;
+	unsigned		max_streams:16;
+	unsigned		maxburst:5;
+	const struct usb_endpoint_descriptor	*desc;
+	const struct usb_ss_ep_comp_descriptor	*comp_desc;
 };
 
 /*-------------------------------------------------------------------------*/
 
 /**
+ * usb_ep_set_maxpacket_limit - set maximum packet size limit for endpoint
+ * @ep:the endpoint being configured
+ * @maxpacket_limit:value of maximum packet size limit
+ *
+ * This function shoud be used only in UDC drivers to initialize endpoint
+ * (usually in probe function).
+ */
+static inline void usb_ep_set_maxpacket_limit(struct usb_ep *ep,
+					      unsigned maxpacket_limit)
+{
+	ep->maxpacket_limit = maxpacket_limit;
+	ep->maxpacket = maxpacket_limit;
+}
+
+/**
  * usb_ep_enable - configure endpoint, making it usable
  * @ep:the endpoint being configured.  may not be the endpoint named "ep0".
  *	drivers discover endpoints through the ep_list of a usb_gadget.
@@ -422,6 +455,8 @@ struct usb_gadget_ops {
  *	driver setup() requests
  * @ep_list: List of other endpoints supported by the device.
  * @speed: Speed of current connection to USB host.
+ * @max_speed: Maximal speed the UDC can handle.  UDC must support this
+ *      and all slower speeds.
  * @is_dualspeed: true if the controller supports both high and full speed
  *	operation.  If it does, the gadget driver must also support both.
  * @is_otg: true if the USB device port uses a Mini-AB jack, so that the
@@ -438,6 +473,8 @@ struct usb_gadget_ops {
  * @name: Identifies the controller hardware type.  Used in diagnostics
  *	and sometimes configuration.
  * @dev: Driver model state for this abstract device.
+ * @quirk_ep_out_aligned_size: epout requires buffer size to be aligned to
+ *	MaxPacketSize.
  *
  * Gadgets have a mostly-portable "gadget driver" implementing device
  * functions, handling all usb configurations and interfaces.  Gadget
@@ -463,6 +500,7 @@ struct usb_gadget {
 	struct usb_ep			*ep0;
 	struct list_head		ep_list;	/* of usb_ep */
 	enum usb_device_speed		speed;
+	enum usb_device_speed		max_speed;
 	enum usb_device_state		state;
 	unsigned			is_dualspeed:1;
 	unsigned			is_otg:1;
@@ -472,6 +510,7 @@ struct usb_gadget {
 	unsigned			a_alt_hnp_support:1;
 	const char			*name;
 	struct device			dev;
+	unsigned			quirk_ep_out_aligned_size:1;
 };
 
 static inline void set_gadget_data(struct usb_gadget *gadget, void *data)
Signature · 1 line
1.7.9.5
#48 lore raw

PATCH 15/40 usb: dwc3: gadget: make dwc3 gadget build in uboot

Hi Kishon,

Quoted 741 lines

Did a bunch of things to get dwc3/gadget.c compile in u-boot without build errors and warnings
*) Changed the included header files to that used in u-boot. *) Used dma_alloc_coherent and dma_free_coherent APIs of u-boot *) removed sg support
*) remove jiffies and used a simple while loop
*) removed irq support and added a function to call these interrupt handler.

---
 drivers/usb/dwc3/gadget.c       |  244
++++++++++++++-------------------------
drivers/usb/dwc3/gadget.h       |    1 +
drivers/usb/dwc3/linux-compat.h |    3 -
include/linux/compat.h          |    1 +
include/linux/usb/gadget.h      |   39 +++++++ 5 files changed, 125

insertions(+), 163 deletions(-)

drivers/usb/dwc3/gadget.c +7 -10
index 7c932c6..1f97729 100644
@@ -14,25 +14,22 @@
  * SPDX-License-Identifier:     GPL-2.0
  */
 
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
+#include <common.h>
+#include <malloc.h>
+#include <asm/dma-mapping.h>
+#include <usb/lin_gadget_compat.h>
 #include <linux/list.h>
-#include <linux/dma-mapping.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <asm/arch/sys_proto.h>
 
-#include "debug.h"
 #include "core.h"
 #include "gadget.h"
 #include "io.h"
 
+#include "linux-compat.h"
+
 /**
  * dwc3_gadget_set_test_mode - Enables USB2 Test Modes
  * @dwc: pointer to our context structure
@@ -166,7 +163,6 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc,

enum dwc3_link_state state) int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc) {

drivers/usb/dwc3/gadget.c +9 -7
 	int		last_fifo_depth = 0;
-	int		ram1_depth;
 	int		fifo_size;
 	int		mdwidth;
 	int		num;
@@ -174,7 +170,6 @@ int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc)
 	if (!dwc->needs_fifo_resize)
 		return 0;
 
-	ram1_depth = DWC3_RAM1_DEPTH(dwc->hwparams.hwparams7);
 	mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);
 
 	/* MDWIDTH is represented in bits, we need it in bytes */
@@ -232,24 +227,21 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep,
 struct dwc3_request *req, int status)
 {
 	struct dwc3			*dwc = dep->dwc;
-	int				i;
 
 	if (req->queued) {
-		i = 0;
-		do {
+		dep->busy_slot++;
+		/*
+		 * Skip LINK TRB. We can't use req->trb and check for
+		 * DWC3_TRBCTL_LINK_TRB because it points the TRB we
+		 * just completed (not the LINK TRB).
+		 */
+		if (((dep->busy_slot & DWC3_TRB_MASK) ==
+			DWC3_TRB_NUM- 1) &&
+			usb_endpoint_xfer_isoc(dep->endpoint.desc))
 			dep->busy_slot++;
-			/*
-			 * Skip LINK TRB. We can't use req->trb and

check for

drivers/usb/dwc3/gadget.c +0 -1
-			 * DWC3_TRBCTL_LINK_TRB because it points

the TRB we

drivers/usb/dwc3/gadget.c +0 -5
-			 * just completed (not the LINK TRB).
-			 */
-			if (((dep->busy_slot & DWC3_TRB_MASK) ==
-				DWC3_TRB_NUM- 1) &&
-

usb_endpoint_xfer_isoc(dep->endpoint.desc))

drivers/usb/dwc3/gadget.c +1 -2
-				dep->busy_slot++;
-		} while(++i < req->request.num_mapped_sgs);
 		req->queued = false;
 	}
+
 	list_del(&req->list);
 	req->trb = NULL;
@@ -301,7 +293,6 @@ int dwc3_send_gadget_generic_command(struct dwc3
 *dwc, unsigned cmd, u32 param) int dwc3_send_gadget_ep_cmd(struct

dwc3 *dwc, unsigned ep, unsigned cmd, struct
dwc3_gadget_ep_cmd_params *params) {

drivers/usb/dwc3/gadget.c +4 -10
-	struct dwc3_ep		*dep = dwc->eps[ep];
 	u32			timeout = 500;
 	u32			reg;
@@ -340,17 +331,15 @@ static dma_addr_t dwc3_trb_dma_offset(struct
 dwc3_ep *dep, 
 static int dwc3_alloc_trb_pool(struct dwc3_ep *dep)
 {
-	struct dwc3		*dwc = dep->dwc;
-
 	if (dep->trb_pool)
 		return 0;
 
 	if (dep->number == 0 || dep->number == 1)
 		return 0;
 
-	dep->trb_pool = dma_alloc_coherent(dwc->dev,
-			sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
-			&dep->trb_pool_dma, GFP_KERNEL);
+	dep->trb_pool = dma_alloc_coherent(sizeof(struct dwc3_trb) *
+					   DWC3_TRB_NUM,
+					   (unsigned long
 *)&dep->trb_pool_dma); if (!dep->trb_pool) {
 		dev_err(dep->dwc->dev, "failed to allocate trb pool
 for %s\n", dep->name);
@@ -362,10 +351,7 @@ static int dwc3_alloc_trb_pool(struct dwc3_ep
 *dep) 
 static void dwc3_free_trb_pool(struct dwc3_ep *dep)
 {
-	struct dwc3		*dwc = dep->dwc;
-
-	dma_free_coherent(dwc->dev, sizeof(struct dwc3_trb) *
 DWC3_TRB_NUM,
-			dep->trb_pool, dep->trb_pool_dma);
+	dma_free_coherent(dep->trb_pool);
 
 	dep->trb_pool = NULL;
drivers/usb/dwc3/gadget.c +1 -3
 	dep->trb_pool_dma = 0;
@@ -607,7 +593,6 @@ static int dwc3_gadget_ep_enable(struct usb_ep
 *ep, const struct usb_endpoint_descriptor *desc)
 {
 	struct dwc3_ep			*dep;
-	struct dwc3			*dwc;
 	unsigned long			flags;
 	int				ret;
 
@@ -622,10 +607,9 @@ static int dwc3_gadget_ep_enable(struct usb_ep
 *ep, }
 
 	dep = to_dwc3_ep(ep);
-	dwc = dep->dwc;
 
 	if (dep->flags & DWC3_EP_ENABLED) {
-		dev_WARN_ONCE(dwc->dev, true, "%s is already
 enabled\n",
+		WARN(true, "%s is already enabled\n",
 				dep->name);
 		return 0;
drivers/usb/dwc3/gadget.c +1 -3
 	}
@@ -657,7 +641,6 @@ static int dwc3_gadget_ep_enable(struct usb_ep
 *ep, static int dwc3_gadget_ep_disable(struct usb_ep *ep)
 {
 	struct dwc3_ep			*dep;
-	struct dwc3			*dwc;
 	unsigned long			flags;
 	int				ret;
 
@@ -667,10 +650,9 @@ static int dwc3_gadget_ep_disable(struct usb_ep
 *ep) }
 
 	dep = to_dwc3_ep(ep);
-	dwc = dep->dwc;
 
 	if (!(dep->flags & DWC3_EP_ENABLED)) {
-		dev_WARN_ONCE(dwc->dev, true, "%s is already
 disabled\n",
+		WARN(true, "%s is already disabled\n",
 				dep->name);
 		return 0;
drivers/usb/dwc3/gadget.c +5 -12
 	}
@@ -719,7 +701,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep
 *dep, struct dwc3_request *req, dma_addr_t dma,
 		unsigned length, unsigned last, unsigned chain,
 unsigned node) {
-	struct dwc3		*dwc = dep->dwc;
 	struct dwc3_trb		*trb;
 
 	dev_vdbg(dwc->dev, "%s: req %p dma %08llx length %d%s%s\n",
@@ -856,57 +837,22 @@ static void dwc3_prepare_trbs(struct dwc3_ep
 *dep, bool starting) dma_addr_t	dma;
 		last_one = false;
 
-		if (req->request.num_mapped_sgs > 0) {
-			struct usb_request *request = &req->request;
-			struct scatterlist *sg = request->sg;
-			struct scatterlist *s;
-			int		i;
-
-			for_each_sg(sg, s, request->num_mapped_sgs,
 i) {
-				unsigned chain = true;
+		dma = req->request.dma;
+		length = req->request.length;
+		trbs_left--;
 
-				length = sg_dma_len(s);
-				dma = sg_dma_address(s);
+		if (!trbs_left)
+			last_one = 1;
 
-				if (i == (request->num_mapped_sgs -

1) ||

drivers/usb/dwc3/gadget.c +0 -3
-						sg_is_last(s)) {
-					if (list_is_last(&req->list,
-

&dep->request_list))

drivers/usb/dwc3/gadget.c +5 -10
-						last_one = true;
-					chain = false;
-				}
+		/* Is this the last request? */
+		if (list_is_last(&req->list, &dep->request_list))
+			last_one = 1;
 
-				trbs_left--;
-				if (!trbs_left)
-					last_one = true;
+		dwc3_prepare_one_trb(dep, req, dma, length,
+				last_one, false, 0);
 
-				if (last_one)
-					chain = false;
-
-				dwc3_prepare_one_trb(dep, req, dma,

length,

drivers/usb/dwc3/gadget.c +0 -15
-						last_one, chain, i);
-
-				if (last_one)
-					break;
-			}
-		} else {
-			dma = req->request.dma;
-			length = req->request.length;
-			trbs_left--;
-
-			if (!trbs_left)
-				last_one = 1;
-
-			/* Is this the last request? */
-			if (list_is_last(&req->list,

&dep->request_list))

drivers/usb/dwc3/gadget.c +2 -10
-				last_one = 1;
-
-			dwc3_prepare_one_trb(dep, req, dma, length,
-					last_one, false, 0);
-
-			if (last_one)
-				break;
-		}
+		if (last_one)
+			break;
 	}
 }
@@ -1103,8 +1049,6 @@ static int __dwc3_gadget_ep_queue(struct
 dwc3_ep *dep, struct dwc3_request *req) 
 		ret = __dwc3_gadget_kick_transfer(dep, 0, true);
 		if (ret && ret != -EBUSY) {
-			struct dwc3	*dwc = dep->dwc;
-
 			dev_dbg(dwc->dev, "%s: failed to kick
 transfers\n", dep->name);
 		}
@@ -1118,7 +1062,6 @@ static int dwc3_gadget_ep_queue(struct usb_ep
 *ep, struct usb_request *request, {
 	struct dwc3_request		*req =

to_dwc3_request(request); struct dwc3_ep *dep
= to_dwc3_ep(ep);

drivers/usb/dwc3/gadget.c +3 -4
-	struct dwc3			*dwc = dep->dwc;
 
 	unsigned long			flags;
@@ -1132,8 +1075,9 @@ static int dwc3_gadget_ep_queue(struct usb_ep
 *ep, struct usb_request *request, goto out;
 	}
 
-	if (WARN(req->dep != dep, "request %p belongs to '%s'\n",
-				request, req->dep->name)) {
+	if (req->dep != dep) {
+		WARN(true, "request %p belongs to '%s'\n",
+				request, req->dep->name);
 		ret = -EINVAL;
 		goto out;
 	}
@@ -1239,7 +1183,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep
 *dep, int value, int protocol) static int
 dwc3_gadget_ep_set_halt(struct usb_ep *ep, int value) {
 	struct dwc3_ep			*dep = to_dwc3_ep(ep);
-	struct dwc3			*dwc = dep->dwc;
 
 	unsigned long			flags;
 
@@ -1255,7 +1198,6 @@ static int dwc3_gadget_ep_set_halt(struct

usb_ep *ep, int value) static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep) {

drivers/usb/dwc3/gadget.c +3 -17
 	struct dwc3_ep			*dep = to_dwc3_ep(ep);
-	struct dwc3			*dwc = dep->dwc;
 	unsigned long			flags;
 	int				ret;
@@ -1371,9 +1313,9 @@ static int dwc3_gadget_wakeup(struct usb_gadget
 *g) }
 
 	/* poll until Link State changes to ON */
-	timeout = jiffies + msecs_to_jiffies(100);
+	timeout = 1000;
 
-	while (!time_after(jiffies, timeout)) {
+	while (timeout--) {
 		reg = dwc3_readl(dwc->regs, DWC3_DSTS);
 
 		/* in HS, means ON */
@@ -1498,9 +1440,6 @@ static void dwc3_gadget_disable_irq(struct dwc3
 *dwc) dwc3_writel(dwc->regs, DWC3_DEVTEN, 0x00);
 }
 
-static irqreturn_t dwc3_interrupt(int irq, void *_dwc);
-static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc);
-
 static int dwc3_gadget_start(struct usb_gadget *g,
 		struct usb_gadget_driver *driver)
 {
@@ -1508,24 +1447,14 @@ static int dwc3_gadget_start(struct
 usb_gadget *g, struct dwc3_ep		*dep;
 	unsigned long		flags;
 	int			ret = 0;
-	int			irq;
 	u32			reg;
 
-	irq = platform_get_irq(to_platform_device(dwc->dev), 0);
-	ret = request_threaded_irq(irq, dwc3_interrupt,
 dwc3_thread_interrupt,
-			IRQF_SHARED, "dwc3", dwc);
-	if (ret) {
-		dev_err(dwc->dev, "failed to request irq #%d -->
 %d\n",
-				irq, ret);
-		goto err0;
-	}
-
 	spin_lock_irqsave(&dwc->lock, flags);
 
 	if (dwc->gadget_driver) {
 		dev_err(dwc->dev, "%s is already bound to %s\n",
 				dwc->gadget.name,
-				dwc->gadget_driver->driver.name);
+				dwc->gadget_driver->function);
 		ret = -EBUSY;
drivers/usb/dwc3/gadget.c +12 -22
 		goto err1;
 	}
@@ -1609,9 +1538,6 @@ err2:
 err1:
 	spin_unlock_irqrestore(&dwc->lock, flags);
 
-	free_irq(irq, dwc);
-
-err0:
 	return ret;
 }
 
@@ -1619,7 +1545,6 @@ static int dwc3_gadget_stop(struct usb_gadget
 *g) {
 	struct dwc3		*dwc = gadget_to_dwc(g);
 	unsigned long		flags;
-	int			irq;
 
 	spin_lock_irqsave(&dwc->lock, flags);
 
@@ -1631,9 +1556,6 @@ static int dwc3_gadget_stop(struct usb_gadget
 *g) 
 	spin_unlock_irqrestore(&dwc->lock, flags);
 
-	irq = platform_get_irq(to_platform_device(dwc->dev), 0);
-	free_irq(irq, dwc);
-
 	return 0;
 }
 
@@ -1832,7 +1754,6 @@ static int dwc3_cleanup_done_reqs(struct dwc3
 *dwc, struct dwc3_ep *dep, struct dwc3_request	*req;
 	struct dwc3_trb		*trb;
 	unsigned int		slot;
-	unsigned int		i;
 	int			ret;
 
 	do {
@@ -1841,20 +1762,18 @@ static int dwc3_cleanup_done_reqs(struct dwc3
 *dwc, struct dwc3_ep *dep, WARN_ON_ONCE(1);
 			return 1;
 		}
-		i = 0;
-		do {
-			slot = req->start_slot + i;
-			if ((slot == DWC3_TRB_NUM - 1) &&
-
 usb_endpoint_xfer_isoc(dep->endpoint.desc))
-				slot++;
-			slot %= DWC3_TRB_NUM;
-			trb = &dep->trb_pool[slot];
-
-			ret = __dwc3_cleanup_done_trbs(dwc, dep,
 req, trb,
-					event, status);
-			if (ret)
-				break;
-		}while (++i < req->request.num_mapped_sgs);
+
+		slot = req->start_slot;
+		if ((slot == DWC3_TRB_NUM - 1) &&
+			usb_endpoint_xfer_isoc(dep->endpoint.desc))
+			slot++;
+		slot %= DWC3_TRB_NUM;
+		trb = &dep->trb_pool[slot];
+
+		ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb,
+				event, status);
+		if (ret)
+			break;
 
drivers/usb/dwc3/gadget.c +0 -0
 		dwc3_gadget_giveback(dep, req, status);
@@ -2293,9 +2212,8 @@ static void
 dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
 		 * BESL value in the LPM token is less than or equal

to LPM

drivers/usb/dwc3/gadget.c +0 -3
 		 * NYET threshold.
 		 */
-		WARN_ONCE(dwc->revision < DWC3_REVISION_240A
-				&& dwc->has_lpm_erratum,
-				"LPM Erratum not available on dwc3

revisisions < 2.40a\n");

drivers/usb/dwc3/gadget.c +1 -0
+		if (dwc->revision < DWC3_REVISION_240A 	&&

dwc->has_lpm_erratum)

drivers/usb/dwc3/gadget.c +1 -0
+			WARN(true, "LPM Erratum not available on

dwc3 revisisions < 2.40a\n");
if (dwc->has_lpm_erratum && dwc->revision >=
DWC3_REVISION_240A) reg |= DWC3_DCTL_LPM_ERRATA(dwc->lpm_nyet_threshold); @@ -2482,10 +2400,10 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc, dwc3_gadget_wakeup_interrupt(dwc); break;

drivers/usb/dwc3/gadget.c +0 -2
 	case DWC3_DEVICE_EVENT_HIBER_REQ:
-		if (dev_WARN_ONCE(dwc->dev, !dwc->has_hibernation,
-					"unexpected hibernation

event\n"))

drivers/usb/dwc3/gadget.c +3 -1
+		if (!dwc->has_hibernation) {
+			WARN(1 ,"unexpected hibernation event\n");
 			break;
-
+		}
 		dwc3_gadget_hibernation_interrupt(dwc,

event->event_info); break;

drivers/usb/dwc3/gadget.c +4 -4
 	case DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE:
@@ -2649,16 +2567,16 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 {
 	int					ret;
 
-	dwc->ctrl_req = dma_alloc_coherent(dwc->dev,
 sizeof(*dwc->ctrl_req),
-			&dwc->ctrl_req_addr, GFP_KERNEL);
+	dwc->ctrl_req = dma_alloc_coherent(sizeof(*dwc->ctrl_req),
+					(unsigned long
 *)&dwc->ctrl_req_addr); if (!dwc->ctrl_req) {
 		dev_err(dwc->dev, "failed to allocate ctrl
 request\n"); ret = -ENOMEM;
 		goto err0;
 	}
 
-	dwc->ep0_trb = dma_alloc_coherent(dwc->dev,
 sizeof(*dwc->ep0_trb),
-			&dwc->ep0_trb_addr, GFP_KERNEL);
+	dwc->ep0_trb = dma_alloc_coherent(sizeof(*dwc->ep0_trb),
+					  (unsigned long
 *)&dwc->ep0_trb_addr); if (!dwc->ep0_trb) {
drivers/usb/dwc3/gadget.c +22 -16
 		dev_err(dwc->dev, "failed to allocate ep0 trb\n");
 		ret = -ENOMEM;
@@ -2671,9 +2589,8 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 		goto err2;
 	}
 
-	dwc->ep0_bounce = dma_alloc_coherent(dwc->dev,
-			DWC3_EP0_BOUNCE_SIZE, &dwc->ep0_bounce_addr,
-			GFP_KERNEL);
+	dwc->ep0_bounce = dma_alloc_coherent(DWC3_EP0_BOUNCE_SIZE,
+					(unsigned long
 *)&dwc->ep0_bounce_addr); if (!dwc->ep0_bounce) {
 		dev_err(dwc->dev, "failed to allocate ep0 bounce
 buffer\n"); ret = -ENOMEM;
@@ -2683,7 +2600,6 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 	dwc->gadget.ops			= &dwc3_gadget_ops;
 	dwc->gadget.max_speed		= USB_SPEED_SUPER;
 	dwc->gadget.speed		= USB_SPEED_UNKNOWN;
-	dwc->gadget.sg_supported	= true;
 	dwc->gadget.name		= "dwc3-gadget";
 
 	/*
@@ -2711,19 +2627,16 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 
 err4:
 	dwc3_gadget_free_endpoints(dwc);
-	dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
-			dwc->ep0_bounce, dwc->ep0_bounce_addr);
+	dma_free_coherent(dwc->ep0_bounce);
 
 err3:
 	kfree(dwc->setup_buf);
 
 err2:
-	dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb),
-			dwc->ep0_trb, dwc->ep0_trb_addr);
+	dma_free_coherent(dwc->ep0_trb);
 
 err1:
-	dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
-			dwc->ctrl_req, dwc->ctrl_req_addr);
+	dma_free_coherent(dwc->ctrl_req);
 
 err0:
 	return ret;
@@ -2737,14 +2650,25 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
 
 	dwc3_gadget_free_endpoints(dwc);
 
-	dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
-			dwc->ep0_bounce, dwc->ep0_bounce_addr);
+	dma_free_coherent(dwc->ep0_bounce);
 
 	kfree(dwc->setup_buf);
 
-	dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb),
-			dwc->ep0_trb, dwc->ep0_trb_addr);
+	dma_free_coherent(dwc->ep0_trb);
 
-	dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
-			dwc->ctrl_req, dwc->ctrl_req_addr);
+	dma_free_coherent(dwc->ctrl_req);
+}
+
+/**
+ * dwc3_gadget_uboot_handle_interrupt - handle dwc3 gadget interrupt
+ * @dwc: struct dwce *
+ *
+ * Handles ep0 and gadget interrupt
+ *
+ * Should be called from dwc3 core.
+ */
+void dwc3_gadget_uboot_handle_interrupt(struct dwc3 *dwc)
+{
+	dwc3_interrupt(0, dwc);
+	dwc3_thread_interrupt(0, dwc);
 }
drivers/usb/dwc3/gadget.h +0 -0
index 042e247..c7db219 100644
@@ -87,6 +87,7 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int

value); int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, gfp_t gfp_flags);
int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int
protocol); +void dwc3_gadget_uboot_handle_interrupt(struct dwc3 *dwc);

/**
* dwc3_gadget_ep_get_transfer_index - Gets transfer index from HW

(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h index 58c4716..719e82e 100644

drivers/usb/dwc3/linux-compat.h +0 -3
@@ -5,9 +5,6 @@
  *
  * Authors: Kishon Vijay Abraham I <[email protected]>
  *
- * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported
- * to uboot.
- *
  * SPDX-License-Identifier:	GPL-2.0
  *
  */
include/linux/compat.h +1 -0
index b40133c..904425a 100644
@@ -327,6 +327,7 @@ typedef unsigned long dmaaddr_t;
 
 #define IRQ_NONE 0
 #define IRQ_HANDLED 1
+#define IRQ_WAKE_THREAD 2
 
 #define dev_set_drvdata(dev, data) do {} while (0)
 
include/linux/usb/gadget.h +3 -0
index 1960958..93a5ffc 100644
@@ -31,6 +31,7 @@ struct usb_ep;
  * @dma: DMA address corresponding to 'buf'.  If you don't set this
  *	field, and the usb controller needs one, it is responsible
  *	for mapping and unmapping the buffer.
+ * @stream_id: The stream id, when USB3.0 bulk streams are being used
  * @length: Length of that data
  * @no_interrupt: If true, hints that no completion irq is needed.
  *	Helpful sometimes with deep request queues that are handled
@@ -85,6 +86,7 @@ struct usb_request {
 	unsigned		length;
 	dma_addr_t		dma;
 
+	unsigned		stream_id:16;
 	unsigned		no_interrupt:1;
 	unsigned		zero:1;
 	unsigned		short_not_ok:1;
@@ -121,6 +123,7 @@ struct usb_ep_ops {
 	int (*dequeue) (struct usb_ep *ep, struct usb_request *req);
 
 	int (*set_halt) (struct usb_ep *ep, int value);
+	int (*set_wedge)(struct usb_ep *ep);
 	int (*fifo_status) (struct usb_ep *ep);
 	void (*fifo_flush) (struct usb_ep *ep);
 };
@@ -133,8 +136,18 @@ struct usb_ep_ops {
  * @maxpacket:The maximum packet size used on this endpoint.  The

initial
* value can sometimes be reduced (hardware allowing),
according to
* the endpoint descriptor used to configure the endpoint.
+ * @maxpacket_limit:The maximum packet size value which can be handled by this
+ * endpoint. It's set once by UDC driver when endpoint is
initialized, and
+ * should not be changed. Should not be confused with
maxpacket.
+ * @max_streams: The maximum number of streams supported
+ * by this EP (0 - 16, actual number is 2^n)
+ * @maxburst: the maximum number of bursts supported by this EP (for usb3)
* @driver_data:for use by the gadget driver. all other fields are
* read-only to gadget drivers.
+ * @desc: endpoint descriptor. This pointer is set before the endpoint is
+ * enabled and remains valid until the endpoint is disabled.
+ * @comp_desc: In case of SuperSpeed support, this is the endpoint companion
+ * descriptor that is used to configure the endpoint
*
* the bus controller driver lists all the general purpose endpoints
in
* gadget->ep_list. the control endpoint (gadget->ep0) is not in
that list, @@ -146,11 +159,31 @@ struct usb_ep {

include/linux/usb/gadget.h +6 -0
 	const struct usb_ep_ops	*ops;
 	struct list_head	ep_list;
 	unsigned		maxpacket:16;
+	unsigned		maxpacket_limit:16;
+	unsigned		max_streams:16;
+	unsigned		maxburst:5;
+	const struct usb_endpoint_descriptor	*desc;
+	const struct usb_ss_ep_comp_descriptor	*comp_desc;
 };
 
 /*-------------------------------------------------------------------------*/
 
 /**
+ * usb_ep_set_maxpacket_limit - set maximum packet size limit for

endpoint
+ * @ep:the endpoint being configured
+ * @maxpacket_limit:value of maximum packet size limit
+ *
+ * This function shoud be used only in UDC drivers to initialize endpoint
+ * (usually in probe function).
+ */

include/linux/usb/gadget.h +2 -0
+static inline void usb_ep_set_maxpacket_limit(struct usb_ep *ep,
+					      unsigned

maxpacket_limit) +{

include/linux/usb/gadget.h +5 -0
+	ep->maxpacket_limit = maxpacket_limit;
+	ep->maxpacket = maxpacket_limit;
+}
+
+/**
  * usb_ep_enable - configure endpoint, making it usable
  * @ep:the endpoint being configured.  may not be the endpoint named

"ep0".
* drivers discover endpoints through the ep_list of a
usb_gadget. @@ -422,6 +455,8 @@ struct usb_gadget_ops {
* driver setup() requests
* @ep_list: List of other endpoints supported by the device.
* @speed: Speed of current connection to USB host.
+ * @max_speed: Maximal speed the UDC can handle. UDC must support this
+ * and all slower speeds.
* @is_dualspeed: true if the controller supports both high and full
speed
* operation. If it does, the gadget driver must also
support both.
* @is_otg: true if the USB device port uses a Mini-AB jack, so that
the @@ -438,6 +473,8 @@ struct usb_gadget_ops {
* @name: Identifies the controller hardware type. Used in
diagnostics
* and sometimes configuration.
* @dev: Driver model state for this abstract device.
+ * @quirk_ep_out_aligned_size: epout requires buffer size to be aligned to
+ * MaxPacketSize.
*
* Gadgets have a mostly-portable "gadget driver" implementing device
* functions, handling all usb configurations and interfaces. Gadget

include/linux/usb/gadget.h +2 -0
@@ -463,6 +500,7 @@ struct usb_gadget {
 	struct usb_ep			*ep0;
 	struct list_head		ep_list;	/* of usb_ep
 */ enum usb_device_speed		speed;
+	enum usb_device_speed		max_speed;
 	enum usb_device_state		state;
 	unsigned			is_dualspeed:1;
 	unsigned			is_otg:1;
@@ -472,6 +510,7 @@ struct usb_gadget {
 	unsigned			a_alt_hnp_support:1;
 	const char			*name;
 	struct device			dev;
+	unsigned			quirk_ep_out_aligned_size:1;
 };
 
 static inline void set_gadget_data(struct usb_gadget *gadget, void
Quoted 1 line

*data)

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#49 lore raw

PATCH 16/40 include: asm: types: add resource_size_t type

In reply to Kishon Vijay Abraham I

Added resource_size_t type in order to get rid of the following compilation error whiel building dwc3 gadget. include/linux/ioport.h:19:2: error: unknown type name ?resource_size_t?

---
 arch/arm/include/asm/types.h |    1 +
 1 file changed, 1 insertion(+)
arch/arm/include/asm/types.h +1 -0
index 2326420..ee77c41 100644
@@ -54,4 +54,5 @@ typedef unsigned long phys_size_t;
 
 #endif /* __KERNEL__ */
 
+typedef unsigned long resource_size_t;
 #endif
Signature · 1 line
1.7.9.5
#50 lore raw

PATCH 16/40 include: asm: types: add resource_size_t type

Hi Kishon,

Quoted 15 lines

Added resource_size_t type in order to get rid of the following compilation error whiel building dwc3 gadget. include/linux/ioport.h:19:2: error: unknown type name ?resource_size_t?

---
 arch/arm/include/asm/types.h |    1 +
 1 file changed, 1 insertion(+)
(quoted diff) +0 -0

b/arch/arm/include/asm/types.h index 2326420..ee77c41 100644

arch/arm/include/asm/types.h typedef unsigned long phys_size_t; · line 58

Quoted 5 lines
arch/arm/include/asm/types.h +1 -0
@@ -54,4 +54,5 @@ typedef unsigned long phys_size_t;
 
 #endif /* __KERNEL__ */
 
+typedef unsigned long resource_size_t;
 #endif
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#51 lore raw

PATCH 17/40 usb: dwc3: ep0: make dwc3 ep0 build in uboot

In reply to Kishon Vijay Abraham I

*) Changed the included header files to that used in u-boot. *) added dwc3_ep_event_string() used in ep0.c
*) Fixed other misc warnings

---
 drivers/usb/dwc3/core.h         |   24 ++++++++++++++++++++++++
 drivers/usb/dwc3/ep0.c          |   14 ++------------
 drivers/usb/dwc3/linux-compat.h |    1 +
 3 files changed, 27 insertions(+), 12 deletions(-)
drivers/usb/dwc3/core.h +24 -0
index 97f71ad..0ffcb7d 100644
@@ -841,6 +841,30 @@ struct dwc3_event_type {
 #define DWC3_DEPEVT_EPCMDCMPLT		0x07
 
 /**
+ * dwc3_ep_event_string - returns event name
+ * @event: then event code
+ */
+static inline const char *dwc3_ep_event_string(u8 event)
+{
+	switch (event) {
+	case DWC3_DEPEVT_XFERCOMPLETE:
+		return "Transfer Complete";
+	case DWC3_DEPEVT_XFERINPROGRESS:
+		return "Transfer In-Progress";
+	case DWC3_DEPEVT_XFERNOTREADY:
+		return "Transfer Not Ready";
+	case DWC3_DEPEVT_RXTXFIFOEVT:
+		return "FIFO";
+	case DWC3_DEPEVT_STREAMEVT:
+		return "Stream";
+	case DWC3_DEPEVT_EPCMDCMPLT:
+		return "Endpoint Command Complete";
+	}
+
+	return "UNKNOWN";
+}
+
+/**
  * struct dwc3_event_depvt - Device Endpoint Events
  * @one_bit: indicates this is an endpoint event (not used)
  * @endpoint_number: number of the endpoint
drivers/usb/dwc3/ep0.c +2 -12
index 1751b1d..803ba51 100644
@@ -15,24 +15,18 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
 #include <linux/list.h>
-#include <linux/dma-mapping.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
 
 #include "core.h"
-#include "debug.h"
 #include "gadget.h"
 #include "io.h"
 
+#include "linux-compat.h"
+
 static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep);
 static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
 		struct dwc3_ep *dep, struct dwc3_request *req);
@@ -277,8 +271,6 @@ int __dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)
 
 int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)
 {
-	struct dwc3_ep			*dep = to_dwc3_ep(ep);
-	struct dwc3			*dwc = dep->dwc;
 	unsigned long			flags;
 	int				ret;
 
@@ -632,12 +624,10 @@ static int dwc3_ep0_set_sel(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
 	struct dwc3_ep	*dep;
 	enum usb_device_state state = dwc->gadget.state;
 	u16		wLength;
-	u16		wValue;
 
 	if (state == USB_STATE_DEFAULT)
 		return -EINVAL;
 
-	wValue = le16_to_cpu(ctrl->wValue);
 	wLength = le16_to_cpu(ctrl->wLength);
 
 	if (wLength != 6) {
drivers/usb/dwc3/linux-compat.h +1 -0
index 719e82e..cbfb946 100644
@@ -14,6 +14,7 @@
 
 #define pr_debug(format)                debug(format)
 #define WARN(val, format, arg...)	debug(format, ##arg)
+#define dev_WARN(dev, format, arg...)	debug(format, ##arg)
 #define WARN_ON_ONCE(val)		debug("Error %d\n", val)
 
 #define BUILD_BUG_ON_NOT_POWER_OF_2(n)
Signature · 1 line
1.7.9.5
#52 lore raw

PATCH 17/40 usb: dwc3: ep0: make dwc3 ep0 build in uboot

Hi Kishon,

Quoted 104 lines

*) Changed the included header files to that used in u-boot. *) added dwc3_ep_event_string() used in ep0.c
*) Fixed other misc warnings

---
 drivers/usb/dwc3/core.h         |   24 ++++++++++++++++++++++++
 drivers/usb/dwc3/ep0.c          |   14 ++------------
 drivers/usb/dwc3/linux-compat.h |    1 +
 3 files changed, 27 insertions(+), 12 deletions(-)
drivers/usb/dwc3/core.h +24 -0
index 97f71ad..0ffcb7d 100644
@@ -841,6 +841,30 @@ struct dwc3_event_type {
 #define DWC3_DEPEVT_EPCMDCMPLT		0x07
 
 /**
+ * dwc3_ep_event_string - returns event name
+ * @event: then event code
+ */
+static inline const char *dwc3_ep_event_string(u8 event)
+{
+	switch (event) {
+	case DWC3_DEPEVT_XFERCOMPLETE:
+		return "Transfer Complete";
+	case DWC3_DEPEVT_XFERINPROGRESS:
+		return "Transfer In-Progress";
+	case DWC3_DEPEVT_XFERNOTREADY:
+		return "Transfer Not Ready";
+	case DWC3_DEPEVT_RXTXFIFOEVT:
+		return "FIFO";
+	case DWC3_DEPEVT_STREAMEVT:
+		return "Stream";
+	case DWC3_DEPEVT_EPCMDCMPLT:
+		return "Endpoint Command Complete";
+	}
+
+	return "UNKNOWN";
+}
+
+/**
  * struct dwc3_event_depvt - Device Endpoint Events
  * @one_bit: indicates this is an endpoint event (not used)
  * @endpoint_number: number of the endpoint
drivers/usb/dwc3/ep0.c +2 -8
index 1751b1d..803ba51 100644
@@ -15,24 +15,18 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
 #include <linux/list.h>
-#include <linux/dma-mapping.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
 
 #include "core.h"
-#include "debug.h"
 #include "gadget.h"
 #include "io.h"
 
+#include "linux-compat.h"
+
 static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct

dwc3_ep *dep); static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, struct dwc3_ep *dep, struct dwc3_request *req);

drivers/usb/dwc3/ep0.c +0 -4
@@ -277,8 +271,6 @@ int __dwc3_gadget_ep0_set_halt(struct usb_ep *ep,
 int value) 
 int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)
 {
-	struct dwc3_ep			*dep = to_dwc3_ep(ep);
-	struct dwc3			*dwc = dep->dwc;
 	unsigned long			flags;
 	int				ret;
 
@@ -632,12 +624,10 @@ static int dwc3_ep0_set_sel(struct dwc3 *dwc,
 struct usb_ctrlrequest *ctrl) struct dwc3_ep	*dep;
 	enum usb_device_state state = dwc->gadget.state;
 	u16		wLength;
-	u16		wValue;
 
 	if (state == USB_STATE_DEFAULT)
 		return -EINVAL;
 
-	wValue = le16_to_cpu(ctrl->wValue);
 	wLength = le16_to_cpu(ctrl->wLength);
 
 	if (wLength != 6) {
(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h index 719e82e..cbfb946 100644

drivers/usb/dwc3/linux-compat.h line 20

Quoted 7 lines
drivers/usb/dwc3/linux-compat.h +1 -0
@@ -14,6 +14,7 @@
 
 #define pr_debug(format)                debug(format)
 #define WARN(val, format, arg...)	debug(format, ##arg)
+#define dev_WARN(dev, format, arg...)	debug(format, ##arg)
 #define WARN_ON_ONCE(val)		debug("Error %d\n", val)
 
 #define BUILD_BUG_ON_NOT_POWER_OF_2(n)
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#53 lore raw

PATCH 18/40 include: usb: composite: add USB_GADGET_DELAYED_STATUS to avoid compilation error

In reply to Kishon Vijay Abraham I

Added USB_GADGET_DELAYED_STATUS to avoid the following compilation error.
error: ?USB_GADGET_DELAYED_STATUS? undeclared (first use in this function) while compiling dwc3/ep0.c

While this is been added only to avoid compilation error, the complete fix should be something like the one added in linux kernel. The complete fix will be ported once we have the composite driver in u-boot look similar to the one in linux kernel.
commit 1b9ba000177ee47bcc5b44c7c34e48e735f5f9b1

Author: Roger Quadros <[email protected]>
Date:   Mon May 9 13:08:06 2011 +0300

usb: gadget: composite: Allow function drivers to pause control transfers

---
 include/linux/usb/composite.h |    9 +++++++++
 1 file changed, 9 insertions(+)
include/linux/usb/composite.h +9 -0
index f833d10..86e1cea 100644
@@ -27,6 +27,15 @@
 #include <linux/usb/gadget.h>
 #include <usb/lin_gadget_compat.h>
 
+/*
+ * USB function drivers should return USB_GADGET_DELAYED_STATUS if they
+ * wish to delay the data/status stages of the control transfer till they
+ * are ready. The control transfer will then be kept from completing till
+ * all the function drivers that requested for USB_GADGET_DELAYED_STAUS
+ * invoke usb_composite_setup_continue().
+ */
+#define	USB_GADGET_DELAYED_STATUS	0x7fff /* Impossibly large value */
+
 struct usb_configuration;
 
 /**
Signature · 1 line
1.7.9.5
#54 lore raw

PATCH 18/40 include: usb: composite: add USB_GADGET_DELAYED_STATUS to avoid compilation error

Hi Kishon,

Quoted 43 lines

Added USB_GADGET_DELAYED_STATUS to avoid the following compilation error. error: ?USB_GADGET_DELAYED_STATUS? undeclared (first use in this function) while compiling dwc3/ep0.c

While this is been added only to avoid compilation error, the complete fix should be something like the one added in linux kernel. The complete fix will be ported once we have the composite driver in u-boot look similar to the one in linux kernel.
commit 1b9ba000177ee47bcc5b44c7c34e48e735f5f9b1

Author: Roger Quadros <[email protected]>
Date:   Mon May 9 13:08:06 2011 +0300

usb: gadget: composite: Allow function drivers to pause control
transfers

---
 include/linux/usb/composite.h |    9 +++++++++
 1 file changed, 9 insertions(+)
(quoted diff) +0 -0

b/include/linux/usb/composite.h index f833d10..86e1cea 100644

include/linux/usb/composite.h +2 -0
@@ -27,6 +27,15 @@
 #include <linux/usb/gadget.h>
 #include <usb/lin_gadget_compat.h>
 
+/*
+ * USB function drivers should return USB_GADGET_DELAYED_STATUS if

they
+ * wish to delay the data/status stages of the control transfer till they
+ * are ready. The control transfer will then be kept from completing till
+ * all the function drivers that requested for USB_GADGET_DELAYED_STAUS
+ * invoke usb_composite_setup_continue().
+ */
+#define USB_GADGET_DELAYED_STATUS 0x7fff /* Impossibly
large value */ +
struct usb_configuration;

Quoted 1 line

/**

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#55 lore raw

PATCH 19/40 usb: dwc3: core: make dwc3 core build in uboot

In reply to Kishon Vijay Abraham I

*) Changed the include header files to that used in u-boot. *) Removed phy_* APIs
*) Removed jiffies and used a simple while loop
*) Used dma_alloc_coherent and dma_free_coherent APIs of u-boot *) Fixed other misc warnings

---
 drivers/usb/dwc3/core.c         |  216 ++++++---------------------------------
 drivers/usb/dwc3/core.h         |   10 --
 drivers/usb/dwc3/linux-compat.h |   10 ++
 3 files changed, 40 insertions(+), 196 deletions(-)
drivers/usb/dwc3/core.c +30 -186
index ebfb6ca..78322b7 100644
@@ -14,32 +14,19 @@
  * SPDX-License-Identifier:     GPL-2.0
  */
 
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
+#include <common.h>
+#include <malloc.h>
+#include <asm/dma-mapping.h>
 #include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/list.h>
-#include <linux/delay.h>
-#include <linux/dma-mapping.h>
-#include <linux/of.h>
-#include <linux/acpi.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
-#include <linux/usb/of.h>
-#include <linux/usb/otg.h>
 
-#include "platform_data.h"
 #include "core.h"
 #include "gadget.h"
 #include "io.h"
 
-#include "debug.h"
+#include "linux-compat.h"
 
 /* -------------------------------------------------------------------------- */
 
@@ -60,7 +47,6 @@ void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
 static int dwc3_core_soft_reset(struct dwc3 *dwc)
 {
 	u32		reg;
-	int		ret;
 
 	/* Before Resetting PHY, put Core in Reset */
 	reg = dwc3_readl(dwc->regs, DWC3_GCTL);
@@ -77,17 +63,6 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
 	reg |= DWC3_GUSB2PHYCFG_PHYSOFTRST;
 	dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
 
-	usb_phy_init(dwc->usb2_phy);
-	usb_phy_init(dwc->usb3_phy);
-	ret = phy_init(dwc->usb2_generic_phy);
-	if (ret < 0)
-		return ret;
-
-	ret = phy_init(dwc->usb3_generic_phy);
-	if (ret < 0) {
-		phy_exit(dwc->usb2_generic_phy);
-		return ret;
-	}
 	mdelay(100);
 
 	/* Clear USB3 PHY reset */
@@ -118,7 +93,7 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
 static void dwc3_free_one_event_buffer(struct dwc3 *dwc,
 		struct dwc3_event_buffer *evt)
 {
-	dma_free_coherent(dwc->dev, evt->length, evt->buf, evt->dma);
+	dma_free_coherent(evt->buf);
 }
 
 /**
@@ -140,8 +115,8 @@ static struct dwc3_event_buffer *dwc3_alloc_one_event_buffer(struct dwc3 *dwc,
 
 	evt->dwc	= dwc;
 	evt->length	= length;
-	evt->buf	= dma_alloc_coherent(dwc->dev, length,
-			&evt->dma, GFP_KERNEL);
+	evt->buf	= dma_alloc_coherent(length,
+					     (unsigned long *)&evt->dma);
 	if (!evt->buf)
 		return ERR_PTR(-ENOMEM);
 
@@ -276,13 +251,9 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
 	if (!dwc->nr_scratch)
 		return 0;
 
-	 /* should never fall here */
-	if (!WARN_ON(dwc->scratchbuf))
-		return 0;
-
-	scratch_addr = dma_map_single(dwc->dev, dwc->scratchbuf,
-			dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE,
-			DMA_BIDIRECTIONAL);
+	scratch_addr = dma_map_single(dwc->scratchbuf,
+				      dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE,
+				      DMA_BIDIRECTIONAL);
 	if (dma_mapping_error(dwc->dev, scratch_addr)) {
 		dev_err(dwc->dev, "failed to map scratch buffer\n");
 		ret = -EFAULT;
@@ -308,8 +279,8 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
 	return 0;
 
 err1:
-	dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch *
-			DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
+	dma_unmap_single((void *)dwc->scratch_addr, dwc->nr_scratch *
+			 DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
 
 err0:
 	return ret;
@@ -323,12 +294,8 @@ static void dwc3_free_scratch_buffers(struct dwc3 *dwc)
 	if (!dwc->nr_scratch)
 		return;
 
-	 /* should never fall here */
-	if (!WARN_ON(dwc->scratchbuf))
-		return;
-
-	dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch *
-			DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
+	dma_unmap_single((void *)dwc->scratch_addr, dwc->nr_scratch *
+			 DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
 	kfree(dwc->scratchbuf);
 }
 
@@ -446,12 +413,6 @@ static int dwc3_core_init(struct dwc3 *dwc)
 	}
 	dwc->revision = reg;
 
-	/*
-	 * Write Linux Version Code to our GUID register so it's easy to figure
-	 * out which kernel version a bug was found.
-	 */
-	dwc3_writel(dwc->regs, DWC3_GUID, LINUX_VERSION_CODE);
-
 	/* Handle USB2.0-only core configuration */
 	if (DWC3_GHWPARAMS3_SSPHY_IFC(dwc->hwparams.hwparams3) ==
 			DWC3_GHWPARAMS3_SSPHY_IFC_DIS) {
@@ -460,21 +421,19 @@ static int dwc3_core_init(struct dwc3 *dwc)
 	}
 
 	/* issue device SoftReset too */
-	timeout = jiffies + msecs_to_jiffies(500);
+	timeout = 5000;
 	dwc3_writel(dwc->regs, DWC3_DCTL, DWC3_DCTL_CSFTRST);
-	do {
+	while (timeout--) {
 		reg = dwc3_readl(dwc->regs, DWC3_DCTL);
 		if (!(reg & DWC3_DCTL_CSFTRST))
 			break;
+	};
 
-		if (time_after(jiffies, timeout)) {
-			dev_err(dwc->dev, "Reset Timed Out\n");
-			ret = -ETIMEDOUT;
-			goto err0;
-		}
-
-		cpu_relax();
-	} while (true);
+	if (!timeout) {
+		dev_err(dwc->dev, "Reset Timed Out\n");
+		ret = -ETIMEDOUT;
+		goto err0;
+	}
 
 	ret = dwc3_core_soft_reset(dwc);
 	if (ret)
@@ -525,8 +484,9 @@ static int dwc3_core_init(struct dwc3 *dwc)
 		dwc->is_fpga = true;
 	}
 
-	WARN_ONCE(dwc->disable_scramble_quirk && !dwc->is_fpga,
-			"disable_scramble cannot be used on non-FPGA builds\n");
+	if(dwc->disable_scramble_quirk && !dwc->is_fpga)
+		WARN(true,
+		     "disable_scramble cannot be used on non-FPGA builds\n");
 
 	if (dwc->disable_scramble_quirk && dwc->is_fpga)
 		reg |= DWC3_GCTL_DISSCRAMBLE;
@@ -553,22 +513,16 @@ static int dwc3_core_init(struct dwc3 *dwc)
 
 	ret = dwc3_alloc_scratch_buffers(dwc);
 	if (ret)
-		goto err1;
+		goto err0;
 
 	ret = dwc3_setup_scratch_buffers(dwc);
 	if (ret)
-		goto err2;
+		goto err1;
 
 	return 0;
 
-err2:
-	dwc3_free_scratch_buffers(dwc);
-
 err1:
-	usb_phy_shutdown(dwc->usb2_phy);
-	usb_phy_shutdown(dwc->usb3_phy);
-	phy_exit(dwc->usb2_generic_phy);
-	phy_exit(dwc->usb3_generic_phy);
+	dwc3_free_scratch_buffers(dwc);
 
 err0:
 	return ret;
@@ -577,82 +531,10 @@ err0:
 static void dwc3_core_exit(struct dwc3 *dwc)
 {
 	dwc3_free_scratch_buffers(dwc);
-	usb_phy_shutdown(dwc->usb2_phy);
-	usb_phy_shutdown(dwc->usb3_phy);
-	phy_exit(dwc->usb2_generic_phy);
-	phy_exit(dwc->usb3_generic_phy);
-}
-
-static int dwc3_core_get_phy(struct dwc3 *dwc)
-{
-	struct device		*dev = dwc->dev;
-	struct device_node	*node = dev->of_node;
-	int ret;
-
-	if (node) {
-		dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0);
-		dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 1);
-	} else {
-		dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
-		dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3);
-	}
-
-	if (IS_ERR(dwc->usb2_phy)) {
-		ret = PTR_ERR(dwc->usb2_phy);
-		if (ret == -ENXIO || ret == -ENODEV) {
-			dwc->usb2_phy = NULL;
-		} else if (ret == -EPROBE_DEFER) {
-			return ret;
-		} else {
-			dev_err(dev, "no usb2 phy configured\n");
-			return ret;
-		}
-	}
-
-	if (IS_ERR(dwc->usb3_phy)) {
-		ret = PTR_ERR(dwc->usb3_phy);
-		if (ret == -ENXIO || ret == -ENODEV) {
-			dwc->usb3_phy = NULL;
-		} else if (ret == -EPROBE_DEFER) {
-			return ret;
-		} else {
-			dev_err(dev, "no usb3 phy configured\n");
-			return ret;
-		}
-	}
-
-	dwc->usb2_generic_phy = devm_phy_get(dev, "usb2-phy");
-	if (IS_ERR(dwc->usb2_generic_phy)) {
-		ret = PTR_ERR(dwc->usb2_generic_phy);
-		if (ret == -ENOSYS || ret == -ENODEV) {
-			dwc->usb2_generic_phy = NULL;
-		} else if (ret == -EPROBE_DEFER) {
-			return ret;
-		} else {
-			dev_err(dev, "no usb2 phy configured\n");
-			return ret;
-		}
-	}
-
-	dwc->usb3_generic_phy = devm_phy_get(dev, "usb3-phy");
-	if (IS_ERR(dwc->usb3_generic_phy)) {
-		ret = PTR_ERR(dwc->usb3_generic_phy);
-		if (ret == -ENOSYS || ret == -ENODEV) {
-			dwc->usb3_generic_phy = NULL;
-		} else if (ret == -EPROBE_DEFER) {
-			return ret;
-		} else {
-			dev_err(dev, "no usb3 phy configured\n");
-			return ret;
-		}
-	}
-
-	return 0;
 }
 
 static int dwc3_core_init_mode(struct dwc3 *dwc)
 {
-	struct device *dev = dwc->dev;
 	int ret;
 
 	switch (dwc->dr_mode) {
@@ -870,10 +752,6 @@ static int dwc3_probe(struct platform_device *pdev)
 	dwc->hird_threshold = hird_threshold
 		| (dwc->is_utmi_l1_suspend << 4);
 
-	ret = dwc3_core_get_phy(dwc);
-	if (ret)
-		return ret;
-
 	spin_lock_init(&dwc->lock);
 	platform_set_drvdata(pdev, dwc);
 
@@ -888,8 +766,7 @@ static int dwc3_probe(struct platform_device *pdev)
 	ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
 	if (ret) {
 		dev_err(dwc->dev, "failed to allocate event buffers\n");
-		ret = -ENOMEM;
-		goto err0;
+		return -ENOMEM;
 	}
 
 	if (IS_ENABLED(CONFIG_USB_DWC3_HOST))
@@ -906,49 +783,22 @@ static int dwc3_probe(struct platform_device *pdev)
 		goto err0;
 	}
 
-	usb_phy_set_suspend(dwc->usb2_phy, 0);
-	usb_phy_set_suspend(dwc->usb3_phy, 0);
-	ret = phy_power_on(dwc->usb2_generic_phy);
-	if (ret < 0)
-		goto err1;
-
-	ret = phy_power_on(dwc->usb3_generic_phy);
-	if (ret < 0)
-		goto err_usb2phy_power;
-
 	ret = dwc3_event_buffers_setup(dwc);
 	if (ret) {
 		dev_err(dwc->dev, "failed to setup event buffers\n");
-		goto err_usb3phy_power;
+		goto err1;
 	}
 
 	ret = dwc3_core_init_mode(dwc);
 	if (ret)
 		goto err2;
 
-	ret = dwc3_debugfs_init(dwc);
-	if (ret) {
-		dev_err(dev, "failed to initialize debugfs\n");
-		goto err3;
-	}
-
 	return 0;
 
-err3:
-	dwc3_core_exit_mode(dwc);
-
 err2:
 	dwc3_event_buffers_cleanup(dwc);
 
-err_usb3phy_power:
-	phy_power_off(dwc->usb3_generic_phy);
-
-err_usb2phy_power:
-	phy_power_off(dwc->usb2_generic_phy);
-
 err1:
-	usb_phy_set_suspend(dwc->usb2_phy, 1);
-	usb_phy_set_suspend(dwc->usb3_phy, 1);
 	dwc3_core_exit(dwc);
 
 err0:
@@ -961,16 +811,10 @@ static int dwc3_remove(struct platform_device *pdev)
 {
 	struct dwc3	*dwc = platform_get_drvdata(pdev);
 
-	dwc3_debugfs_exit(dwc);
 	dwc3_core_exit_mode(dwc);
 	dwc3_event_buffers_cleanup(dwc);
 	dwc3_free_event_buffers(dwc);
 
-	usb_phy_set_suspend(dwc->usb2_phy, 1);
-	usb_phy_set_suspend(dwc->usb3_phy, 1);
-	phy_power_off(dwc->usb2_generic_phy);
-	phy_power_off(dwc->usb3_generic_phy);
-
 	dwc3_core_exit(dwc);
 
 	return 0;
drivers/usb/dwc3/core.h +0 -10
index 0ffcb7d..0d507c1 100644
@@ -641,10 +641,6 @@ struct dwc3_scratchpad_array {
  * @maximum_speed: maximum speed requested (mainly for testing purposes)
  * @revision: revision register contents
  * @dr_mode: requested mode of operation
- * @usb2_phy: pointer to USB2 PHY
- * @usb3_phy: pointer to USB3 PHY
- * @usb2_generic_phy: pointer to USB2 PHY
- * @usb3_generic_phy: pointer to USB3 PHY
  * @dcfg: saved contents of DCFG register
  * @gctl: saved contents of GCTL register
  * @isoch_delay: wValue from Set Isochronous Delay request;
@@ -726,12 +722,6 @@ struct dwc3 {
 	struct usb_gadget	gadget;
 	struct usb_gadget_driver *gadget_driver;
 
-	struct usb_phy		*usb2_phy;
-	struct usb_phy		*usb3_phy;
-
-	struct phy		*usb2_generic_phy;
-	struct phy		*usb3_generic_phy;
-
 	void __iomem		*regs;
 	size_t			regs_size;
 
drivers/usb/dwc3/linux-compat.h +10 -0
index cbfb946..b36f68f 100644
@@ -25,4 +25,14 @@ static inline size_t strlcat(char *dest, const char *src, size_t n)
 	return strlen(dest) + strlen(src);
 }
 
+static inline void *devm_kzalloc(struct device *dev, unsigned int size,
+				 unsigned int flags)
+{
+	return kzalloc(size, flags);
+}
+
+static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
+{
+	return kzalloc(n * size, flags);
+}
 #endif
Signature · 1 line
1.7.9.5
#56 lore raw

PATCH 19/40 usb: dwc3: core: make dwc3 core build in uboot

Hi Kishon,

Quoted 455 lines

*) Changed the include header files to that used in u-boot. *) Removed phy_* APIs
*) Removed jiffies and used a simple while loop
*) Used dma_alloc_coherent and dma_free_coherent APIs of u-boot *) Fixed other misc warnings

---
 drivers/usb/dwc3/core.c         |  216
++++++---------------------------------
drivers/usb/dwc3/core.h         |   10 --
drivers/usb/dwc3/linux-compat.h |   10 ++ 3 files changed, 40

insertions(+), 196 deletions(-)

drivers/usb/dwc3/core.c +4 -18
index ebfb6ca..78322b7 100644
@@ -14,32 +14,19 @@
  * SPDX-License-Identifier:     GPL-2.0
  */
 
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
+#include <common.h>
+#include <malloc.h>
+#include <asm/dma-mapping.h>
 #include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/list.h>
-#include <linux/delay.h>
-#include <linux/dma-mapping.h>
-#include <linux/of.h>
-#include <linux/acpi.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
-#include <linux/usb/of.h>
-#include <linux/usb/otg.h>
 
-#include "platform_data.h"
 #include "core.h"
 #include "gadget.h"
 #include "io.h"
 
-#include "debug.h"
+#include "linux-compat.h"
 
 /*
--------------------------------------------------------------------------

*/ @@ -60,7 +47,6 @@ void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
static int dwc3_core_soft_reset(struct dwc3 *dwc)
{

drivers/usb/dwc3/core.c +6 -22
 	u32		reg;
-	int		ret;
 
 	/* Before Resetting PHY, put Core in Reset */
 	reg = dwc3_readl(dwc->regs, DWC3_GCTL);
@@ -77,17 +63,6 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
 	reg |= DWC3_GUSB2PHYCFG_PHYSOFTRST;
 	dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
 
-	usb_phy_init(dwc->usb2_phy);
-	usb_phy_init(dwc->usb3_phy);
-	ret = phy_init(dwc->usb2_generic_phy);
-	if (ret < 0)
-		return ret;
-
-	ret = phy_init(dwc->usb3_generic_phy);
-	if (ret < 0) {
-		phy_exit(dwc->usb2_generic_phy);
-		return ret;
-	}
 	mdelay(100);
 
 	/* Clear USB3 PHY reset */
@@ -118,7 +93,7 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
 static void dwc3_free_one_event_buffer(struct dwc3 *dwc,
 		struct dwc3_event_buffer *evt)
 {
-	dma_free_coherent(dwc->dev, evt->length, evt->buf, evt->dma);
+	dma_free_coherent(evt->buf);
 }
 
 /**
@@ -140,8 +115,8 @@ static struct dwc3_event_buffer
 *dwc3_alloc_one_event_buffer(struct dwc3 *dwc, 
 	evt->dwc	= dwc;
 	evt->length	= length;
-	evt->buf	= dma_alloc_coherent(dwc->dev, length,
-			&evt->dma, GFP_KERNEL);
+	evt->buf	= dma_alloc_coherent(length,
+					     (unsigned long
 *)&evt->dma); if (!evt->buf)
 		return ERR_PTR(-ENOMEM);
 
@@ -276,13 +251,9 @@ static int dwc3_setup_scratch_buffers(struct
 dwc3 *dwc) if (!dwc->nr_scratch)
 		return 0;
 
-	 /* should never fall here */
-	if (!WARN_ON(dwc->scratchbuf))
-		return 0;
-
-	scratch_addr = dma_map_single(dwc->dev, dwc->scratchbuf,
-			dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE,
-			DMA_BIDIRECTIONAL);
+	scratch_addr = dma_map_single(dwc->scratchbuf,
+				      dwc->nr_scratch *
 DWC3_SCRATCHBUF_SIZE,
+				      DMA_BIDIRECTIONAL);
 	if (dma_mapping_error(dwc->dev, scratch_addr)) {
 		dev_err(dwc->dev, "failed to map scratch buffer\n");
drivers/usb/dwc3/core.c +0 -1
 		ret = -EFAULT;
@@ -308,8 +279,8 @@ static int dwc3_setup_scratch_buffers(struct dwc3
 *dwc) return 0;
 
 err1:
-	dma_unmap_single(dwc->dev, dwc->scratch_addr,

dwc->nr_scratch *

drivers/usb/dwc3/core.c +2 -6
-			DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
+	dma_unmap_single((void *)dwc->scratch_addr, dwc->nr_scratch *
+			 DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
 
 err0:
 	return ret;
@@ -323,12 +294,8 @@ static void dwc3_free_scratch_buffers(struct
 dwc3 *dwc) if (!dwc->nr_scratch)
 		return;
 
-	 /* should never fall here */
-	if (!WARN_ON(dwc->scratchbuf))
-		return;
-
-	dma_unmap_single(dwc->dev, dwc->scratch_addr,

dwc->nr_scratch *

drivers/usb/dwc3/core.c +2 -3
-			DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
+	dma_unmap_single((void *)dwc->scratch_addr, dwc->nr_scratch *
+			 DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
 	kfree(dwc->scratchbuf);
 }
@@ -446,12 +413,6 @@ static int dwc3_core_init(struct dwc3 *dwc)
 	}
 	dwc->revision = reg;
 
-	/*
-	 * Write Linux Version Code to our GUID register so it's

easy to figure

drivers/usb/dwc3/core.c +11 -16
-	 * out which kernel version a bug was found.
-	 */
-	dwc3_writel(dwc->regs, DWC3_GUID, LINUX_VERSION_CODE);
-
 	/* Handle USB2.0-only core configuration */
 	if (DWC3_GHWPARAMS3_SSPHY_IFC(dwc->hwparams.hwparams3) ==
 			DWC3_GHWPARAMS3_SSPHY_IFC_DIS) {
@@ -460,21 +421,19 @@ static int dwc3_core_init(struct dwc3 *dwc)
 	}
 
 	/* issue device SoftReset too */
-	timeout = jiffies + msecs_to_jiffies(500);
+	timeout = 5000;
 	dwc3_writel(dwc->regs, DWC3_DCTL, DWC3_DCTL_CSFTRST);
-	do {
+	while (timeout--) {
 		reg = dwc3_readl(dwc->regs, DWC3_DCTL);
 		if (!(reg & DWC3_DCTL_CSFTRST))
 			break;
+	};
 
-		if (time_after(jiffies, timeout)) {
-			dev_err(dwc->dev, "Reset Timed Out\n");
-			ret = -ETIMEDOUT;
-			goto err0;
-		}
-
-		cpu_relax();
-	} while (true);
+	if (!timeout) {
+		dev_err(dwc->dev, "Reset Timed Out\n");
+		ret = -ETIMEDOUT;
+		goto err0;
+	}
 
 	ret = dwc3_core_soft_reset(dwc);
 	if (ret)
@@ -525,8 +484,9 @@ static int dwc3_core_init(struct dwc3 *dwc)
 		dwc->is_fpga = true;
 	}
 
-	WARN_ONCE(dwc->disable_scramble_quirk && !dwc->is_fpga,
-			"disable_scramble cannot be used on non-FPGA
 builds\n");
+	if(dwc->disable_scramble_quirk && !dwc->is_fpga)
+		WARN(true,
+		     "disable_scramble cannot be used on non-FPGA
 builds\n"); 
 	if (dwc->disable_scramble_quirk && dwc->is_fpga)
drivers/usb/dwc3/core.c +4 -87
 		reg |= DWC3_GCTL_DISSCRAMBLE;
@@ -553,22 +513,16 @@ static int dwc3_core_init(struct dwc3 *dwc)
 
 	ret = dwc3_alloc_scratch_buffers(dwc);
 	if (ret)
-		goto err1;
+		goto err0;
 
 	ret = dwc3_setup_scratch_buffers(dwc);
 	if (ret)
-		goto err2;
+		goto err1;
 
 	return 0;
 
-err2:
-	dwc3_free_scratch_buffers(dwc);
-
 err1:
-	usb_phy_shutdown(dwc->usb2_phy);
-	usb_phy_shutdown(dwc->usb3_phy);
-	phy_exit(dwc->usb2_generic_phy);
-	phy_exit(dwc->usb3_generic_phy);
+	dwc3_free_scratch_buffers(dwc);
 
 err0:
 	return ret;
@@ -577,82 +531,10 @@ err0:
 static void dwc3_core_exit(struct dwc3 *dwc)
 {
 	dwc3_free_scratch_buffers(dwc);
-	usb_phy_shutdown(dwc->usb2_phy);
-	usb_phy_shutdown(dwc->usb3_phy);
-	phy_exit(dwc->usb2_generic_phy);
-	phy_exit(dwc->usb3_generic_phy);
-}
-
-static int dwc3_core_get_phy(struct dwc3 *dwc)
-{
-	struct device		*dev = dwc->dev;
-	struct device_node	*node = dev->of_node;
-	int ret;
-
-	if (node) {
-		dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev,
 "usb-phy", 0);
-		dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev,
 "usb-phy", 1);
-	} else {
-		dwc->usb2_phy = devm_usb_get_phy(dev,
 USB_PHY_TYPE_USB2);
-		dwc->usb3_phy = devm_usb_get_phy(dev,
 USB_PHY_TYPE_USB3);
-	}
-
-	if (IS_ERR(dwc->usb2_phy)) {
-		ret = PTR_ERR(dwc->usb2_phy);
-		if (ret == -ENXIO || ret == -ENODEV) {
-			dwc->usb2_phy = NULL;
-		} else if (ret == -EPROBE_DEFER) {
-			return ret;
-		} else {
-			dev_err(dev, "no usb2 phy configured\n");
-			return ret;
-		}
-	}
-
-	if (IS_ERR(dwc->usb3_phy)) {
-		ret = PTR_ERR(dwc->usb3_phy);
-		if (ret == -ENXIO || ret == -ENODEV) {
-			dwc->usb3_phy = NULL;
-		} else if (ret == -EPROBE_DEFER) {
-			return ret;
-		} else {
-			dev_err(dev, "no usb3 phy configured\n");
-			return ret;
-		}
-	}
-
-	dwc->usb2_generic_phy = devm_phy_get(dev, "usb2-phy");
-	if (IS_ERR(dwc->usb2_generic_phy)) {
-		ret = PTR_ERR(dwc->usb2_generic_phy);
-		if (ret == -ENOSYS || ret == -ENODEV) {
-			dwc->usb2_generic_phy = NULL;
-		} else if (ret == -EPROBE_DEFER) {
-			return ret;
-		} else {
-			dev_err(dev, "no usb2 phy configured\n");
-			return ret;
-		}
-	}
-
-	dwc->usb3_generic_phy = devm_phy_get(dev, "usb3-phy");
-	if (IS_ERR(dwc->usb3_generic_phy)) {
-		ret = PTR_ERR(dwc->usb3_generic_phy);
-		if (ret == -ENOSYS || ret == -ENODEV) {
-			dwc->usb3_generic_phy = NULL;
-		} else if (ret == -EPROBE_DEFER) {
-			return ret;
-		} else {
-			dev_err(dev, "no usb3 phy configured\n");
-			return ret;
-		}
-	}
-
-	return 0;
 }
 
 static int dwc3_core_init_mode(struct dwc3 *dwc)
 {
-	struct device *dev = dwc->dev;
 	int ret;
 
 	switch (dwc->dr_mode) {
@@ -870,10 +752,6 @@ static int dwc3_probe(struct platform_device
 *pdev) dwc->hird_threshold = hird_threshold
 		| (dwc->is_utmi_l1_suspend << 4);
 
-	ret = dwc3_core_get_phy(dwc);
-	if (ret)
-		return ret;
-
 	spin_lock_init(&dwc->lock);
 	platform_set_drvdata(pdev, dwc);
 
@@ -888,8 +766,7 @@ static int dwc3_probe(struct platform_device
 *pdev) ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
 	if (ret) {
 		dev_err(dwc->dev, "failed to allocate event
 buffers\n");
-		ret = -ENOMEM;
-		goto err0;
+		return -ENOMEM;
 	}
 
drivers/usb/dwc3/core.c +1 -34
 	if (IS_ENABLED(CONFIG_USB_DWC3_HOST))
@@ -906,49 +783,22 @@ static int dwc3_probe(struct platform_device
 *pdev) goto err0;
 	}
 
-	usb_phy_set_suspend(dwc->usb2_phy, 0);
-	usb_phy_set_suspend(dwc->usb3_phy, 0);
-	ret = phy_power_on(dwc->usb2_generic_phy);
-	if (ret < 0)
-		goto err1;
-
-	ret = phy_power_on(dwc->usb3_generic_phy);
-	if (ret < 0)
-		goto err_usb2phy_power;
-
 	ret = dwc3_event_buffers_setup(dwc);
 	if (ret) {
 		dev_err(dwc->dev, "failed to setup event buffers\n");
-		goto err_usb3phy_power;
+		goto err1;
 	}
 
 	ret = dwc3_core_init_mode(dwc);
 	if (ret)
 		goto err2;
 
-	ret = dwc3_debugfs_init(dwc);
-	if (ret) {
-		dev_err(dev, "failed to initialize debugfs\n");
-		goto err3;
-	}
-
 	return 0;
 
-err3:
-	dwc3_core_exit_mode(dwc);
-
 err2:
 	dwc3_event_buffers_cleanup(dwc);
 
-err_usb3phy_power:
-	phy_power_off(dwc->usb3_generic_phy);
-
-err_usb2phy_power:
-	phy_power_off(dwc->usb2_generic_phy);
-
 err1:
-	usb_phy_set_suspend(dwc->usb2_phy, 1);
-	usb_phy_set_suspend(dwc->usb3_phy, 1);
 	dwc3_core_exit(dwc);
 
 err0:
@@ -961,16 +811,10 @@ static int dwc3_remove(struct platform_device
 *pdev) {
 	struct dwc3	*dwc = platform_get_drvdata(pdev);
 
-	dwc3_debugfs_exit(dwc);
 	dwc3_core_exit_mode(dwc);
 	dwc3_event_buffers_cleanup(dwc);
 	dwc3_free_event_buffers(dwc);
 
-	usb_phy_set_suspend(dwc->usb2_phy, 1);
-	usb_phy_set_suspend(dwc->usb3_phy, 1);
-	phy_power_off(dwc->usb2_generic_phy);
-	phy_power_off(dwc->usb3_generic_phy);
-
 	dwc3_core_exit(dwc);
 
 	return 0;
drivers/usb/dwc3/core.h +0 -4
index 0ffcb7d..0d507c1 100644
@@ -641,10 +641,6 @@ struct dwc3_scratchpad_array {
  * @maximum_speed: maximum speed requested (mainly for testing
 purposes)
  * @revision: revision register contents
  * @dr_mode: requested mode of operation
- * @usb2_phy: pointer to USB2 PHY
- * @usb3_phy: pointer to USB3 PHY
- * @usb2_generic_phy: pointer to USB2 PHY
- * @usb3_generic_phy: pointer to USB3 PHY
  * @dcfg: saved contents of DCFG register
  * @gctl: saved contents of GCTL register

* @isoch_delay: wValue from Set Isochronous Delay request;

drivers/usb/dwc3/core.h +0 -6
@@ -726,12 +722,6 @@ struct dwc3 {
 	struct usb_gadget	gadget;
 	struct usb_gadget_driver *gadget_driver;
 
-	struct usb_phy		*usb2_phy;
-	struct usb_phy		*usb3_phy;
-
-	struct phy		*usb2_generic_phy;
-	struct phy		*usb3_generic_phy;
-
 	void __iomem		*regs;
 	size_t			regs_size;
 
(quoted diff) +0 -0

b/drivers/usb/dwc3/linux-compat.h index cbfb946..b36f68f 100644

drivers/usb/dwc3/linux-compat.h +10 -0
@@ -25,4 +25,14 @@ static inline size_t strlcat(char *dest, const
 char *src, size_t n) return strlen(dest) + strlen(src);
 }
 
+static inline void *devm_kzalloc(struct device *dev, unsigned int
 size,
+				 unsigned int flags)
+{
+	return kzalloc(size, flags);
+}
+
+static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
+{
+	return kzalloc(n * size, flags);
+}
Quoted 1 line

#endif

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#57 lore raw

PATCH 20/40 include: dwc3-uboot: add a structure for populating platform data

In reply to Kishon Vijay Abraham I

Added a structure to populate dwc3 core platform data. The board file should populate these platform data before invoking dwc3 driver.
This will be removed once we have dwc3 driver adapted to use the driver model.

---
 include/dwc3-uboot.h |   40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 include/dwc3-uboot.h
include/dwc3-uboot.h new file +40 -0
new file mode 100644
index 0000000..6d1b42a
@@ -0,0 +1,40 @@
+/* include/dwc3-uboot.h
+ *
+ * Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Designware SuperSpeed USB uboot init
+ *
+ * SPDX-License-Identifier:     GPL-2.0
+ */
+
+#ifndef __DWC3_UBOOT_H_
+#define __DWC3_UBOOT_H_
+
+#include <linux/usb/otg.h>
+
+struct dwc3_device {
+	int base;
+	enum usb_dr_mode dr_mode;
+	u32 maximum_speed;
+	unsigned tx_fifo_resize:1;
+	unsigned has_lpm_erratum;
+	u8 lpm_nyet_threshold;
+	unsigned is_utmi_l1_suspend;
+	u8 hird_threshold;
+	unsigned disable_scramble_quirk;
+	unsigned u2exit_lfps_quirk;
+	unsigned u2ss_inp3_quirk;
+	unsigned req_p1p2p3_quirk;
+	unsigned del_p1p2p3_quirk;
+	unsigned del_phy_power_chg_quirk;
+	unsigned lfps_filter_quirk;
+	unsigned rx_detect_poll_quirk;
+	unsigned dis_u3_susphy_quirk;
+	unsigned dis_u2_susphy_quirk;
+	unsigned tx_de_emphasis_quirk;
+	unsigned tx_de_emphasis;
+};
+
+int dwc3_uboot_init(struct dwc3_device *dev);
+void dwc3_uboot_exit(void);
+#endif /* __DWC3_UBOOT_H_ */
Signature · 1 line
1.7.9.5
#58 lore raw

PATCH 20/40 include: dwc3-uboot: add a structure for populating platform data

Hi Kishon,

Quoted 48 lines

Added a structure to populate dwc3 core platform data. The board file should populate these platform data before invoking dwc3 driver. This will be removed once we have dwc3 driver adapted to use the driver model.

---
 include/dwc3-uboot.h |   40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 include/dwc3-uboot.h
include/dwc3-uboot.h new file +3 -0
new file mode 100644
index 0000000..6d1b42a
@@ -0,0 +1,40 @@
+/* include/dwc3-uboot.h
+ *
+ * Copyright (c) 2015 Texas Instruments Incorporated -

http://www.ti.com
+ *
+ * Designware SuperSpeed USB uboot init
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ */

include/dwc3-uboot.h new file +22 -0
+
+#ifndef __DWC3_UBOOT_H_
+#define __DWC3_UBOOT_H_
+
+#include <linux/usb/otg.h>
+
+struct dwc3_device {
+	int base;
+	enum usb_dr_mode dr_mode;
+	u32 maximum_speed;
+	unsigned tx_fifo_resize:1;
+	unsigned has_lpm_erratum;
+	u8 lpm_nyet_threshold;
+	unsigned is_utmi_l1_suspend;
+	u8 hird_threshold;
+	unsigned disable_scramble_quirk;
+	unsigned u2exit_lfps_quirk;
+	unsigned u2ss_inp3_quirk;
+	unsigned req_p1p2p3_quirk;
+	unsigned del_p1p2p3_quirk;
+	unsigned del_phy_power_chg_quirk;
+	unsigned lfps_filter_quirk;

include/dwc3-uboot.h line 40

Quoted 10 lines
include/dwc3-uboot.h new file +10 -0
+	unsigned rx_detect_poll_quirk;
+	unsigned dis_u3_susphy_quirk;
+	unsigned dis_u2_susphy_quirk;
+	unsigned tx_de_emphasis_quirk;
+	unsigned tx_de_emphasis;
+};
+
+int dwc3_uboot_init(struct dwc3_device *dev);
+void dwc3_uboot_exit(void);
+#endif /* __DWC3_UBOOT_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#59 lore raw

PATCH 21/40 dwc3: core: change probe and remove to uboot init and uboot exit code

In reply to Kishon Vijay Abraham I

Removed probe and remove that are specific to linux and replaced it with uboot init and uboot exit. These functions will be invoked from boardfile.

---
 drivers/usb/dwc3/core.c |  218 +++++++++++------------------------------------
 1 file changed, 52 insertions(+), 166 deletions(-)
drivers/usb/dwc3/core.c +52 -166
index 78322b7..58c3bfd 100644
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <dwc3-uboot.h>
 #include <asm/dma-mapping.h>
 #include <linux/ioport.h>
 
@@ -28,6 +29,7 @@
 
 #include "linux-compat.h"
 
+struct dwc3 *dwc;
 /* -------------------------------------------------------------------------- */
 
 void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
@@ -597,20 +599,26 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
 
 #define DWC3_ALIGN_MASK		(16 - 1)
 
-static int dwc3_probe(struct platform_device *pdev)
+/**
+ * dwc3_uboot_init - dwc3 core uboot initialization code
+ * @dwc3_dev: struct dwc3_device containing initialization data
+ *
+ * Entry point for dwc3 driver (equivalent to dwc3_probe in linux
+ * kernel driver). Pointer to dwc3_device should be passed containing
+ * base address and other initialization data. Returns '0' on success and
+ * a negative value on failure.
+ *
+ * Generally called from board_usb_init() implemented in board file.
+ */
+int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 {
-	struct device		*dev = &pdev->dev;
-	struct dwc3_platform_data *pdata = dev_get_platdata(dev);
-	struct device_node	*node = dev->of_node;
-	struct resource		*res;
-	struct dwc3		*dwc;
+	struct device		*dev;
 	u8			lpm_nyet_threshold;
 	u8			tx_de_emphasis;
 	u8			hird_threshold;
 
 	int			ret;
 
-	void __iomem		*regs;
 	void			*mem;
 
 	mem = devm_kzalloc(dev, sizeof(*dwc) + DWC3_ALIGN_MASK, GFP_KERNEL);
@@ -619,48 +627,8 @@ static int dwc3_probe(struct platform_device *pdev)
 
 	dwc = PTR_ALIGN(mem, DWC3_ALIGN_MASK + 1);
 	dwc->mem = mem;
-	dwc->dev = dev;
-
-	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (!res) {
-		dev_err(dev, "missing IRQ\n");
-		return -ENODEV;
-	}
-	dwc->xhci_resources[1].start = res->start;
-	dwc->xhci_resources[1].end = res->end;
-	dwc->xhci_resources[1].flags = res->flags;
-	dwc->xhci_resources[1].name = res->name;
-
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(dev, "missing memory resource\n");
-		return -ENODEV;
-	}
 
-	dwc->xhci_resources[0].start = res->start;
-	dwc->xhci_resources[0].end = dwc->xhci_resources[0].start +
-					DWC3_XHCI_REGS_END;
-	dwc->xhci_resources[0].flags = res->flags;
-	dwc->xhci_resources[0].name = res->name;
-
-	res->start += DWC3_GLOBALS_REGS_START;
-
-	/*
-	 * Request memory region but exclude xHCI regs,
-	 * since it will be requested by the xhci-plat driver.
-	 */
-	regs = devm_ioremap_resource(dev, res);
-	if (IS_ERR(regs))
-		return PTR_ERR(regs);
-
-	dwc->regs	= regs;
-	dwc->regs_size	= resource_size(res);
-	/*
-	 * restore res->start back to its original value so that,
-	 * in case the probe is deferred, we don't end up getting error in
-	 * request the memory region the next time probe is called.
-	 */
-	res->start -= DWC3_GLOBALS_REGS_START;
+	dwc->regs	= (int *)(dwc3_dev->base + DWC3_GLOBALS_REGS_START);
 
 	/* default to highest possible threshold */
 	lpm_nyet_threshold = 0xff;
@@ -674,73 +642,31 @@ static int dwc3_probe(struct platform_device *pdev)
 	 */
 	hird_threshold = 12;
 
-	if (node) {
-		dwc->maximum_speed = of_usb_get_maximum_speed(node);
-		dwc->has_lpm_erratum = of_property_read_bool(node,
-				"snps,has-lpm-erratum");
-		of_property_read_u8(node, "snps,lpm-nyet-threshold",
-				&lpm_nyet_threshold);
-		dwc->is_utmi_l1_suspend = of_property_read_bool(node,
-				"snps,is-utmi-l1-suspend");
-		of_property_read_u8(node, "snps,hird-threshold",
-				&hird_threshold);
-
-		dwc->needs_fifo_resize = of_property_read_bool(node,
-				"tx-fifo-resize");
-		dwc->dr_mode = of_usb_get_dr_mode(node);
-
-		dwc->disable_scramble_quirk = of_property_read_bool(node,
-				"snps,disable_scramble_quirk");
-		dwc->u2exit_lfps_quirk = of_property_read_bool(node,
-				"snps,u2exit_lfps_quirk");
-		dwc->u2ss_inp3_quirk = of_property_read_bool(node,
-				"snps,u2ss_inp3_quirk");
-		dwc->req_p1p2p3_quirk = of_property_read_bool(node,
-				"snps,req_p1p2p3_quirk");
-		dwc->del_p1p2p3_quirk = of_property_read_bool(node,
-				"snps,del_p1p2p3_quirk");
-		dwc->del_phy_power_chg_quirk = of_property_read_bool(node,
-				"snps,del_phy_power_chg_quirk");
-		dwc->lfps_filter_quirk = of_property_read_bool(node,
-				"snps,lfps_filter_quirk");
-		dwc->rx_detect_poll_quirk = of_property_read_bool(node,
-				"snps,rx_detect_poll_quirk");
-		dwc->dis_u3_susphy_quirk = of_property_read_bool(node,
-				"snps,dis_u3_susphy_quirk");
-		dwc->dis_u2_susphy_quirk = of_property_read_bool(node,
-				"snps,dis_u2_susphy_quirk");
-
-		dwc->tx_de_emphasis_quirk = of_property_read_bool(node,
-				"snps,tx_de_emphasis_quirk");
-		of_property_read_u8(node, "snps,tx_de_emphasis",
-				&tx_de_emphasis);
-	} else if (pdata) {
-		dwc->maximum_speed = pdata->maximum_speed;
-		dwc->has_lpm_erratum = pdata->has_lpm_erratum;
-		if (pdata->lpm_nyet_threshold)
-			lpm_nyet_threshold = pdata->lpm_nyet_threshold;
-		dwc->is_utmi_l1_suspend = pdata->is_utmi_l1_suspend;
-		if (pdata->hird_threshold)
-			hird_threshold = pdata->hird_threshold;
-
-		dwc->needs_fifo_resize = pdata->tx_fifo_resize;
-		dwc->dr_mode = pdata->dr_mode;
-
-		dwc->disable_scramble_quirk = pdata->disable_scramble_quirk;
-		dwc->u2exit_lfps_quirk = pdata->u2exit_lfps_quirk;
-		dwc->u2ss_inp3_quirk = pdata->u2ss_inp3_quirk;
-		dwc->req_p1p2p3_quirk = pdata->req_p1p2p3_quirk;
-		dwc->del_p1p2p3_quirk = pdata->del_p1p2p3_quirk;
-		dwc->del_phy_power_chg_quirk = pdata->del_phy_power_chg_quirk;
-		dwc->lfps_filter_quirk = pdata->lfps_filter_quirk;
-		dwc->rx_detect_poll_quirk = pdata->rx_detect_poll_quirk;
-		dwc->dis_u3_susphy_quirk = pdata->dis_u3_susphy_quirk;
-		dwc->dis_u2_susphy_quirk = pdata->dis_u2_susphy_quirk;
-
-		dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk;
-		if (pdata->tx_de_emphasis)
-			tx_de_emphasis = pdata->tx_de_emphasis;
-	}
+	dwc->maximum_speed = dwc3_dev->maximum_speed;
+	dwc->has_lpm_erratum = dwc3_dev->has_lpm_erratum;
+	if (dwc3_dev->lpm_nyet_threshold)
+		lpm_nyet_threshold = dwc3_dev->lpm_nyet_threshold;
+	dwc->is_utmi_l1_suspend = dwc3_dev->is_utmi_l1_suspend;
+	if (dwc3_dev->hird_threshold)
+		hird_threshold = dwc3_dev->hird_threshold;
+
+	dwc->needs_fifo_resize = dwc3_dev->tx_fifo_resize;
+	dwc->dr_mode = dwc3_dev->dr_mode;
+
+	dwc->disable_scramble_quirk = dwc3_dev->disable_scramble_quirk;
+	dwc->u2exit_lfps_quirk = dwc3_dev->u2exit_lfps_quirk;
+	dwc->u2ss_inp3_quirk = dwc3_dev->u2ss_inp3_quirk;
+	dwc->req_p1p2p3_quirk = dwc3_dev->req_p1p2p3_quirk;
+	dwc->del_p1p2p3_quirk = dwc3_dev->del_p1p2p3_quirk;
+	dwc->del_phy_power_chg_quirk = dwc3_dev->del_phy_power_chg_quirk;
+	dwc->lfps_filter_quirk = dwc3_dev->lfps_filter_quirk;
+	dwc->rx_detect_poll_quirk = dwc3_dev->rx_detect_poll_quirk;
+	dwc->dis_u3_susphy_quirk = dwc3_dev->dis_u3_susphy_quirk;
+	dwc->dis_u2_susphy_quirk = dwc3_dev->dis_u2_susphy_quirk;
+
+	dwc->tx_de_emphasis_quirk = dwc3_dev->tx_de_emphasis_quirk;
+	if (dwc3_dev->tx_de_emphasis)
+		tx_de_emphasis = dwc3_dev->tx_de_emphasis;
 
 	/* default to superspeed if no maximum_speed passed */
 	if (dwc->maximum_speed == USB_SPEED_UNKNOWN)
@@ -752,15 +678,6 @@ static int dwc3_probe(struct platform_device *pdev)
 	dwc->hird_threshold = hird_threshold
 		| (dwc->is_utmi_l1_suspend << 4);
 
-	spin_lock_init(&dwc->lock);
-	platform_set_drvdata(pdev, dwc);
-
-	if (!dev->dma_mask) {
-		dev->dma_mask = dev->parent->dma_mask;
-		dev->dma_parms = dev->parent->dma_parms;
-		dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
-	}
-
 	dwc3_cache_hwparams(dwc);
 
 	ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
@@ -807,55 +724,24 @@ err0:
 	return ret;
 }
 
-static int dwc3_remove(struct platform_device *pdev)
+/**
+ * dwc3_uboot_exit - dwc3 core uboot cleanup code
+ * @index: index of this controller
+ *
+ * Performs cleanup of memory allocated in dwc3_uboot_init and other misc
+ * cleanups (equivalent to dwc3_remove in linux).
+ *
+ * Generally called from board file.
+ */
+void dwc3_uboot_exit()
 {
-	struct dwc3	*dwc = platform_get_drvdata(pdev);
-
 	dwc3_core_exit_mode(dwc);
 	dwc3_event_buffers_cleanup(dwc);
 	dwc3_free_event_buffers(dwc);
-
 	dwc3_core_exit(dwc);
-
-	return 0;
+	kfree(dwc->mem);
 }
 
-#ifdef CONFIG_OF
-static const struct of_device_id of_dwc3_match[] = {
-	{
-		.compatible = "snps,dwc3"
-	},
-	{
-		.compatible = "synopsys,dwc3"
-	},
-	{ },
-};
-MODULE_DEVICE_TABLE(of, of_dwc3_match);
-#endif
-
-#ifdef CONFIG_ACPI
-
-#define ACPI_ID_INTEL_BSW	"808622B7"
-
-static const struct acpi_device_id dwc3_acpi_match[] = {
-	{ ACPI_ID_INTEL_BSW, 0 },
-	{ },
-};
-MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match);
-#endif
-
-static struct platform_driver dwc3_driver = {
-	.probe		= dwc3_probe,
-	.remove		= dwc3_remove,
-	.driver		= {
-		.name	= "dwc3",
-		.of_match_table	= of_match_ptr(of_dwc3_match),
-		.acpi_match_table = ACPI_PTR(dwc3_acpi_match),
-	},
-};
-
-module_platform_driver(dwc3_driver);
-
 MODULE_ALIAS("platform:dwc3");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
Signature · 1 line
1.7.9.5
#60 lore raw

PATCH 21/40 dwc3: core: change probe and remove to uboot init and uboot exit code

Hi Kishon,

Quoted 304 lines

Removed probe and remove that are specific to linux and replaced it with uboot init and uboot exit. These functions will be invoked from boardfile.

---
 drivers/usb/dwc3/core.c |  218

+++++++++++------------------------------------ 1 file changed, 52 insertions(+), 166 deletions(-)

drivers/usb/dwc3/core.c +9 -2
index 78322b7..58c3bfd 100644
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <dwc3-uboot.h>
 #include <asm/dma-mapping.h>
 #include <linux/ioport.h>
 
@@ -28,6 +29,7 @@
 
 #include "linux-compat.h"
 
+struct dwc3 *dwc;
 /*
--------------------------------------------------------------------------
 */ void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
@@ -597,20 +599,26 @@ static void dwc3_core_exit_mode(struct dwc3
 *dwc) 
 #define DWC3_ALIGN_MASK		(16 - 1)
 
-static int dwc3_probe(struct platform_device *pdev)
+/**
+ * dwc3_uboot_init - dwc3 core uboot initialization code
+ * @dwc3_dev: struct dwc3_device containing initialization data
+ *
+ * Entry point for dwc3 driver (equivalent to dwc3_probe in linux
+ * kernel driver). Pointer to dwc3_device should be passed containing
+ * base address and other initialization data. Returns '0' on

success and
+ * a negative value on failure.
+ *
+ * Generally called from board_usb_init() implemented in board file.
+ */

drivers/usb/dwc3/core.c +2 -6
+int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 {
-	struct device		*dev = &pdev->dev;
-	struct dwc3_platform_data *pdata = dev_get_platdata(dev);
-	struct device_node	*node = dev->of_node;
-	struct resource		*res;
-	struct dwc3		*dwc;
+	struct device		*dev;
 	u8			lpm_nyet_threshold;
 	u8			tx_de_emphasis;
 	u8			hird_threshold;
 
 	int			ret;
 
-	void __iomem		*regs;
 	void			*mem;
 
 	mem = devm_kzalloc(dev, sizeof(*dwc) + DWC3_ALIGN_MASK,

GFP_KERNEL); @@ -619,48 +627,8 @@ static int dwc3_probe(struct platform_device *pdev)

drivers/usb/dwc3/core.c +0 -38
 	dwc = PTR_ALIGN(mem, DWC3_ALIGN_MASK + 1);
 	dwc->mem = mem;
-	dwc->dev = dev;
-
-	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (!res) {
-		dev_err(dev, "missing IRQ\n");
-		return -ENODEV;
-	}
-	dwc->xhci_resources[1].start = res->start;
-	dwc->xhci_resources[1].end = res->end;
-	dwc->xhci_resources[1].flags = res->flags;
-	dwc->xhci_resources[1].name = res->name;
-
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(dev, "missing memory resource\n");
-		return -ENODEV;
-	}
 
-	dwc->xhci_resources[0].start = res->start;
-	dwc->xhci_resources[0].end = dwc->xhci_resources[0].start +
-					DWC3_XHCI_REGS_END;
-	dwc->xhci_resources[0].flags = res->flags;
-	dwc->xhci_resources[0].name = res->name;
-
-	res->start += DWC3_GLOBALS_REGS_START;
-
-	/*
-	 * Request memory region but exclude xHCI regs,
-	 * since it will be requested by the xhci-plat driver.
-	 */
-	regs = devm_ioremap_resource(dev, res);
-	if (IS_ERR(regs))
-		return PTR_ERR(regs);
-
-	dwc->regs	= regs;
-	dwc->regs_size	= resource_size(res);
-	/*
-	 * restore res->start back to its original value so that,
-	 * in case the probe is deferred, we don't end up getting

error in

drivers/usb/dwc3/core.c +1 -3
-	 * request the memory region the next time probe is called.
-	 */
-	res->start -= DWC3_GLOBALS_REGS_START;
+	dwc->regs	= (int *)(dwc3_dev->base +

DWC3_GLOBALS_REGS_START);

drivers/usb/dwc3/core.c +0 -61
 	/* default to highest possible threshold */
 	lpm_nyet_threshold = 0xff;
@@ -674,73 +642,31 @@ static int dwc3_probe(struct platform_device
 *pdev) */
 	hird_threshold = 12;
 
-	if (node) {
-		dwc->maximum_speed = of_usb_get_maximum_speed(node);
-		dwc->has_lpm_erratum = of_property_read_bool(node,
-				"snps,has-lpm-erratum");
-		of_property_read_u8(node, "snps,lpm-nyet-threshold",
-				&lpm_nyet_threshold);
-		dwc->is_utmi_l1_suspend = of_property_read_bool(node,
-				"snps,is-utmi-l1-suspend");
-		of_property_read_u8(node, "snps,hird-threshold",
-				&hird_threshold);
-
-		dwc->needs_fifo_resize = of_property_read_bool(node,
-				"tx-fifo-resize");
-		dwc->dr_mode = of_usb_get_dr_mode(node);
-
-		dwc->disable_scramble_quirk =
 of_property_read_bool(node,
-				"snps,disable_scramble_quirk");
-		dwc->u2exit_lfps_quirk = of_property_read_bool(node,
-				"snps,u2exit_lfps_quirk");
-		dwc->u2ss_inp3_quirk = of_property_read_bool(node,
-				"snps,u2ss_inp3_quirk");
-		dwc->req_p1p2p3_quirk = of_property_read_bool(node,
-				"snps,req_p1p2p3_quirk");
-		dwc->del_p1p2p3_quirk = of_property_read_bool(node,
-				"snps,del_p1p2p3_quirk");
-		dwc->del_phy_power_chg_quirk =
 of_property_read_bool(node,
-				"snps,del_phy_power_chg_quirk");
-		dwc->lfps_filter_quirk = of_property_read_bool(node,
-				"snps,lfps_filter_quirk");
-		dwc->rx_detect_poll_quirk =
 of_property_read_bool(node,
-				"snps,rx_detect_poll_quirk");
-		dwc->dis_u3_susphy_quirk =
 of_property_read_bool(node,
-				"snps,dis_u3_susphy_quirk");
-		dwc->dis_u2_susphy_quirk =
 of_property_read_bool(node,
-				"snps,dis_u2_susphy_quirk");
-
-		dwc->tx_de_emphasis_quirk =
 of_property_read_bool(node,
-				"snps,tx_de_emphasis_quirk");
-		of_property_read_u8(node, "snps,tx_de_emphasis",
-				&tx_de_emphasis);
-	} else if (pdata) {
-		dwc->maximum_speed = pdata->maximum_speed;
-		dwc->has_lpm_erratum = pdata->has_lpm_erratum;
-		if (pdata->lpm_nyet_threshold)
-			lpm_nyet_threshold =
 pdata->lpm_nyet_threshold;
-		dwc->is_utmi_l1_suspend = pdata->is_utmi_l1_suspend;
-		if (pdata->hird_threshold)
-			hird_threshold = pdata->hird_threshold;
-
-		dwc->needs_fifo_resize = pdata->tx_fifo_resize;
-		dwc->dr_mode = pdata->dr_mode;
-
-		dwc->disable_scramble_quirk =
 pdata->disable_scramble_quirk;
-		dwc->u2exit_lfps_quirk = pdata->u2exit_lfps_quirk;
-		dwc->u2ss_inp3_quirk = pdata->u2ss_inp3_quirk;
-		dwc->req_p1p2p3_quirk = pdata->req_p1p2p3_quirk;
-		dwc->del_p1p2p3_quirk = pdata->del_p1p2p3_quirk;
-		dwc->del_phy_power_chg_quirk =
 pdata->del_phy_power_chg_quirk;
-		dwc->lfps_filter_quirk = pdata->lfps_filter_quirk;
-		dwc->rx_detect_poll_quirk =
 pdata->rx_detect_poll_quirk;
-		dwc->dis_u3_susphy_quirk =

pdata->dis_u3_susphy_quirk;

drivers/usb/dwc3/core.c +0 -1
-		dwc->dis_u2_susphy_quirk =

pdata->dis_u2_susphy_quirk; -

drivers/usb/dwc3/core.c +0 -1
-		dwc->tx_de_emphasis_quirk =

pdata->tx_de_emphasis_quirk;

drivers/usb/dwc3/core.c +12 -3
-		if (pdata->tx_de_emphasis)
-			tx_de_emphasis = pdata->tx_de_emphasis;
-	}
+	dwc->maximum_speed = dwc3_dev->maximum_speed;
+	dwc->has_lpm_erratum = dwc3_dev->has_lpm_erratum;
+	if (dwc3_dev->lpm_nyet_threshold)
+		lpm_nyet_threshold = dwc3_dev->lpm_nyet_threshold;
+	dwc->is_utmi_l1_suspend = dwc3_dev->is_utmi_l1_suspend;
+	if (dwc3_dev->hird_threshold)
+		hird_threshold = dwc3_dev->hird_threshold;
+
+	dwc->needs_fifo_resize = dwc3_dev->tx_fifo_resize;
+	dwc->dr_mode = dwc3_dev->dr_mode;
+
+	dwc->disable_scramble_quirk =

dwc3_dev->disable_scramble_quirk;

drivers/usb/dwc3/core.c +5 -0
+	dwc->u2exit_lfps_quirk = dwc3_dev->u2exit_lfps_quirk;
+	dwc->u2ss_inp3_quirk = dwc3_dev->u2ss_inp3_quirk;
+	dwc->req_p1p2p3_quirk = dwc3_dev->req_p1p2p3_quirk;
+	dwc->del_p1p2p3_quirk = dwc3_dev->del_p1p2p3_quirk;
+	dwc->del_phy_power_chg_quirk =

dwc3_dev->del_phy_power_chg_quirk;

drivers/usb/dwc3/core.c +8 -9
+	dwc->lfps_filter_quirk = dwc3_dev->lfps_filter_quirk;
+	dwc->rx_detect_poll_quirk = dwc3_dev->rx_detect_poll_quirk;
+	dwc->dis_u3_susphy_quirk = dwc3_dev->dis_u3_susphy_quirk;
+	dwc->dis_u2_susphy_quirk = dwc3_dev->dis_u2_susphy_quirk;
+
+	dwc->tx_de_emphasis_quirk = dwc3_dev->tx_de_emphasis_quirk;
+	if (dwc3_dev->tx_de_emphasis)
+		tx_de_emphasis = dwc3_dev->tx_de_emphasis;
 
 	/* default to superspeed if no maximum_speed passed */
 	if (dwc->maximum_speed == USB_SPEED_UNKNOWN)
@@ -752,15 +678,6 @@ static int dwc3_probe(struct platform_device
 *pdev) dwc->hird_threshold = hird_threshold
 		| (dwc->is_utmi_l1_suspend << 4);
 
-	spin_lock_init(&dwc->lock);
-	platform_set_drvdata(pdev, dwc);
-
-	if (!dev->dma_mask) {
-		dev->dma_mask = dev->parent->dma_mask;
-		dev->dma_parms = dev->parent->dma_parms;
-		dma_set_coherent_mask(dev,
 dev->parent->coherent_dma_mask);
-	}
-
 	dwc3_cache_hwparams(dwc);
 
drivers/usb/dwc3/core.c +5 -1
 	ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
@@ -807,55 +724,24 @@ err0:
 	return ret;
 }
 
-static int dwc3_remove(struct platform_device *pdev)
+/**
+ * dwc3_uboot_exit - dwc3 core uboot cleanup code
+ * @index: index of this controller
+ *
+ * Performs cleanup of memory allocated in dwc3_uboot_init and other

misc
+ * cleanups (equivalent to dwc3_remove in linux).
+ *
+ * Generally called from board file.
+ */

drivers/usb/dwc3/core.c +2 -34
+void dwc3_uboot_exit()
 {
-	struct dwc3	*dwc = platform_get_drvdata(pdev);
-
 	dwc3_core_exit_mode(dwc);
 	dwc3_event_buffers_cleanup(dwc);
 	dwc3_free_event_buffers(dwc);
-
 	dwc3_core_exit(dwc);
-
-	return 0;
+	kfree(dwc->mem);
 }
 
-#ifdef CONFIG_OF
-static const struct of_device_id of_dwc3_match[] = {
-	{
-		.compatible = "snps,dwc3"
-	},
-	{
-		.compatible = "synopsys,dwc3"
-	},
-	{ },
-};
-MODULE_DEVICE_TABLE(of, of_dwc3_match);
-#endif
-
-#ifdef CONFIG_ACPI
-
-#define ACPI_ID_INTEL_BSW	"808622B7"
-
-static const struct acpi_device_id dwc3_acpi_match[] = {
-	{ ACPI_ID_INTEL_BSW, 0 },
-	{ },
-};
-MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match);
-#endif
-
-static struct platform_driver dwc3_driver = {
-	.probe		= dwc3_probe,
-	.remove		= dwc3_remove,
-	.driver		= {
-		.name	= "dwc3",

drivers/usb/dwc3/core.c err0: · line 747

Quoted 10 lines
drivers/usb/dwc3/core.c +0 -7
-		.of_match_table	= of_match_ptr(of_dwc3_match),
-		.acpi_match_table = ACPI_PTR(dwc3_acpi_match),
-	},
-};
-
-module_platform_driver(dwc3_driver);
-
 MODULE_ALIAS("platform:dwc3");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#61 lore raw

PATCH 22/40 dwc3: core: add support for multiple dwc3 controllers

In reply to Kishon Vijay Abraham I

Added support for multiple dwc3 controllers. This gives uboot the capability to control multiple dwc3 controllers.

---
 drivers/usb/dwc3/core.c |   32 ++++++++++++++++++++++++--------
 drivers/usb/dwc3/core.h |    4 ++++
 include/dwc3-uboot.h    |    3 ++-
 3 files changed, 30 insertions(+), 9 deletions(-)
drivers/usb/dwc3/core.c +24 -8
index 58c3bfd..bd34dbd 100644
@@ -29,7 +29,7 @@
 
 #include "linux-compat.h"
 
-struct dwc3 *dwc;
+static LIST_HEAD(dwc3_list);
 /* -------------------------------------------------------------------------- */
 
 void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
@@ -612,6 +612,7 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
  */
 int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 {
+	struct dwc3		*dwc;
 	struct device		*dev;
 	u8			lpm_nyet_threshold;
 	u8			tx_de_emphasis;
@@ -678,6 +679,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 	dwc->hird_threshold = hird_threshold
 		| (dwc->is_utmi_l1_suspend << 4);
 
+	dwc->index = dwc3_dev->index;
+
 	dwc3_cache_hwparams(dwc);
 
 	ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
@@ -710,6 +713,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 	if (ret)
 		goto err2;
 
+	list_add_tail(&dwc->list, &dwc3_list);
+
 	return 0;
 
 err2:
@@ -729,17 +734,28 @@ err0:
  * @index: index of this controller
  *
  * Performs cleanup of memory allocated in dwc3_uboot_init and other misc
- * cleanups (equivalent to dwc3_remove in linux).
+ * cleanups (equivalent to dwc3_remove in linux). index of _this_ controller
+ * should be passed and should match with the index passed in
+ * dwc3_device during init.
  *
  * Generally called from board file.
  */
-void dwc3_uboot_exit()
+void dwc3_uboot_exit(int index)
 {
-	dwc3_core_exit_mode(dwc);
-	dwc3_event_buffers_cleanup(dwc);
-	dwc3_free_event_buffers(dwc);
-	dwc3_core_exit(dwc);
-	kfree(dwc->mem);
+	struct dwc3 *dwc;
+
+	list_for_each_entry(dwc, &dwc3_list, list) {
+		if (dwc->index != index)
+			continue;
+
+		dwc3_core_exit_mode(dwc);
+		dwc3_event_buffers_cleanup(dwc);
+		dwc3_free_event_buffers(dwc);
+		dwc3_core_exit(dwc);
+		list_del(&dwc->list);
+		kfree(dwc->mem);
+		break;
+	}
 }
 
 MODULE_ALIAS("platform:dwc3");
drivers/usb/dwc3/core.h +4 -0
index 0d507c1..c5debf7 100644
@@ -695,6 +695,8 @@ struct dwc3_scratchpad_array {
  * 	1	- -3.5dB de-emphasis
  * 	2	- No de-emphasis
  * 	3	- Reserved
+ * @index: index of _this_ controller
+ * @list: to maintain the list of dwc3 controllers
  */
 struct dwc3 {
 	struct usb_ctrlrequest	*ctrl_req;
@@ -811,6 +813,8 @@ struct dwc3 {
 
 	unsigned		tx_de_emphasis_quirk:1;
 	unsigned		tx_de_emphasis:2;
+	int			index;
+	struct list_head        list;
 };
 
 /* -------------------------------------------------------------------------- */
include/dwc3-uboot.h +2 -1
index 6d1b42a..272a020 100644
@@ -33,8 +33,9 @@ struct dwc3_device {
 	unsigned dis_u2_susphy_quirk;
 	unsigned tx_de_emphasis_quirk;
 	unsigned tx_de_emphasis;
+	int index;
 };
 
 int dwc3_uboot_init(struct dwc3_device *dev);
-void dwc3_uboot_exit(void);
+void dwc3_uboot_exit(int index);
 #endif /* __DWC3_UBOOT_H_ */
Signature · 1 line
1.7.9.5
#62 lore raw

PATCH 22/40 dwc3: core: add support for multiple dwc3 controllers

Hi Kishon,

Quoted 114 lines

Added support for multiple dwc3 controllers. This gives uboot the capability to control multiple dwc3 controllers.

---
 drivers/usb/dwc3/core.c |   32 ++++++++++++++++++++++++--------
 drivers/usb/dwc3/core.h |    4 ++++
 include/dwc3-uboot.h    |    3 ++-
 3 files changed, 30 insertions(+), 9 deletions(-)
drivers/usb/dwc3/core.c +6 -2
index 58c3bfd..bd34dbd 100644
@@ -29,7 +29,7 @@
 
 #include "linux-compat.h"
 
-struct dwc3 *dwc;
+static LIST_HEAD(dwc3_list);
 /*
--------------------------------------------------------------------------
 */ void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
@@ -612,6 +612,7 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
  */
 int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 {
+	struct dwc3		*dwc;
 	struct device		*dev;
 	u8			lpm_nyet_threshold;
 	u8			tx_de_emphasis;
@@ -678,6 +679,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 	dwc->hird_threshold = hird_threshold
 		| (dwc->is_utmi_l1_suspend << 4);
 
+	dwc->index = dwc3_dev->index;
+
 	dwc3_cache_hwparams(dwc);
 
 	ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
@@ -710,6 +713,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 	if (ret)
 		goto err2;
 
+	list_add_tail(&dwc->list, &dwc3_list);
+
 	return 0;
 
 err2:
@@ -729,17 +734,28 @@ err0:
  * @index: index of this controller
  *
  * Performs cleanup of memory allocated in dwc3_uboot_init and other

misc
- * cleanups (equivalent to dwc3_remove in linux).
+ * cleanups (equivalent to dwc3_remove in linux). index of _this_ controller
+ * should be passed and should match with the index passed in
+ * dwc3_device during init.
*
* Generally called from board file.
*/

drivers/usb/dwc3/core.c +15 -6
-void dwc3_uboot_exit()
+void dwc3_uboot_exit(int index)
 {
-	dwc3_core_exit_mode(dwc);
-	dwc3_event_buffers_cleanup(dwc);
-	dwc3_free_event_buffers(dwc);
-	dwc3_core_exit(dwc);
-	kfree(dwc->mem);
+	struct dwc3 *dwc;
+
+	list_for_each_entry(dwc, &dwc3_list, list) {
+		if (dwc->index != index)
+			continue;
+
+		dwc3_core_exit_mode(dwc);
+		dwc3_event_buffers_cleanup(dwc);
+		dwc3_free_event_buffers(dwc);
+		dwc3_core_exit(dwc);
+		list_del(&dwc->list);
+		kfree(dwc->mem);
+		break;
+	}
 }
 
 MODULE_ALIAS("platform:dwc3");
drivers/usb/dwc3/core.h +4 -1
index 0d507c1..c5debf7 100644
@@ -695,6 +695,8 @@ struct dwc3_scratchpad_array {
  * 	1	- -3.5dB de-emphasis
  * 	2	- No de-emphasis
  * 	3	- Reserved
+ * @index: index of _this_ controller
+ * @list: to maintain the list of dwc3 controllers
  */
 struct dwc3 {
 	struct usb_ctrlrequest	*ctrl_req;
@@ -811,6 +813,8 @@ struct dwc3 {
 
 	unsigned		tx_de_emphasis_quirk:1;
 	unsigned		tx_de_emphasis:2;
+	int			index;
+	struct list_head        list;
 };
 
 /*
--------------------------------------------------------------------------

*/ diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h index 6d1b42a..272a020 100644 --- a/include/dwc3-uboot.h
+++ b/include/dwc3-uboot.h

drivers/usb/dwc3/core.h struct dwc3_device { · line 41

Quoted 10 lines
drivers/usb/dwc3/core.h +2 -1
@@ -33,8 +33,9 @@ struct dwc3_device {
 	unsigned dis_u2_susphy_quirk;
 	unsigned tx_de_emphasis_quirk;
 	unsigned tx_de_emphasis;
+	int index;
 };
 
 int dwc3_uboot_init(struct dwc3_device *dev);
-void dwc3_uboot_exit(void);
+void dwc3_uboot_exit(int index);
 #endif /* __DWC3_UBOOT_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#63 lore raw

PATCH 23/40 dwc3: core: added an API to invoke irq handlers

In reply to Kishon Vijay Abraham I

Since interrupt support is not present in u-boot, added an API to handle the interrupts in dwc3 core. This API can be polled to handle the interrupts.

---
 drivers/usb/dwc3/core.c |   21 +++++++++++++++++++++
 include/dwc3-uboot.h    |    1 +
 2 files changed, 22 insertions(+)
drivers/usb/dwc3/core.c +21 -0
index bd34dbd..5a8d5ea 100644
@@ -758,6 +758,27 @@ void dwc3_uboot_exit(int index)
 	}
 }
 
+/**
+ * dwc3_uboot_handle_interrupt - handle dwc3 core interrupt
+ * @index: index of this controller
+ *
+ * Invokes dwc3 gadget interrupts.
+ *
+ * Generally called from board file.
+ */
+void dwc3_uboot_handle_interrupt(int index)
+{
+	struct dwc3 *dwc = NULL;
+
+	list_for_each_entry(dwc, &dwc3_list, list) {
+		if (dwc->index != index)
+			continue;
+
+		dwc3_gadget_uboot_handle_interrupt(dwc);
+		break;
+	}
+}
+
 MODULE_ALIAS("platform:dwc3");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
include/dwc3-uboot.h +1 -0
index 272a020..09ff8a7 100644
@@ -38,4 +38,5 @@ struct dwc3_device {
 
 int dwc3_uboot_init(struct dwc3_device *dev);
 void dwc3_uboot_exit(int index);
+void dwc3_uboot_handle_interrupt(int index);
 #endif /* __DWC3_UBOOT_H_ */
Signature · 1 line
1.7.9.5
#64 lore raw

PATCH 23/40 dwc3: core: added an API to invoke irq handlers

Hi Kishon,

Quoted 47 lines

Since interrupt support is not present in u-boot, added an API to handle the interrupts in dwc3 core. This API can be polled to handle the interrupts.

---
 drivers/usb/dwc3/core.c |   21 +++++++++++++++++++++
 include/dwc3-uboot.h    |    1 +
 2 files changed, 22 insertions(+)
drivers/usb/dwc3/core.c +21 -0
index bd34dbd..5a8d5ea 100644
@@ -758,6 +758,27 @@ void dwc3_uboot_exit(int index)
 	}
 }
 
+/**
+ * dwc3_uboot_handle_interrupt - handle dwc3 core interrupt
+ * @index: index of this controller
+ *
+ * Invokes dwc3 gadget interrupts.
+ *
+ * Generally called from board file.
+ */
+void dwc3_uboot_handle_interrupt(int index)
+{
+	struct dwc3 *dwc = NULL;
+
+	list_for_each_entry(dwc, &dwc3_list, list) {
+		if (dwc->index != index)
+			continue;
+
+		dwc3_gadget_uboot_handle_interrupt(dwc);
+		break;
+	}
+}
+
 MODULE_ALIAS("platform:dwc3");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
include/dwc3-uboot.h +0 -0
index 272a020..09ff8a7 100644

include/dwc3-uboot.h struct dwc3_device { · line 42

Quoted 5 lines
include/dwc3-uboot.h +1 -0
@@ -38,4 +38,5 @@ struct dwc3_device {
 
 int dwc3_uboot_init(struct dwc3_device *dev);
 void dwc3_uboot_exit(int index);
+void dwc3_uboot_handle_interrupt(int index);
 #endif /* __DWC3_UBOOT_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#65 lore raw

PATCH 24/40 usb: dwc3: dwc3-omap: make dwc3-omap build in uboot

In reply to Kishon Vijay Abraham I

*) Changed the included header files to that used in u-boot. *) Removed extcon_* APIs
*) Removed regulator_* APIs
*) Fixed other misc warnings
*) Added dwc3-omap.h to include the definitions of UTMI modes.

---
 drivers/usb/dwc3/dwc3-omap.c  |  144 +++--------------------------------------
 include/linux/usb/dwc3-omap.h |   19 ++++++
 2 files changed, 27 insertions(+), 136 deletions(-)
 create mode 100644 include/linux/usb/dwc3-omap.h
drivers/usb/dwc3/dwc3-omap.c +8 -136
index ce2d6a6..b385987 100644
@@ -14,21 +14,16 @@
  * SPDX-License-Identifier:     GPL-2.0
  */
 
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/platform_data/dwc3-omap.h>
-#include <linux/dma-mapping.h>
+#include <common.h>
+#include <malloc.h>
+#include <asm/io.h>
+#include <linux/usb/dwc3-omap.h>
 #include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/extcon.h>
-#include <linux/regulator/consumer.h>
 
 #include <linux/usb/otg.h>
+#include <linux/compat.h>
+
+#include "linux-compat.h"
 
 /*
  * All these registers belong to OMAP's Wrapper around the
@@ -113,7 +108,6 @@
 struct dwc3_omap {
 	struct device		*dev;
 
-	int			irq;
 	void __iomem		*base;
 
 	u32			utmi_otg_status;
@@ -124,13 +118,6 @@ struct dwc3_omap {
 	u32			irq0_offset;
 
 	u32			dma_status:1;
-
-	struct extcon_specific_cable_nb extcon_vbus_dev;
-	struct extcon_specific_cable_nb extcon_id_dev;
-	struct notifier_block	vbus_nb;
-	struct notifier_block	id_nb;
-
-	struct regulator	*vbus_reg;
 };
 
 enum omap_dwc3_vbus_id_status {
@@ -205,21 +192,12 @@ static void dwc3_omap_write_irq0_set(struct dwc3_omap *omap, u32 value)
 static void dwc3_omap_set_mailbox(struct dwc3_omap *omap,
 	enum omap_dwc3_vbus_id_status status)
 {
-	int	ret;
 	u32	val;
 
 	switch (status) {
 	case OMAP_DWC3_ID_GROUND:
 		dev_dbg(omap->dev, "ID GND\n");
 
-		if (omap->vbus_reg) {
-			ret = regulator_enable(omap->vbus_reg);
-			if (ret) {
-				dev_dbg(omap->dev, "regulator enable failed\n");
-				return;
-			}
-		}
-
 		val = dwc3_omap_read_utmi_status(omap);
 		val &= ~(USBOTGSS_UTMI_OTG_STATUS_IDDIG
 				| USBOTGSS_UTMI_OTG_STATUS_VBUSVALID
@@ -242,9 +220,6 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap,
 		break;
 
 	case OMAP_DWC3_ID_FLOAT:
-		if (omap->vbus_reg)
-			regulator_disable(omap->vbus_reg);
-
 	case OMAP_DWC3_VBUS_OFF:
 		dev_dbg(omap->dev, "VBUS Disconnect\n");
 
@@ -349,32 +324,6 @@ static void dwc3_omap_disable_irqs(struct dwc3_omap *omap)
 
 static u64 dwc3_omap_dma_mask = DMA_BIT_MASK(32);
 
-static int dwc3_omap_id_notifier(struct notifier_block *nb,
-	unsigned long event, void *ptr)
-{
-	struct dwc3_omap *omap = container_of(nb, struct dwc3_omap, id_nb);
-
-	if (event)
-		dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND);
-	else
-		dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_FLOAT);
-
-	return NOTIFY_DONE;
-}
-
-static int dwc3_omap_vbus_notifier(struct notifier_block *nb,
-	unsigned long event, void *ptr)
-{
-	struct dwc3_omap *omap = container_of(nb, struct dwc3_omap, vbus_nb);
-
-	if (event)
-		dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID);
-	else
-		dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_OFF);
-
-	return NOTIFY_DONE;
-}
-
 static void dwc3_omap_map_offset(struct dwc3_omap *omap)
 {
 	struct device_node	*node = omap->dev->of_node;
@@ -420,42 +369,6 @@ static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap)
 	dwc3_omap_write_utmi_status(omap, reg);
 }
 
-static int dwc3_omap_extcon_register(struct dwc3_omap *omap)
-{
-	int			ret;
-	struct device_node	*node = omap->dev->of_node;
-	struct extcon_dev	*edev;
-
-	if (of_property_read_bool(node, "extcon")) {
-		edev = extcon_get_edev_by_phandle(omap->dev, 0);
-		if (IS_ERR(edev)) {
-			dev_vdbg(omap->dev, "couldn't get extcon device\n");
-			return -EPROBE_DEFER;
-		}
-
-		omap->vbus_nb.notifier_call = dwc3_omap_vbus_notifier;
-		ret = extcon_register_interest(&omap->extcon_vbus_dev,
-					       edev->name, "USB",
-					       &omap->vbus_nb);
-		if (ret < 0)
-			dev_vdbg(omap->dev, "failed to register notifier for USB\n");
-
-		omap->id_nb.notifier_call = dwc3_omap_id_notifier;
-		ret = extcon_register_interest(&omap->extcon_id_dev,
-					       edev->name, "USB-HOST",
-					       &omap->id_nb);
-		if (ret < 0)
-			dev_vdbg(omap->dev, "failed to register notifier for USB-HOST\n");
-
-		if (extcon_get_cable_state(edev, "USB") == true)
-			dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID);
-		if (extcon_get_cable_state(edev, "USB-HOST") == true)
-			dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND);
-	}
-
-	return 0;
-}
-
 static int dwc3_omap_probe(struct platform_device *pdev)
 {
 	struct device_node	*node = pdev->dev.of_node;
@@ -463,11 +376,8 @@ static int dwc3_omap_probe(struct platform_device *pdev)
 	struct dwc3_omap	*omap;
 	struct resource		*res;
 	struct device		*dev = &pdev->dev;
-	struct regulator	*vbus_reg = NULL;
 
 	int			ret;
-	int			irq;
-
 	u32			reg;
 
 	void __iomem		*base;
@@ -483,29 +393,13 @@ static int dwc3_omap_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, omap);
 
-	irq = platform_get_irq(pdev, 0);
-	if (irq < 0) {
-		dev_err(dev, "missing IRQ resource\n");
-		return -EINVAL;
-	}
-
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	base = devm_ioremap_resource(dev, res);
 	if (IS_ERR(base))
 		return PTR_ERR(base);
 
-	if (of_property_read_bool(node, "vbus-supply")) {
-		vbus_reg = devm_regulator_get(dev, "vbus");
-		if (IS_ERR(vbus_reg)) {
-			dev_err(dev, "vbus init failed\n");
-			return PTR_ERR(vbus_reg);
-		}
-	}
-
 	omap->dev	= dev;
-	omap->irq	= irq;
 	omap->base	= base;
-	omap->vbus_reg	= vbus_reg;
 	dev->dma_mask	= &dwc3_omap_dma_mask;
 
 	dwc3_omap_map_offset(omap);
@@ -515,34 +409,16 @@ static int dwc3_omap_probe(struct platform_device *pdev)
 	reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG);
 	omap->dma_status = !!(reg & USBOTGSS_SYSCONFIG_DMADISABLE);
 
-	ret = devm_request_irq(dev, omap->irq, dwc3_omap_interrupt, 0,
-			"dwc3-omap", omap);
-	if (ret) {
-		dev_err(dev, "failed to request IRQ #%d --> %d\n",
-				omap->irq, ret);
-		goto err0;
-	}
-
 	dwc3_omap_enable_irqs(omap);
 
-	ret = dwc3_omap_extcon_register(omap);
-	if (ret < 0)
-		goto err1;
-
 	ret = of_platform_populate(node, NULL, NULL, dev);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to create dwc3 core\n");
-		goto err2;
+		goto err1;
 	}
 
 	return 0;
 
-err2:
-	if (omap->extcon_vbus_dev.edev)
-		extcon_unregister_interest(&omap->extcon_vbus_dev);
-	if (omap->extcon_id_dev.edev)
-		extcon_unregister_interest(&omap->extcon_id_dev);
-
 err1:
 	dwc3_omap_disable_irqs(omap);
 
@@ -554,10 +430,6 @@ static int dwc3_omap_remove(struct platform_device *pdev)
 {
 	struct dwc3_omap	*omap = platform_get_drvdata(pdev);
 
-	if (omap->extcon_vbus_dev.edev)
-		extcon_unregister_interest(&omap->extcon_vbus_dev);
-	if (omap->extcon_id_dev.edev)
-		extcon_unregister_interest(&omap->extcon_id_dev);
 	dwc3_omap_disable_irqs(omap);
 	device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core);
 
include/linux/usb/dwc3-omap.h new file +19 -0
new file mode 100644
index 0000000..8bf7b55
@@ -0,0 +1,19 @@
+/* include/linux/usb/dwc3-omap.h
+ *
+ * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Designware SuperSpeed Glue
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __DWC3_OMAP_H_
+#define __DWC3_OMAP_H_
+
+enum dwc3_omap_utmi_mode {
+	DWC3_OMAP_UTMI_MODE_UNKNOWN = 0,
+	DWC3_OMAP_UTMI_MODE_HW,
+	DWC3_OMAP_UTMI_MODE_SW,
+};
+
+#endif /* __DWC3_OMAP_H_ */
Signature · 1 line
1.7.9.5
#66 lore raw

PATCH 24/40 usb: dwc3: dwc3-omap: make dwc3-omap build in uboot

Hi Kishon,

Quoted 290 lines

*) Changed the included header files to that used in u-boot. *) Removed extcon_* APIs
*) Removed regulator_* APIs
*) Fixed other misc warnings
*) Added dwc3-omap.h to include the definitions of UTMI modes.

---
 drivers/usb/dwc3/dwc3-omap.c  |  144

+++--------------------------------------
include/linux/usb/dwc3-omap.h | 19 ++++++ 2 files changed, 27
insertions(+), 136 deletions(-) create mode 100644 include/linux/usb/dwc3-omap.h

(quoted diff) +0 -0

b/drivers/usb/dwc3/dwc3-omap.c index ce2d6a6..b385987 100644

drivers/usb/dwc3/dwc3-omap.c +7 -20
@@ -14,21 +14,16 @@
  * SPDX-License-Identifier:     GPL-2.0
  */
 
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/platform_data/dwc3-omap.h>
-#include <linux/dma-mapping.h>
+#include <common.h>
+#include <malloc.h>
+#include <asm/io.h>
+#include <linux/usb/dwc3-omap.h>
 #include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/extcon.h>
-#include <linux/regulator/consumer.h>
 
 #include <linux/usb/otg.h>
+#include <linux/compat.h>
+
+#include "linux-compat.h"
 
 /*
  * All these registers belong to OMAP's Wrapper around the
@@ -113,7 +108,6 @@
 struct dwc3_omap {
 	struct device		*dev;
 
-	int			irq;
 	void __iomem		*base;
 
 	u32			utmi_otg_status;
@@ -124,13 +118,6 @@ struct dwc3_omap {
 	u32			irq0_offset;
 
 	u32			dma_status:1;
-
-	struct extcon_specific_cable_nb extcon_vbus_dev;
-	struct extcon_specific_cable_nb extcon_id_dev;
-	struct notifier_block	vbus_nb;
-	struct notifier_block	id_nb;
-
-	struct regulator	*vbus_reg;
 };
 
 enum omap_dwc3_vbus_id_status {
@@ -205,21 +192,12 @@ static void dwc3_omap_write_irq0_set(struct

dwc3_omap *omap, u32 value) static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, enum omap_dwc3_vbus_id_status status)
{

drivers/usb/dwc3/dwc3-omap.c +0 -5
-	int	ret;
 	u32	val;
 
 	switch (status) {
 	case OMAP_DWC3_ID_GROUND:
 		dev_dbg(omap->dev, "ID GND\n");
 
-		if (omap->vbus_reg) {
-			ret = regulator_enable(omap->vbus_reg);
-			if (ret) {
-				dev_dbg(omap->dev, "regulator enable

failed\n");

drivers/usb/dwc3/dwc3-omap.c +0 -11
-				return;
-			}
-		}
-
 		val = dwc3_omap_read_utmi_status(omap);
 		val &= ~(USBOTGSS_UTMI_OTG_STATUS_IDDIG
 				| USBOTGSS_UTMI_OTG_STATUS_VBUSVALID
@@ -242,9 +220,6 @@ static void dwc3_omap_set_mailbox(struct
 dwc3_omap *omap, break;
 
 	case OMAP_DWC3_ID_FLOAT:
-		if (omap->vbus_reg)
-			regulator_disable(omap->vbus_reg);
-
 	case OMAP_DWC3_VBUS_OFF:
 		dev_dbg(omap->dev, "VBUS Disconnect\n");
 
@@ -349,32 +324,6 @@ static void dwc3_omap_disable_irqs(struct
 dwc3_omap *omap) 
 static u64 dwc3_omap_dma_mask = DMA_BIT_MASK(32);
 
-static int dwc3_omap_id_notifier(struct notifier_block *nb,
-	unsigned long event, void *ptr)
-{
-	struct dwc3_omap *omap = container_of(nb, struct dwc3_omap,

id_nb); -

drivers/usb/dwc3/dwc3-omap.c +0 -12
-	if (event)
-		dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND);
-	else
-		dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_FLOAT);
-
-	return NOTIFY_DONE;
-}
-
-static int dwc3_omap_vbus_notifier(struct notifier_block *nb,
-	unsigned long event, void *ptr)
-{
-	struct dwc3_omap *omap = container_of(nb, struct dwc3_omap,

vbus_nb); -

drivers/usb/dwc3/dwc3-omap.c +0 -27
-	if (event)
-		dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID);
-	else
-		dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_OFF);
-
-	return NOTIFY_DONE;
-}
-
 static void dwc3_omap_map_offset(struct dwc3_omap *omap)
 {
 	struct device_node	*node = omap->dev->of_node;
@@ -420,42 +369,6 @@ static void dwc3_omap_set_utmi_mode(struct
 dwc3_omap *omap) dwc3_omap_write_utmi_status(omap, reg);
 }
 
-static int dwc3_omap_extcon_register(struct dwc3_omap *omap)
-{
-	int			ret;
-	struct device_node	*node = omap->dev->of_node;
-	struct extcon_dev	*edev;
-
-	if (of_property_read_bool(node, "extcon")) {
-		edev = extcon_get_edev_by_phandle(omap->dev, 0);
-		if (IS_ERR(edev)) {
-			dev_vdbg(omap->dev, "couldn't get extcon
 device\n");
-			return -EPROBE_DEFER;
-		}
-
-		omap->vbus_nb.notifier_call =
 dwc3_omap_vbus_notifier;
-		ret =
 extcon_register_interest(&omap->extcon_vbus_dev,
-					       edev->name, "USB",
-					       &omap->vbus_nb);
-		if (ret < 0)
-			dev_vdbg(omap->dev, "failed to register

notifier for USB\n"); -

drivers/usb/dwc3/dwc3-omap.c +0 -3
-		omap->id_nb.notifier_call = dwc3_omap_id_notifier;
-		ret = extcon_register_interest(&omap->extcon_id_dev,
-					       edev->name,

"USB-HOST",

drivers/usb/dwc3/dwc3-omap.c +0 -3
-					       &omap->id_nb);
-		if (ret < 0)
-			dev_vdbg(omap->dev, "failed to register

notifier for USB-HOST\n"); -

drivers/usb/dwc3/dwc3-omap.c +0 -2
-		if (extcon_get_cable_state(edev, "USB") == true)
-			dwc3_omap_set_mailbox(omap,

OMAP_DWC3_VBUS_VALID);

drivers/usb/dwc3/dwc3-omap.c +0 -2
-		if (extcon_get_cable_state(edev, "USB-HOST") == true)
-			dwc3_omap_set_mailbox(omap,

OMAP_DWC3_ID_GROUND);

drivers/usb/dwc3/dwc3-omap.c +0 -24
-	}
-
-	return 0;
-}
-
 static int dwc3_omap_probe(struct platform_device *pdev)
 {
 	struct device_node	*node = pdev->dev.of_node;
@@ -463,11 +376,8 @@ static int dwc3_omap_probe(struct
 platform_device *pdev) struct dwc3_omap	*omap;
 	struct resource		*res;
 	struct device		*dev = &pdev->dev;
-	struct regulator	*vbus_reg = NULL;
 
 	int			ret;
-	int			irq;
-
 	u32			reg;
 
 	void __iomem		*base;
@@ -483,29 +393,13 @@ static int dwc3_omap_probe(struct
 platform_device *pdev) 
 	platform_set_drvdata(pdev, omap);
 
-	irq = platform_get_irq(pdev, 0);
-	if (irq < 0) {
-		dev_err(dev, "missing IRQ resource\n");
-		return -EINVAL;
-	}
-
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	base = devm_ioremap_resource(dev, res);
 	if (IS_ERR(base))
 		return PTR_ERR(base);
 
-	if (of_property_read_bool(node, "vbus-supply")) {
-		vbus_reg = devm_regulator_get(dev, "vbus");
-		if (IS_ERR(vbus_reg)) {
-			dev_err(dev, "vbus init failed\n");
-			return PTR_ERR(vbus_reg);
-		}
-	}
-
 	omap->dev	= dev;
-	omap->irq	= irq;
 	omap->base	= base;
-	omap->vbus_reg	= vbus_reg;
 	dev->dma_mask	= &dwc3_omap_dma_mask;
 
 	dwc3_omap_map_offset(omap);
@@ -515,34 +409,16 @@ static int dwc3_omap_probe(struct
 platform_device *pdev) reg = dwc3_omap_readl(omap->base,

USBOTGSS_SYSCONFIG); omap->dma_status = !!(reg &
USBOTGSS_SYSCONFIG_DMADISABLE);

drivers/usb/dwc3/dwc3-omap.c +0 -1
-	ret = devm_request_irq(dev, omap->irq, dwc3_omap_interrupt,

0,

drivers/usb/dwc3/dwc3-omap.c +1 -22
-			"dwc3-omap", omap);
-	if (ret) {
-		dev_err(dev, "failed to request IRQ #%d --> %d\n",
-				omap->irq, ret);
-		goto err0;
-	}
-
 	dwc3_omap_enable_irqs(omap);
 
-	ret = dwc3_omap_extcon_register(omap);
-	if (ret < 0)
-		goto err1;
-
 	ret = of_platform_populate(node, NULL, NULL, dev);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to create dwc3 core\n");
-		goto err2;
+		goto err1;
 	}
 
 	return 0;
 
-err2:
-	if (omap->extcon_vbus_dev.edev)
-		extcon_unregister_interest(&omap->extcon_vbus_dev);
-	if (omap->extcon_id_dev.edev)
-		extcon_unregister_interest(&omap->extcon_id_dev);
-
 err1:
 	dwc3_omap_disable_irqs(omap);
@@ -554,10 +430,6 @@ static int dwc3_omap_remove(struct
 platform_device *pdev) {
 	struct dwc3_omap	*omap = platform_get_drvdata(pdev);
 
-	if (omap->extcon_vbus_dev.edev)
-		extcon_unregister_interest(&omap->extcon_vbus_dev);
-	if (omap->extcon_id_dev.edev)
-		extcon_unregister_interest(&omap->extcon_id_dev);
 	dwc3_omap_disable_irqs(omap);
 	device_for_each_child(&pdev->dev, NULL,
 dwc3_omap_remove_core); 
(quoted diff) +0 -0

b/include/linux/usb/dwc3-omap.h new file mode 100644 index 0000000..8bf7b55

include/linux/usb/dwc3-omap.h new file +3 -0
@@ -0,0 +1,19 @@
+/* include/linux/usb/dwc3-omap.h
+ *
+ * Copyright (c) 2014 Texas Instruments Incorporated -

http://www.ti.com
+ *
+ * Designware SuperSpeed Glue
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */

include/linux/usb/dwc3-omap.h new file +1 -0
+

include/linux/usb/dwc3-omap.h line 19

Quoted 10 lines
include/linux/usb/dwc3-omap.h new file +10 -0
+#ifndef __DWC3_OMAP_H_
+#define __DWC3_OMAP_H_
+
+enum dwc3_omap_utmi_mode {
+	DWC3_OMAP_UTMI_MODE_UNKNOWN = 0,
+	DWC3_OMAP_UTMI_MODE_HW,
+	DWC3_OMAP_UTMI_MODE_SW,
+};
+
+#endif /* __DWC3_OMAP_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#67 lore raw

PATCH 25/40 include: dwc3-omap-uboot: add a structure for populating dwc3-omap platform data

In reply to Kishon Vijay Abraham I

Added a structure to populate dwc3 omap platform data. The board file should populate these platform data before invoking dwc3 omap driver.

This will be removed once dwc3-omap driver is adapted to use the driver model.

---
 drivers/usb/dwc3/dwc3-omap.c |    7 -------
 include/dwc3-omap-uboot.h    |   27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 include/dwc3-omap-uboot.h
drivers/usb/dwc3/dwc3-omap.c +0 -7
index b385987..31a2aa3 100644
@@ -120,13 +120,6 @@ struct dwc3_omap {
 	u32			dma_status:1;
 };
 
-enum omap_dwc3_vbus_id_status {
-	OMAP_DWC3_ID_FLOAT,
-	OMAP_DWC3_ID_GROUND,
-	OMAP_DWC3_VBUS_OFF,
-	OMAP_DWC3_VBUS_VALID,
-};
-
 static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
 {
 	return readl(base + offset);
include/dwc3-omap-uboot.h new file +27 -0
new file mode 100644
index 0000000..b313b64
@@ -0,0 +1,27 @@
+/* include/dwc3_omap_uboot.h
+ *
+ * Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Designware SuperSpeed OMAP Glue uboot init
+ *
+ * SPDX-License-Identifier:     GPL-2.0
+ */
+
+#ifndef __DWC3_OMAP_UBOOT_H_
+#define __DWC3_OMAP_UBOOT_H_
+
+#include <linux/usb/dwc3-omap.h>
+
+enum omap_dwc3_vbus_id_status {
+	OMAP_DWC3_ID_FLOAT,
+	OMAP_DWC3_ID_GROUND,
+	OMAP_DWC3_VBUS_OFF,
+	OMAP_DWC3_VBUS_VALID,
+};
+
+struct dwc3_omap_device {
+	void *base;
+	enum dwc3_omap_utmi_mode utmi_mode;
+	enum omap_dwc3_vbus_id_status vbus_id_status;
+};
+#endif /* __DWC3_OMAP_UBOOT_H_ */
Signature · 1 line
1.7.9.5
#68 lore raw

PATCH 25/40 include: dwc3-omap-uboot: add a structure for populating dwc3-omap platform data

Hi Kishon,

Quoted 55 lines

Added a structure to populate dwc3 omap platform data. The board file should populate these platform data before invoking dwc3 omap driver.

This will be removed once dwc3-omap driver is adapted to use the driver model.

---
 drivers/usb/dwc3/dwc3-omap.c |    7 -------
 include/dwc3-omap-uboot.h    |   27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 include/dwc3-omap-uboot.h
(quoted diff) +0 -0

b/drivers/usb/dwc3/dwc3-omap.c index b385987..31a2aa3 100644

drivers/usb/dwc3/dwc3-omap.c +0 -7
@@ -120,13 +120,6 @@ struct dwc3_omap {
 	u32			dma_status:1;
 };
 
-enum omap_dwc3_vbus_id_status {
-	OMAP_DWC3_ID_FLOAT,
-	OMAP_DWC3_ID_GROUND,
-	OMAP_DWC3_VBUS_OFF,
-	OMAP_DWC3_VBUS_VALID,
-};
-
 static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
 {
 	return readl(base + offset);
include/dwc3-omap-uboot.h new file +3 -0
new file mode 100644
index 0000000..b313b64
@@ -0,0 +1,27 @@
+/* include/dwc3_omap_uboot.h
+ *
+ * Copyright (c) 2015 Texas Instruments Incorporated -

http://www.ti.com
+ *
+ * Designware SuperSpeed OMAP Glue uboot init
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ */

include/dwc3-omap-uboot.h new file +9 -0
+
+#ifndef __DWC3_OMAP_UBOOT_H_
+#define __DWC3_OMAP_UBOOT_H_
+
+#include <linux/usb/dwc3-omap.h>
+
+enum omap_dwc3_vbus_id_status {
+	OMAP_DWC3_ID_FLOAT,
+	OMAP_DWC3_ID_GROUND,

include/dwc3-omap-uboot.h line 27

Quoted 10 lines
include/dwc3-omap-uboot.h new file +10 -0
+	OMAP_DWC3_VBUS_OFF,
+	OMAP_DWC3_VBUS_VALID,
+};
+
+struct dwc3_omap_device {
+	void *base;
+	enum dwc3_omap_utmi_mode utmi_mode;
+	enum omap_dwc3_vbus_id_status vbus_id_status;
+};
+#endif /* __DWC3_OMAP_UBOOT_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#69 lore raw

PATCH 26/40 usb: dwc3: dwc3-omap: change probe and remove to uboot init and uboot exit code

In reply to Kishon Vijay Abraham I

Removed probe and remove that are specific to linux and replaced it with uboot init and uboot exit. These functions will be invoked from boardfile.

This will change once we have dwc3-omap driver adapted to use the uboot driver model.

---
 drivers/usb/dwc3/dwc3-omap.c |  128 +++++++++++++-----------------------------
 include/dwc3-omap-uboot.h    |    3 +
 2 files changed, 42 insertions(+), 89 deletions(-)
drivers/usb/dwc3/dwc3-omap.c +39 -89
index 31a2aa3..30d7210 100644
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <dwc3-omap-uboot.h>
 #include <linux/usb/dwc3-omap.h>
 #include <linux/ioport.h>
 
@@ -120,6 +121,8 @@ struct dwc3_omap {
 	u32			dma_status:1;
 };
 
+struct dwc3_omap *omap;
+
 static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
 {
 	return readl(base + offset);
@@ -278,15 +281,6 @@ static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap)
 	return IRQ_HANDLED;
 }
 
-static int dwc3_omap_remove_core(struct device *dev, void *c)
-{
-	struct platform_device *pdev = to_platform_device(dev);
-
-	of_device_unregister(pdev);
-
-	return 0;
-}
-
 static void dwc3_omap_enable_irqs(struct dwc3_omap *omap)
 {
 	u32			reg;
@@ -315,12 +309,8 @@ static void dwc3_omap_disable_irqs(struct dwc3_omap *omap)
 	dwc3_omap_write_irq0_set(omap, 0x00);
 }
 
-static u64 dwc3_omap_dma_mask = DMA_BIT_MASK(32);
-
 static void dwc3_omap_map_offset(struct dwc3_omap *omap)
 {
-	struct device_node	*node = omap->dev->of_node;
-
 	/*
 	 * Differentiate between OMAP5 and AM437x.
 	 *
@@ -329,25 +319,21 @@ static void dwc3_omap_map_offset(struct dwc3_omap *omap)
 	 *
 	 * Using dt compatible to differentiate AM437x.
 	 */
-	if (of_device_is_compatible(node, "ti,am437x-dwc3")) {
-		omap->irq_eoi_offset = USBOTGSS_EOI_OFFSET;
-		omap->irq0_offset = USBOTGSS_IRQ0_OFFSET;
-		omap->irqmisc_offset = USBOTGSS_IRQMISC_OFFSET;
-		omap->utmi_otg_offset = USBOTGSS_UTMI_OTG_OFFSET;
-		omap->debug_offset = USBOTGSS_DEBUG_OFFSET;
-	}
+#ifdef CONFIG_AM43XX
+	omap->irq_eoi_offset = USBOTGSS_EOI_OFFSET;
+	omap->irq0_offset = USBOTGSS_IRQ0_OFFSET;
+	omap->irqmisc_offset = USBOTGSS_IRQMISC_OFFSET;
+	omap->utmi_otg_offset = USBOTGSS_UTMI_OTG_OFFSET;
+	omap->debug_offset = USBOTGSS_DEBUG_OFFSET;
+#endif
 }
 
-static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap)
+static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap, int utmi_mode)
 {
 	u32			reg;
-	struct device_node	*node = omap->dev->of_node;
-	int			utmi_mode = 0;
 
 	reg = dwc3_omap_read_utmi_status(omap);
 
-	of_property_read_u32(node, "utmi-mode", &utmi_mode);
-
 	switch (utmi_mode) {
 	case DWC3_OMAP_UTMI_MODE_SW:
 		reg |= USBOTGSS_UTMI_OTG_STATUS_SW_MODE;
@@ -362,95 +348,59 @@ static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap)
 	dwc3_omap_write_utmi_status(omap, reg);
 }
 
-static int dwc3_omap_probe(struct platform_device *pdev)
+/**
+ * dwc3_omap_uboot_init - dwc3 omap uboot initialization code
+ * @dev: struct dwc3_omap_device containing initialization data
+ *
+ * Entry point for dwc3 omap driver (equivalent to dwc3_omap_probe in linux
+ * kernel driver). Pointer to dwc3_omap_device should be passed containing
+ * base address and other initialization data. Returns '0' on success and
+ * a negative value on failure.
+ *
+ * Generally called from board_usb_init() implemented in board file.
+ */
+int dwc3_omap_uboot_init(struct dwc3_omap_device *omap_dev)
 {
-	struct device_node	*node = pdev->dev.of_node;
-
-	struct dwc3_omap	*omap;
-	struct resource		*res;
-	struct device		*dev = &pdev->dev;
-
-	int			ret;
 	u32			reg;
-
-	void __iomem		*base;
-
-	if (!node) {
-		dev_err(dev, "device node not found\n");
-		return -EINVAL;
-	}
+	struct device		*dev;
 
 	omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);
 	if (!omap)
 		return -ENOMEM;
 
-	platform_set_drvdata(pdev, omap);
-
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	base = devm_ioremap_resource(dev, res);
-	if (IS_ERR(base))
-		return PTR_ERR(base);
-
-	omap->dev	= dev;
-	omap->base	= base;
-	dev->dma_mask	= &dwc3_omap_dma_mask;
+	omap->base	= omap_dev->base;
 
 	dwc3_omap_map_offset(omap);
-	dwc3_omap_set_utmi_mode(omap);
+	dwc3_omap_set_utmi_mode(omap, omap_dev->utmi_mode);
 
 	/* check the DMA Status */
 	reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG);
 	omap->dma_status = !!(reg & USBOTGSS_SYSCONFIG_DMADISABLE);
 
-	dwc3_omap_enable_irqs(omap);
+	dwc3_omap_set_mailbox(omap, omap_dev->vbus_id_status);
 
-	ret = of_platform_populate(node, NULL, NULL, dev);
-	if (ret) {
-		dev_err(&pdev->dev, "failed to create dwc3 core\n");
-		goto err1;
-	}
+	dwc3_omap_enable_irqs(omap);
 
 	return 0;
-
-err1:
-	dwc3_omap_disable_irqs(omap);
-
-err0:
-	return ret;
 }
 
-static int dwc3_omap_remove(struct platform_device *pdev)
+/**
+ * dwc3_omap_uboot_exit - dwc3 omap uboot cleanup code
+ * @index: index of this controller
+ *
+ * Performs cleanup of memory allocated in dwc3_omap_uboot_init
+ * (equivalent to dwc3_omap_remove in linux).
+ *
+ * Generally called from board file.
+ */
+void dwc3_omap_uboot_exit(void)
 {
-	struct dwc3_omap	*omap = platform_get_drvdata(pdev);
-
 	dwc3_omap_disable_irqs(omap);
-	device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core);
+	kfree(omap);
 
 	return 0;
 }
 
-static const struct of_device_id of_dwc3_match[] = {
-	{
-		.compatible =	"ti,dwc3"
-	},
-	{
-		.compatible =	"ti,am437x-dwc3"
-	},
-	{ },
-};
-MODULE_DEVICE_TABLE(of, of_dwc3_match);
-
-static struct platform_driver dwc3_omap_driver = {
-	.probe		= dwc3_omap_probe,
-	.remove		= dwc3_omap_remove,
-	.driver		= {
-		.name	= "omap-dwc3",
-		.of_match_table	= of_dwc3_match,
-	},
-};
-
-module_platform_driver(dwc3_omap_driver);
-
 MODULE_ALIAS("platform:omap-dwc3");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
include/dwc3-omap-uboot.h +3 -0
index b313b64..99f8f38 100644
@@ -24,4 +24,7 @@ struct dwc3_omap_device {
 	enum dwc3_omap_utmi_mode utmi_mode;
 	enum omap_dwc3_vbus_id_status vbus_id_status;
 };
+
+int dwc3_omap_uboot_init(struct dwc3_omap_device *dev);
+void dwc3_omap_uboot_exit(void);
 #endif /* __DWC3_OMAP_UBOOT_H_ */
Signature · 1 line
1.7.9.5
#70 lore raw

PATCH 26/40 usb: dwc3: dwc3-omap: change probe and remove to uboot init and uboot exit code

Hi Kishon,

Quoted 231 lines

Removed probe and remove that are specific to linux and replaced it with uboot init and uboot exit. These functions will be invoked from boardfile.

This will change once we have dwc3-omap driver adapted to use the uboot driver model.

---
 drivers/usb/dwc3/dwc3-omap.c |  128

+++++++++++++-----------------------------
include/dwc3-omap-uboot.h | 3 + 2 files changed, 42
insertions(+), 89 deletions(-)

(quoted diff) +0 -0

b/drivers/usb/dwc3/dwc3-omap.c index 31a2aa3..30d7210 100644

drivers/usb/dwc3/dwc3-omap.c +3 -13
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <dwc3-omap-uboot.h>
 #include <linux/usb/dwc3-omap.h>
 #include <linux/ioport.h>
 
@@ -120,6 +121,8 @@ struct dwc3_omap {
 	u32			dma_status:1;
 };
 
+struct dwc3_omap *omap;
+
 static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
 {
 	return readl(base + offset);
@@ -278,15 +281,6 @@ static irqreturn_t dwc3_omap_interrupt(int irq,
 void *_omap) return IRQ_HANDLED;
 }
 
-static int dwc3_omap_remove_core(struct device *dev, void *c)
-{
-	struct platform_device *pdev = to_platform_device(dev);
-
-	of_device_unregister(pdev);
-
-	return 0;
-}
-
 static void dwc3_omap_enable_irqs(struct dwc3_omap *omap)
 {
 	u32			reg;
@@ -315,12 +309,8 @@ static void dwc3_omap_disable_irqs(struct
 dwc3_omap *omap) dwc3_omap_write_irq0_set(omap, 0x00);
 }
 
-static u64 dwc3_omap_dma_mask = DMA_BIT_MASK(32);
-
 static void dwc3_omap_map_offset(struct dwc3_omap *omap)
 {
-	struct device_node	*node = omap->dev->of_node;
-
 	/*
 	 * Differentiate between OMAP5 and AM437x.
 	 *
@@ -329,25 +319,21 @@ static void dwc3_omap_map_offset(struct

dwc3_omap *omap) *

drivers/usb/dwc3/dwc3-omap.c +8 -8
 	 * Using dt compatible to differentiate AM437x.
 	 */
-	if (of_device_is_compatible(node, "ti,am437x-dwc3")) {
-		omap->irq_eoi_offset = USBOTGSS_EOI_OFFSET;
-		omap->irq0_offset = USBOTGSS_IRQ0_OFFSET;
-		omap->irqmisc_offset = USBOTGSS_IRQMISC_OFFSET;
-		omap->utmi_otg_offset = USBOTGSS_UTMI_OTG_OFFSET;
-		omap->debug_offset = USBOTGSS_DEBUG_OFFSET;
-	}
+#ifdef CONFIG_AM43XX
+	omap->irq_eoi_offset = USBOTGSS_EOI_OFFSET;
+	omap->irq0_offset = USBOTGSS_IRQ0_OFFSET;
+	omap->irqmisc_offset = USBOTGSS_IRQMISC_OFFSET;
+	omap->utmi_otg_offset = USBOTGSS_UTMI_OTG_OFFSET;
+	omap->debug_offset = USBOTGSS_DEBUG_OFFSET;
+#endif
 }
 
-static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap)
+static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap, int

utmi_mode) {

drivers/usb/dwc3/dwc3-omap.c +5 -5
 	u32			reg;
-	struct device_node	*node = omap->dev->of_node;
-	int			utmi_mode = 0;
 
 	reg = dwc3_omap_read_utmi_status(omap);
 
-	of_property_read_u32(node, "utmi-mode", &utmi_mode);
-
 	switch (utmi_mode) {
 	case DWC3_OMAP_UTMI_MODE_SW:
 		reg |= USBOTGSS_UTMI_OTG_STATUS_SW_MODE;
@@ -362,95 +348,59 @@ static void dwc3_omap_set_utmi_mode(struct
 dwc3_omap *omap) dwc3_omap_write_utmi_status(omap, reg);
 }
 
-static int dwc3_omap_probe(struct platform_device *pdev)
+/**
+ * dwc3_omap_uboot_init - dwc3 omap uboot initialization code
+ * @dev: struct dwc3_omap_device containing initialization data
+ *
+ * Entry point for dwc3 omap driver (equivalent to dwc3_omap_probe

in linux
+ * kernel driver). Pointer to dwc3_omap_device should be passed containing
+ * base address and other initialization data. Returns '0' on success and
+ * a negative value on failure.
+ *
+ * Generally called from board_usb_init() implemented in board file.
+ */

drivers/usb/dwc3/dwc3-omap.c +16 -41
+int dwc3_omap_uboot_init(struct dwc3_omap_device *omap_dev)
 {
-	struct device_node	*node = pdev->dev.of_node;
-
-	struct dwc3_omap	*omap;
-	struct resource		*res;
-	struct device		*dev = &pdev->dev;
-
-	int			ret;
 	u32			reg;
-
-	void __iomem		*base;
-
-	if (!node) {
-		dev_err(dev, "device node not found\n");
-		return -EINVAL;
-	}
+	struct device		*dev;
 
 	omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);
 	if (!omap)
 		return -ENOMEM;
 
-	platform_set_drvdata(pdev, omap);
-
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	base = devm_ioremap_resource(dev, res);
-	if (IS_ERR(base))
-		return PTR_ERR(base);
-
-	omap->dev	= dev;
-	omap->base	= base;
-	dev->dma_mask	= &dwc3_omap_dma_mask;
+	omap->base	= omap_dev->base;
 
 	dwc3_omap_map_offset(omap);
-	dwc3_omap_set_utmi_mode(omap);
+	dwc3_omap_set_utmi_mode(omap, omap_dev->utmi_mode);
 
 	/* check the DMA Status */
 	reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG);
 	omap->dma_status = !!(reg & USBOTGSS_SYSCONFIG_DMADISABLE);
 
-	dwc3_omap_enable_irqs(omap);
+	dwc3_omap_set_mailbox(omap, omap_dev->vbus_id_status);
 
-	ret = of_platform_populate(node, NULL, NULL, dev);
-	if (ret) {
-		dev_err(&pdev->dev, "failed to create dwc3 core\n");
-		goto err1;
-	}
+	dwc3_omap_enable_irqs(omap);
 
 	return 0;
-
-err1:
-	dwc3_omap_disable_irqs(omap);
-
-err0:
-	return ret;
 }
 
-static int dwc3_omap_remove(struct platform_device *pdev)
+/**
+ * dwc3_omap_uboot_exit - dwc3 omap uboot cleanup code
+ * @index: index of this controller
+ *
+ * Performs cleanup of memory allocated in dwc3_omap_uboot_init
+ * (equivalent to dwc3_omap_remove in linux).
+ *
+ * Generally called from board file.
+ */
+void dwc3_omap_uboot_exit(void)
 {
-	struct dwc3_omap	*omap = platform_get_drvdata(pdev);
-
 	dwc3_omap_disable_irqs(omap);
-	device_for_each_child(&pdev->dev, NULL,

dwc3_omap_remove_core);

drivers/usb/dwc3/dwc3-omap.c +1 -22
+	kfree(omap);
 
 	return 0;
 }
 
-static const struct of_device_id of_dwc3_match[] = {
-	{
-		.compatible =	"ti,dwc3"
-	},
-	{
-		.compatible =	"ti,am437x-dwc3"
-	},
-	{ },
-};
-MODULE_DEVICE_TABLE(of, of_dwc3_match);
-
-static struct platform_driver dwc3_omap_driver = {
-	.probe		= dwc3_omap_probe,
-	.remove		= dwc3_omap_remove,
-	.driver		= {
-		.name	= "omap-dwc3",
-		.of_match_table	= of_dwc3_match,
-	},
-};
-
-module_platform_driver(dwc3_omap_driver);
-
 MODULE_ALIAS("platform:omap-dwc3");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
include/dwc3-omap-uboot.h +0 -0
index b313b64..99f8f38 100644

include/dwc3-omap-uboot.h struct dwc3_omap_device { · line 30

Quoted 7 lines
include/dwc3-omap-uboot.h +3 -0
@@ -24,4 +24,7 @@ struct dwc3_omap_device {
 	enum dwc3_omap_utmi_mode utmi_mode;
 	enum omap_dwc3_vbus_id_status vbus_id_status;
 };
+
+int dwc3_omap_uboot_init(struct dwc3_omap_device *dev);
+void dwc3_omap_uboot_exit(void);
 #endif /* __DWC3_OMAP_UBOOT_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#71 lore raw

PATCH 27/40 dwc3: dwc3-omap: add support for multiple dwc3-omap controllers

In reply to Kishon Vijay Abraham I

Added support for multiple dwc3 omap controllers. This gives uboot the capability to control multiple dwc3 omap controllers.

---
 drivers/usb/dwc3/dwc3-omap.c |   26 ++++++++++++++++++++------
 include/dwc3-omap-uboot.h    |    3 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)
drivers/usb/dwc3/dwc3-omap.c +20 -6
index 30d7210..c8275c7 100644
@@ -119,9 +119,11 @@ struct dwc3_omap {
 	u32			irq0_offset;
 
 	u32			dma_status:1;
+	struct list_head	list;
+	u32			index;
 };
 
-struct dwc3_omap *omap;
+static LIST_HEAD(dwc3_omap_list);
 
 static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
 {
@@ -363,12 +365,14 @@ int dwc3_omap_uboot_init(struct dwc3_omap_device *omap_dev)
 {
 	u32			reg;
 	struct device		*dev;
+	struct dwc3_omap	*omap;
 
 	omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);
 	if (!omap)
 		return -ENOMEM;
 
 	omap->base	= omap_dev->base;
+	omap->index	= omap_dev->index;
 
 	dwc3_omap_map_offset(omap);
 	dwc3_omap_set_utmi_mode(omap, omap_dev->utmi_mode);
@@ -380,6 +384,7 @@ int dwc3_omap_uboot_init(struct dwc3_omap_device *omap_dev)
 	dwc3_omap_set_mailbox(omap, omap_dev->vbus_id_status);
 
 	dwc3_omap_enable_irqs(omap);
+	list_add_tail(&omap->list, &dwc3_omap_list);
 
 	return 0;
 }
@@ -389,16 +394,25 @@ int dwc3_omap_uboot_init(struct dwc3_omap_device *omap_dev)
  * @index: index of this controller
  *
  * Performs cleanup of memory allocated in dwc3_omap_uboot_init
- * (equivalent to dwc3_omap_remove in linux).
+ * (equivalent to dwc3_omap_remove in linux). index of _this_ controller
+ * should be passed and should match with the index passed in
+ * dwc3_omap_device during init.
  *
  * Generally called from board file.
  */
-void dwc3_omap_uboot_exit(void)
+void dwc3_omap_uboot_exit(int index)
 {
-	dwc3_omap_disable_irqs(omap);
-	kfree(omap);
+	struct dwc3_omap *omap = NULL;
 
-	return 0;
+	list_for_each_entry(omap, &dwc3_omap_list, list) {
+		if (omap->index != index)
+			continue;
+
+		dwc3_omap_disable_irqs(omap);
+		list_del(&omap->list);
+		kfree(omap);
+		break;
+	}
 }
 
 MODULE_ALIAS("platform:omap-dwc3");
include/dwc3-omap-uboot.h +2 -1
index 99f8f38..29f02f8 100644
@@ -21,10 +21,11 @@ enum omap_dwc3_vbus_id_status {
 
 struct dwc3_omap_device {
 	void *base;
+	int index;
 	enum dwc3_omap_utmi_mode utmi_mode;
 	enum omap_dwc3_vbus_id_status vbus_id_status;
 };
 
 int dwc3_omap_uboot_init(struct dwc3_omap_device *dev);
-void dwc3_omap_uboot_exit(void);
+void dwc3_omap_uboot_exit(int index);
 #endif /* __DWC3_OMAP_UBOOT_H_ */
Signature · 1 line
1.7.9.5
#72 lore raw

PATCH 27/40 dwc3: dwc3-omap: add support for multiple dwc3-omap controllers

Hi Kishon,

Quoted 89 lines

Added support for multiple dwc3 omap controllers. This gives uboot the capability to control multiple dwc3 omap controllers.

---
 drivers/usb/dwc3/dwc3-omap.c |   26 ++++++++++++++++++++------
 include/dwc3-omap-uboot.h    |    3 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)
(quoted diff) +0 -0

b/drivers/usb/dwc3/dwc3-omap.c index 30d7210..c8275c7 100644

drivers/usb/dwc3/dwc3-omap.c +7 -2
@@ -119,9 +119,11 @@ struct dwc3_omap {
 	u32			irq0_offset;
 
 	u32			dma_status:1;
+	struct list_head	list;
+	u32			index;
 };
 
-struct dwc3_omap *omap;
+static LIST_HEAD(dwc3_omap_list);
 
 static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
 {
@@ -363,12 +365,14 @@ int dwc3_omap_uboot_init(struct
 dwc3_omap_device *omap_dev) {
 	u32			reg;
 	struct device		*dev;
+	struct dwc3_omap	*omap;
 
 	omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);
 	if (!omap)
 		return -ENOMEM;
 
 	omap->base	= omap_dev->base;
+	omap->index	= omap_dev->index;
 
 	dwc3_omap_map_offset(omap);
 	dwc3_omap_set_utmi_mode(omap, omap_dev->utmi_mode);
@@ -380,6 +384,7 @@ int dwc3_omap_uboot_init(struct dwc3_omap_device
 *omap_dev) dwc3_omap_set_mailbox(omap, omap_dev->vbus_id_status);
 
 	dwc3_omap_enable_irqs(omap);
+	list_add_tail(&omap->list, &dwc3_omap_list);
 
 	return 0;
 }
@@ -389,16 +394,25 @@ int dwc3_omap_uboot_init(struct
 dwc3_omap_device *omap_dev)
  * @index: index of this controller
  *
  * Performs cleanup of memory allocated in dwc3_omap_uboot_init
- * (equivalent to dwc3_omap_remove in linux).
+ * (equivalent to dwc3_omap_remove in linux). index of _this_

controller
+ * should be passed and should match with the index passed in
+ * dwc3_omap_device during init.
*
* Generally called from board file.
*/

drivers/usb/dwc3/dwc3-omap.c +11 -4
-void dwc3_omap_uboot_exit(void)
+void dwc3_omap_uboot_exit(int index)
 {
-	dwc3_omap_disable_irqs(omap);
-	kfree(omap);
+	struct dwc3_omap *omap = NULL;
 
-	return 0;
+	list_for_each_entry(omap, &dwc3_omap_list, list) {
+		if (omap->index != index)
+			continue;
+
+		dwc3_omap_disable_irqs(omap);
+		list_del(&omap->list);
+		kfree(omap);
+		break;
+	}
 }
 
 MODULE_ALIAS("platform:omap-dwc3");
include/dwc3-omap-uboot.h +0 -0
index 99f8f38..29f02f8 100644
@@ -21,10 +21,11 @@ enum omap_dwc3_vbus_id_status {
 
 struct dwc3_omap_device {

include/dwc3-omap-uboot.h enum omap_dwc3_vbus_id_status { · line 31

Quoted 10 lines
include/dwc3-omap-uboot.h +2 -1
 	void *base;
+	int index;
 	enum dwc3_omap_utmi_mode utmi_mode;
 	enum omap_dwc3_vbus_id_status vbus_id_status;
 };
 
 int dwc3_omap_uboot_init(struct dwc3_omap_device *dev);
-void dwc3_omap_uboot_exit(void);
+void dwc3_omap_uboot_exit(int index);
 #endif /* __DWC3_OMAP_UBOOT_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#73 lore raw

PATCH 28/40 usb: dwc3: dwc3-omap: add interrupt status API to check for interrupts

In reply to Kishon Vijay Abraham I

Added an API to check for interrupt status. This API is generally called from board file to check for interrupt status.

---
 drivers/usb/dwc3/dwc3-omap.c |   20 ++++++++++++++++++++
 include/dwc3-omap-uboot.h    |    1 +
 2 files changed, 21 insertions(+)
drivers/usb/dwc3/dwc3-omap.c +20 -0
index c8275c7..46af109 100644
@@ -415,6 +415,26 @@ void dwc3_omap_uboot_exit(int index)
 	}
 }
 
+/**
+ * dwc3_omap_uboot_interrupt_status - check the status of interrupt
+ * @index: index of this controller
+ *
+ * Checks the status of interrupts and returns true if an interrupt
+ * is detected or false otherwise.
+ *
+ * Generally called from board file.
+ */
+int dwc3_omap_uboot_interrupt_status(int index)
+{
+	struct dwc3_omap *omap = NULL;
+
+	list_for_each_entry(omap, &dwc3_omap_list, list)
+		if (omap->index == index)
+			return dwc3_omap_interrupt(-1, omap);
+
+	return 0;
+}
+
 MODULE_ALIAS("platform:omap-dwc3");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
include/dwc3-omap-uboot.h +1 -0
index 29f02f8..db002b9 100644
@@ -28,4 +28,5 @@ struct dwc3_omap_device {
 
 int dwc3_omap_uboot_init(struct dwc3_omap_device *dev);
 void dwc3_omap_uboot_exit(int index);
+int dwc3_omap_uboot_interrupt_status(int index);
 #endif /* __DWC3_OMAP_UBOOT_H_ */
Signature · 1 line
1.7.9.5
#74 lore raw

PATCH 28/40 usb: dwc3: dwc3-omap: add interrupt status API to check for interrupts

Hi Kishon,

Quoted 45 lines

Added an API to check for interrupt status. This API is generally called from board file to check for interrupt status.

---
 drivers/usb/dwc3/dwc3-omap.c |   20 ++++++++++++++++++++
 include/dwc3-omap-uboot.h    |    1 +
 2 files changed, 21 insertions(+)
(quoted diff) +0 -0

b/drivers/usb/dwc3/dwc3-omap.c index c8275c7..46af109 100644

drivers/usb/dwc3/dwc3-omap.c +20 -0
@@ -415,6 +415,26 @@ void dwc3_omap_uboot_exit(int index)
 	}
 }
 
+/**
+ * dwc3_omap_uboot_interrupt_status - check the status of interrupt
+ * @index: index of this controller
+ *
+ * Checks the status of interrupts and returns true if an interrupt
+ * is detected or false otherwise.
+ *
+ * Generally called from board file.
+ */
+int dwc3_omap_uboot_interrupt_status(int index)
+{
+	struct dwc3_omap *omap = NULL;
+
+	list_for_each_entry(omap, &dwc3_omap_list, list)
+		if (omap->index == index)
+			return dwc3_omap_interrupt(-1, omap);
+
+	return 0;
+}
+
 MODULE_ALIAS("platform:omap-dwc3");
 MODULE_AUTHOR("Felipe Balbi <[email protected]>");
 MODULE_LICENSE("GPL v2");
include/dwc3-omap-uboot.h +0 -0
index 29f02f8..db002b9 100644

include/dwc3-omap-uboot.h struct dwc3_omap_device { · line 32

Quoted 5 lines
include/dwc3-omap-uboot.h +1 -0
@@ -28,4 +28,5 @@ struct dwc3_omap_device {
 
 int dwc3_omap_uboot_init(struct dwc3_omap_device *dev);
 void dwc3_omap_uboot_exit(int index);
+int dwc3_omap_uboot_interrupt_status(int index);
 #endif /* __DWC3_OMAP_UBOOT_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#75 lore raw

PATCH 29/40 usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms

In reply to Kishon Vijay Abraham I

Added a single driver for both USB2 PHY programming and USB3 PHY programming.

USB3 PHY is taken from drivers/phy/phy-ti-pipe3.c in linux kernel. commit 56042e : phy: ti-pipe3: Fix suspend/resume and module reload.

USB2 PHY is taken from drivers/phy/phy-omap-usb2.c in linux kernel. commit eb82a3 : phy: omap-usb2: Balance pm_runtime_enable() on probe failure and remove.

---
 drivers/usb/dwc3/ti_usb_phy.c |  309 +++++++++++++++++++++++++++++++++++++++++
 include/ti-usb-phy-uboot.h    |   22 +++
 2 files changed, 331 insertions(+)
 create mode 100644 drivers/usb/dwc3/ti_usb_phy.c
 create mode 100644 include/ti-usb-phy-uboot.h
drivers/usb/dwc3/ti_usb_phy.c new file +309 -0
new file mode 100644
index 0000000..e6048eb
@@ -0,0 +1,309 @@
+/**
+ * ti_usb_phy.c - USB3 and USB3 PHY programming for dwc3
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Author: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/phy/phy-ti-pipe3.c and
+ * drivers/phy/phy-omap-usb2.c) and ported to uboot.
+ *
+ * "commit 56042e : phy: ti-pipe3: Fix suspend/resume and module reload" for
+ * phy-ti-pipe3.c
+ *
+ * "commit eb82a3 : phy: omap-usb2: Balance pm_runtime_enable() on probe failure
+ * and remove" for phy-omap-usb2.c
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <malloc.h>
+#include <ti-usb-phy-uboot.h>
+#include <usb/lin_gadget_compat.h>
+#include <linux/ioport.h>
+#include <asm/io.h>
+#include <asm/arch/sys_proto.h>
+
+#include "linux-compat.h"
+
+#define PLL_STATUS		0x00000004
+#define PLL_GO			0x00000008
+#define PLL_CONFIGURATION1	0x0000000C
+#define PLL_CONFIGURATION2	0x00000010
+#define PLL_CONFIGURATION3	0x00000014
+#define PLL_CONFIGURATION4	0x00000020
+
+#define PLL_REGM_MASK		0x001FFE00
+#define PLL_REGM_SHIFT		0x9
+#define PLL_REGM_F_MASK		0x0003FFFF
+#define PLL_REGM_F_SHIFT	0x0
+#define PLL_REGN_MASK		0x000001FE
+#define PLL_REGN_SHIFT		0x1
+#define PLL_SELFREQDCO_MASK	0x0000000E
+#define PLL_SELFREQDCO_SHIFT	0x1
+#define PLL_SD_MASK		0x0003FC00
+#define PLL_SD_SHIFT		10
+#define SET_PLL_GO		0x1
+#define PLL_LDOPWDN		BIT(15)
+#define PLL_TICOPWDN		BIT(16)
+#define PLL_LOCK		0x2
+#define PLL_IDLE		0x1
+
+#define OMAP_CTRL_DEV_PHY_PD				BIT(0)
+#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK		0x003FC000
+#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT		0xE
+
+#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_MASK		0xFFC00000
+#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_SHIFT	0x16
+
+#define OMAP_CTRL_USB3_PHY_TX_RX_POWERON	0x3
+#define OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF	0x0
+
+#define OMAP_CTRL_USB2_PHY_PD			BIT(28)
+
+#define AM437X_CTRL_USB2_PHY_PD			BIT(0)
+#define AM437X_CTRL_USB2_OTG_PD			BIT(1)
+#define AM437X_CTRL_USB2_OTGVDET_EN		BIT(19)
+#define AM437X_CTRL_USB2_OTGSESSEND_EN		BIT(20)
+
+static LIST_HEAD(ti_usb_phy_list);
+typedef unsigned int u32;
+
+struct usb3_dpll_params {
+	u16	m;
+	u8	n;
+	u8	freq:3;
+	u8	sd;
+	u32	mf;
+};
+
+struct usb3_dpll_map {
+	unsigned long rate;
+	struct usb3_dpll_params params;
+	struct usb3_dpll_map *dpll_map;
+};
+
+struct ti_usb_phy {
+	void __iomem *pll_ctrl_base;
+	void __iomem *usb2_phy_power;
+	void __iomem *usb3_phy_power;
+	struct usb3_dpll_map *dpll_map;
+	struct list_head list;
+	int index;
+};
+
+static struct usb3_dpll_map dpll_map_usb[] = {
+	{12000000, {1250, 5, 4, 20, 0} },	/* 12 MHz */
+	{16800000, {3125, 20, 4, 20, 0} },	/* 16.8 MHz */
+	{19200000, {1172, 8, 4, 20, 65537} },	/* 19.2 MHz */
+	{20000000, {1000, 7, 4, 10, 0} },	/* 20 MHz */
+	{26000000, {1250, 12, 4, 20, 0} },	/* 26 MHz */
+	{38400000, {3125, 47, 4, 20, 92843} },	/* 38.4 MHz */
+	{ },					/* Terminator */
+};
+
+static inline unsigned int ti_usb3_readl(void __iomem *base, u32 offset)
+{
+	return readl(base + offset);
+}
+
+static inline void ti_usb3_writel(void __iomem *base, u32 offset, u32 value)
+{
+	writel(value, base + offset);
+}
+
+#ifndef CONFIG_AM43XX
+static struct usb3_dpll_params *ti_usb3_get_dpll_params(struct ti_usb_phy *phy)
+{
+	unsigned long rate;
+	struct usb3_dpll_map *dpll_map = phy->dpll_map;
+
+	rate = get_sys_clk_freq();
+
+	for (; dpll_map->rate; dpll_map++) {
+		if (rate == dpll_map->rate)
+			return &dpll_map->params;
+	}
+
+	dev_err(phy->dev, "No DPLL configuration for %lu Hz SYS CLK\n", rate);
+
+	return NULL;
+}
+
+static int ti_usb3_dpll_wait_lock(struct ti_usb_phy *phy)
+{
+	u32 val;
+	do {
+		val = ti_usb3_readl(phy->pll_ctrl_base, PLL_STATUS);
+			if (val & PLL_LOCK)
+				break;
+	} while (1);
+
+	return 0;
+}
+
+static int ti_usb3_dpll_program(struct ti_usb_phy *phy)
+{
+	u32			val;
+	struct usb3_dpll_params	*dpll_params;
+
+	if (!phy->pll_ctrl_base)
+		return -EINVAL;
+
+	dpll_params = ti_usb3_get_dpll_params(phy);
+	if (!dpll_params)
+		return -EINVAL;
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1);
+	val &= ~PLL_REGN_MASK;
+	val |= dpll_params->n << PLL_REGN_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val);
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);
+	val &= ~PLL_SELFREQDCO_MASK;
+	val |= dpll_params->freq << PLL_SELFREQDCO_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION2, val);
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1);
+	val &= ~PLL_REGM_MASK;
+	val |= dpll_params->m << PLL_REGM_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val);
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION4);
+	val &= ~PLL_REGM_F_MASK;
+	val |= dpll_params->mf << PLL_REGM_F_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION4, val);
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION3);
+	val &= ~PLL_SD_MASK;
+	val |= dpll_params->sd << PLL_SD_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION3, val);
+
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_GO, SET_PLL_GO);
+
+	return ti_usb3_dpll_wait_lock(phy);
+}
+#endif
+
+void ti_usb2_phy_power(struct ti_usb_phy *phy, int on)
+{
+	u32 val;
+
+	val = readl(phy->usb2_phy_power);
+
+	if (on) {
+#ifdef CONFIG_DRA7XX
+		val &= ~OMAP_CTRL_DEV_PHY_PD;
+#elif defined(CONFIG_AM43XX)
+		val &= ~(AM437X_CTRL_USB2_PHY_PD |
+			 AM437X_CTRL_USB2_OTG_PD);
+		val |= (AM437X_CTRL_USB2_OTGVDET_EN |
+			AM437X_CTRL_USB2_OTGSESSEND_EN);
+#endif
+	} else {
+#ifdef CONFIG_DRA7XX
+		val |= OMAP_CTRL_DEV_PHY_PD;
+#elif defined(CONFIG_AM43XX)
+		val &= ~(AM437X_CTRL_USB2_OTGVDET_EN |
+			 AM437X_CTRL_USB2_OTGSESSEND_EN);
+		val |= (AM437X_CTRL_USB2_PHY_PD |
+			AM437X_CTRL_USB2_OTG_PD);
+#endif
+	}
+	writel(val, phy->usb2_phy_power);
+}
+
+#ifndef CONFIG_AM43XX
+void ti_usb3_phy_power(struct ti_usb_phy *phy, int on)
+{
+	u32 val;
+	u32 rate;
+	rate = get_sys_clk_freq();
+	rate = rate/1000000;
+
+	if (!phy->usb3_phy_power)
+		return;
+
+	val = readl(phy->usb3_phy_power);
+	if (on) {
+		val &= ~(OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK |
+			OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_MASK);
+		val |= (OMAP_CTRL_USB3_PHY_TX_RX_POWERON) <<
+			OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT;
+		val |= rate <<
+			OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_SHIFT;
+	} else {
+		val &= ~OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK;
+		val |= OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF <<
+			OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT;
+	}
+	writel(val, phy->usb3_phy_power);
+}
+#endif
+
+/**
+ * ti_usb_phy_uboot_init - usb phy uboot initialization code
+ * @dev: struct ti_usb_phy_device containing initialization data
+ *
+ * Entry point for ti usb phy driver. This driver handles initialization
+ * of both usb2 phy and usb3 phy. Pointer to ti_usb_phy_device should be
+ * passed containing base address and other initialization data.
+ * Returns '0' on success and a negative value on failure.
+ *
+ * Generally called from board_usb_init() implemented in board file.
+ */
+int ti_usb_phy_uboot_init(struct ti_usb_phy_device *dev)
+{
+	struct ti_usb_phy *phy;
+
+	phy = devm_kzalloc(NULL, sizeof(*phy), GFP_KERNEL);
+	if (!phy) {
+		dev_err(NULL, "unable to alloc mem for TI USB3 PHY\n");
+		return -ENOMEM;
+	}
+
+	phy->dpll_map = dpll_map_usb;
+	phy->index = dev->index;
+	phy->pll_ctrl_base = dev->pll_ctrl_base;
+	phy->usb2_phy_power = dev->usb2_phy_power;
+	phy->usb3_phy_power = dev->usb3_phy_power;
+
+#ifndef CONFIG_AM43XX
+	ti_usb3_dpll_program(phy);
+	ti_usb3_phy_power(phy, 1);
+#endif
+	ti_usb2_phy_power(phy, 1);
+	mdelay(150);
+	list_add_tail(&phy->list, &ti_usb_phy_list);
+
+	return 0;
+}
+
+/**
+ * ti_usb_phy_uboot_exit - usb phy uboot cleanup code
+ * @index: index of this controller
+ *
+ * Performs cleanup of memory allocated in ti_usb_phy_uboot_init.
+ * index of _this_ controller should be passed and should match with
+ * the index passed in ti_usb_phy_device during init.
+ *
+ * Generally called from board file.
+ */
+void ti_usb_phy_uboot_exit(int index)
+{
+	struct ti_usb_phy *phy = NULL;
+
+	list_for_each_entry(phy, &ti_usb_phy_list, list) {
+		if (phy->index != index)
+			continue;
+
+		ti_usb2_phy_power(phy, 0);
+#ifndef CONFIG_AM43XX
+		ti_usb3_phy_power(phy, 0);
+#endif
+		list_del(&phy->list);
+		kfree(phy);
+		break;
+	}
+}
include/ti-usb-phy-uboot.h new file +22 -0
new file mode 100644
index 0000000..93f7101
@@ -0,0 +1,22 @@
+/* include/ti_usb_phy_uboot.h
+ *
+ * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * USB2 and USB3 PHY uboot init
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __TI_USB_PHY_UBOOT_H_
+#define __TI_USB_PHY_UBOOT_H_
+
+struct ti_usb_phy_device {
+	void *pll_ctrl_base;
+	void *usb2_phy_power;
+	void *usb3_phy_power;
+	int index;
+};
+
+int ti_usb_phy_uboot_init(struct ti_usb_phy_device *dev);
+void ti_usb_phy_uboot_exit(int index);
+#endif /* __TI_USB_PHY_UBOOT_H_ */
Signature · 1 line
1.7.9.5
#76 lore raw

PATCH 29/40 usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms

Hi Kishon,

Quoted 358 lines

Added a single driver for both USB2 PHY programming and USB3 PHY programming.

USB3 PHY is taken from drivers/phy/phy-ti-pipe3.c in linux kernel. commit 56042e : phy: ti-pipe3: Fix suspend/resume and module reload.

USB2 PHY is taken from drivers/phy/phy-omap-usb2.c in linux kernel. commit eb82a3 : phy: omap-usb2: Balance pm_runtime_enable() on probe failure and remove.

---
 drivers/usb/dwc3/ti_usb_phy.c |  309
+++++++++++++++++++++++++++++++++++++++++
include/ti-usb-phy-uboot.h    |   22 +++ 2 files changed, 331
insertions(+) create mode 100644 drivers/usb/dwc3/ti_usb_phy.c
 create mode 100644 include/ti-usb-phy-uboot.h
(quoted diff) +0 -0

b/drivers/usb/dwc3/ti_usb_phy.c new file mode 100644 index 0000000..e6048eb

drivers/usb/dwc3/ti_usb_phy.c new file +4 -0
@@ -0,0 +1,309 @@
+/**
+ * ti_usb_phy.c - USB3 and USB3 PHY programming for dwc3
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated -

http://www.ti.com
+ *
+ * Author: Kishon Vijay Abraham I <[email protected]>
+ *
+ * Taken from Linux Kernel v3.16 (drivers/phy/phy-ti-pipe3.c and
+ * drivers/phy/phy-omap-usb2.c) and ported to uboot.
+ *
+ * "commit 56042e : phy: ti-pipe3: Fix suspend/resume and module reload" for
+ * phy-ti-pipe3.c
+ *
+ * "commit eb82a3 : phy: omap-usb2: Balance pm_runtime_enable() on probe failure
+ * and remove" for phy-omap-usb2.c
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */

drivers/usb/dwc3/ti_usb_phy.c new file +36 -0
+
+#include <common.h>
+#include <malloc.h>
+#include <ti-usb-phy-uboot.h>
+#include <usb/lin_gadget_compat.h>
+#include <linux/ioport.h>
+#include <asm/io.h>
+#include <asm/arch/sys_proto.h>
+
+#include "linux-compat.h"
+
+#define PLL_STATUS		0x00000004
+#define PLL_GO			0x00000008
+#define PLL_CONFIGURATION1	0x0000000C
+#define PLL_CONFIGURATION2	0x00000010
+#define PLL_CONFIGURATION3	0x00000014
+#define PLL_CONFIGURATION4	0x00000020
+
+#define PLL_REGM_MASK		0x001FFE00
+#define PLL_REGM_SHIFT		0x9
+#define PLL_REGM_F_MASK		0x0003FFFF
+#define PLL_REGM_F_SHIFT	0x0
+#define PLL_REGN_MASK		0x000001FE
+#define PLL_REGN_SHIFT		0x1
+#define PLL_SELFREQDCO_MASK	0x0000000E
+#define PLL_SELFREQDCO_SHIFT	0x1
+#define PLL_SD_MASK		0x0003FC00
+#define PLL_SD_SHIFT		10
+#define SET_PLL_GO		0x1
+#define PLL_LDOPWDN		BIT(15)
+#define PLL_TICOPWDN		BIT(16)
+#define PLL_LOCK		0x2
+#define PLL_IDLE		0x1
+
+#define OMAP_CTRL_DEV_PHY_PD				BIT(0)
+#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK

0x003FC000 +#define
OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT 0xE +
+#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_MASK 0xFFC00000 +#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_SHIFT 0x16 +

drivers/usb/dwc3/ti_usb_phy.c new file +47 -0
+#define OMAP_CTRL_USB3_PHY_TX_RX_POWERON	0x3
+#define OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF	0x0
+
+#define OMAP_CTRL_USB2_PHY_PD			BIT(28)
+
+#define AM437X_CTRL_USB2_PHY_PD			BIT(0)
+#define AM437X_CTRL_USB2_OTG_PD			BIT(1)
+#define AM437X_CTRL_USB2_OTGVDET_EN		BIT(19)
+#define AM437X_CTRL_USB2_OTGSESSEND_EN		BIT(20)
+
+static LIST_HEAD(ti_usb_phy_list);
+typedef unsigned int u32;
+
+struct usb3_dpll_params {
+	u16	m;
+	u8	n;
+	u8	freq:3;
+	u8	sd;
+	u32	mf;
+};
+
+struct usb3_dpll_map {
+	unsigned long rate;
+	struct usb3_dpll_params params;
+	struct usb3_dpll_map *dpll_map;
+};
+
+struct ti_usb_phy {
+	void __iomem *pll_ctrl_base;
+	void __iomem *usb2_phy_power;
+	void __iomem *usb3_phy_power;
+	struct usb3_dpll_map *dpll_map;
+	struct list_head list;
+	int index;
+};
+
+static struct usb3_dpll_map dpll_map_usb[] = {
+	{12000000, {1250, 5, 4, 20, 0} },	/* 12 MHz */
+	{16800000, {3125, 20, 4, 20, 0} },	/* 16.8 MHz */
+	{19200000, {1172, 8, 4, 20, 65537} },	/* 19.2 MHz */
+	{20000000, {1000, 7, 4, 10, 0} },	/* 20 MHz */
+	{26000000, {1250, 12, 4, 20, 0} },	/* 26 MHz */
+	{38400000, {3125, 47, 4, 20, 92843} },	/* 38.4 MHz */
+	{ },					/* Terminator */
+};
+
+static inline unsigned int ti_usb3_readl(void __iomem *base, u32

offset) +{

drivers/usb/dwc3/ti_usb_phy.c new file +4 -0
+	return readl(base + offset);
+}
+
+static inline void ti_usb3_writel(void __iomem *base, u32 offset,

u32 value) +{

drivers/usb/dwc3/ti_usb_phy.c new file +5 -0
+	writel(value, base + offset);
+}
+
+#ifndef CONFIG_AM43XX
+static struct usb3_dpll_params *ti_usb3_get_dpll_params(struct

ti_usb_phy *phy) +{

drivers/usb/dwc3/ti_usb_phy.c new file +11 -0
+	unsigned long rate;
+	struct usb3_dpll_map *dpll_map = phy->dpll_map;
+
+	rate = get_sys_clk_freq();
+
+	for (; dpll_map->rate; dpll_map++) {
+		if (rate == dpll_map->rate)
+			return &dpll_map->params;
+	}
+
+	dev_err(phy->dev, "No DPLL configuration for %lu Hz SYS

CLK\n", rate); +

drivers/usb/dwc3/ti_usb_phy.c new file +119 -0
+	return NULL;
+}
+
+static int ti_usb3_dpll_wait_lock(struct ti_usb_phy *phy)
+{
+	u32 val;
+	do {
+		val = ti_usb3_readl(phy->pll_ctrl_base, PLL_STATUS);
+			if (val & PLL_LOCK)
+				break;
+	} while (1);
+
+	return 0;
+}
+
+static int ti_usb3_dpll_program(struct ti_usb_phy *phy)
+{
+	u32			val;
+	struct usb3_dpll_params	*dpll_params;
+
+	if (!phy->pll_ctrl_base)
+		return -EINVAL;
+
+	dpll_params = ti_usb3_get_dpll_params(phy);
+	if (!dpll_params)
+		return -EINVAL;
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1);
+	val &= ~PLL_REGN_MASK;
+	val |= dpll_params->n << PLL_REGN_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val);
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);
+	val &= ~PLL_SELFREQDCO_MASK;
+	val |= dpll_params->freq << PLL_SELFREQDCO_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION2, val);
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1);
+	val &= ~PLL_REGM_MASK;
+	val |= dpll_params->m << PLL_REGM_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val);
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION4);
+	val &= ~PLL_REGM_F_MASK;
+	val |= dpll_params->mf << PLL_REGM_F_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION4, val);
+
+	val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION3);
+	val &= ~PLL_SD_MASK;
+	val |= dpll_params->sd << PLL_SD_SHIFT;
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION3, val);
+
+	ti_usb3_writel(phy->pll_ctrl_base, PLL_GO, SET_PLL_GO);
+
+	return ti_usb3_dpll_wait_lock(phy);
+}
+#endif
+
+void ti_usb2_phy_power(struct ti_usb_phy *phy, int on)
+{
+	u32 val;
+
+	val = readl(phy->usb2_phy_power);
+
+	if (on) {
+#ifdef CONFIG_DRA7XX
+		val &= ~OMAP_CTRL_DEV_PHY_PD;
+#elif defined(CONFIG_AM43XX)
+		val &= ~(AM437X_CTRL_USB2_PHY_PD |
+			 AM437X_CTRL_USB2_OTG_PD);
+		val |= (AM437X_CTRL_USB2_OTGVDET_EN |
+			AM437X_CTRL_USB2_OTGSESSEND_EN);
+#endif
+	} else {
+#ifdef CONFIG_DRA7XX
+		val |= OMAP_CTRL_DEV_PHY_PD;
+#elif defined(CONFIG_AM43XX)
+		val &= ~(AM437X_CTRL_USB2_OTGVDET_EN |
+			 AM437X_CTRL_USB2_OTGSESSEND_EN);
+		val |= (AM437X_CTRL_USB2_PHY_PD |
+			AM437X_CTRL_USB2_OTG_PD);
+#endif
+	}
+	writel(val, phy->usb2_phy_power);
+}
+
+#ifndef CONFIG_AM43XX
+void ti_usb3_phy_power(struct ti_usb_phy *phy, int on)
+{
+	u32 val;
+	u32 rate;
+	rate = get_sys_clk_freq();
+	rate = rate/1000000;
+
+	if (!phy->usb3_phy_power)
+		return;
+
+	val = readl(phy->usb3_phy_power);
+	if (on) {
+		val &= ~(OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK |
+			OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_MASK);
+		val |= (OMAP_CTRL_USB3_PHY_TX_RX_POWERON) <<
+			OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT;
+		val |= rate <<
+			OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_SHIFT;
+	} else {
+		val &= ~OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK;
+		val |= OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF <<
+			OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT;
+	}
+	writel(val, phy->usb3_phy_power);
+}
+#endif
+
+/**
+ * ti_usb_phy_uboot_init - usb phy uboot initialization code
+ * @dev: struct ti_usb_phy_device containing initialization data
+ *
+ * Entry point for ti usb phy driver. This driver handles

initialization
+ * of both usb2 phy and usb3 phy. Pointer to ti_usb_phy_device should be
+ * passed containing base address and other initialization data.
+ * Returns '0' on success and a negative value on failure.
+ *
+ * Generally called from board_usb_init() implemented in board file.
+ */

drivers/usb/dwc3/ti_usb_phy.c new file +7 -0
+int ti_usb_phy_uboot_init(struct ti_usb_phy_device *dev)
+{
+	struct ti_usb_phy *phy;
+
+	phy = devm_kzalloc(NULL, sizeof(*phy), GFP_KERNEL);
+	if (!phy) {
+		dev_err(NULL, "unable to alloc mem for TI USB3

PHY\n");

drivers/usb/dwc3/ti_usb_phy.c new file +47 -0
+		return -ENOMEM;
+	}
+
+	phy->dpll_map = dpll_map_usb;
+	phy->index = dev->index;
+	phy->pll_ctrl_base = dev->pll_ctrl_base;
+	phy->usb2_phy_power = dev->usb2_phy_power;
+	phy->usb3_phy_power = dev->usb3_phy_power;
+
+#ifndef CONFIG_AM43XX
+	ti_usb3_dpll_program(phy);
+	ti_usb3_phy_power(phy, 1);
+#endif
+	ti_usb2_phy_power(phy, 1);
+	mdelay(150);
+	list_add_tail(&phy->list, &ti_usb_phy_list);
+
+	return 0;
+}
+
+/**
+ * ti_usb_phy_uboot_exit - usb phy uboot cleanup code
+ * @index: index of this controller
+ *
+ * Performs cleanup of memory allocated in ti_usb_phy_uboot_init.
+ * index of _this_ controller should be passed and should match with
+ * the index passed in ti_usb_phy_device during init.
+ *
+ * Generally called from board file.
+ */
+void ti_usb_phy_uboot_exit(int index)
+{
+	struct ti_usb_phy *phy = NULL;
+
+	list_for_each_entry(phy, &ti_usb_phy_list, list) {
+		if (phy->index != index)
+			continue;
+
+		ti_usb2_phy_power(phy, 0);
+#ifndef CONFIG_AM43XX
+		ti_usb3_phy_power(phy, 0);
+#endif
+		list_del(&phy->list);
+		kfree(phy);
+		break;
+	}
+}
include/ti-usb-phy-uboot.h new file +3 -0
new file mode 100644
index 0000000..93f7101
@@ -0,0 +1,22 @@
+/* include/ti_usb_phy_uboot.h
+ *
+ * Copyright (c) 2014 Texas Instruments Incorporated -

http://www.ti.com
+ *
+ * USB2 and USB3 PHY uboot init
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */

include/ti-usb-phy-uboot.h new file +4 -0
+
+#ifndef __TI_USB_PHY_UBOOT_H_
+#define __TI_USB_PHY_UBOOT_H_
+

include/ti-usb-phy-uboot.h line 22

Quoted 10 lines
include/ti-usb-phy-uboot.h new file +10 -0
+struct ti_usb_phy_device {
+	void *pll_ctrl_base;
+	void *usb2_phy_power;
+	void *usb3_phy_power;
+	int index;
+};
+
+int ti_usb_phy_uboot_init(struct ti_usb_phy_device *dev);
+void ti_usb_phy_uboot_exit(int index);
+#endif /* __TI_USB_PHY_UBOOT_H_ */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#77 lore raw

PATCH 30/40 dwc3: flush the buffers before using it

In reply to Kishon Vijay Abraham I

In the linux kernel, non cacheable buffers are used. However in uboot since there are no APIs to allocate non cacheable memory, all the buffers should be flushed before using it.

---
 drivers/usb/dwc3/core.c   |    7 +++++++
 drivers/usb/dwc3/ep0.c    |    6 ++++++
 drivers/usb/dwc3/gadget.c |    5 +++++
 drivers/usb/dwc3/io.h     |    6 ++++++
 4 files changed, 24 insertions(+)
drivers/usb/dwc3/core.c +7 -0
index 5a8d5ea..4c3637f 100644
@@ -769,11 +769,18 @@ void dwc3_uboot_exit(int index)
 void dwc3_uboot_handle_interrupt(int index)
 {
 	struct dwc3 *dwc = NULL;
+	int i;
+	struct dwc3_event_buffer *evt;
 
 	list_for_each_entry(dwc, &dwc3_list, list) {
 		if (dwc->index != index)
 			continue;
 
+		for (i = 0; i < dwc->num_event_buffers; i++) {
+			evt = dwc->ev_buffs[i];
+			dwc3_flush_cache((int)evt->buf, evt->length);
+		}
+
 		dwc3_gadget_uboot_handle_interrupt(dwc);
 		break;
 	}
drivers/usb/dwc3/ep0.c +6 -0
index 803ba51..977d6d4 100644
@@ -74,6 +74,9 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
 			| DWC3_TRB_CTRL_IOC
 			| DWC3_TRB_CTRL_ISP_IMI);
 
+	dwc3_flush_cache((int)buf_dma, len);
+	dwc3_flush_cache((int)trb, sizeof(*trb));
+
 	memset(&params, 0, sizeof(params));
 	params.param0 = upper_32_bits(dwc->ep0_trb_addr);
 	params.param1 = lower_32_bits(dwc->ep0_trb_addr);
@@ -774,6 +777,8 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 	if (!r)
 		return;
 
+	dwc3_flush_cache((int)trb, sizeof(*trb));
+
 	status = DWC3_TRB_SIZE_TRBSTS(trb->size);
 	if (status == DWC3_TRBSTS_SETUP_PENDING) {
 		dev_dbg(dwc->dev, "Setup Pending received");
@@ -795,6 +800,7 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 		transfer_size += (maxp - (transfer_size % maxp));
 		transferred = min_t(u32, ur->length,
 				transfer_size - length);
+		dwc3_flush_cache((int)dwc->ep0_bounce, DWC3_EP0_BOUNCE_SIZE);
 		memcpy(ur->buf, dwc->ep0_bounce, transferred);
 	} else {
 		transferred = ur->length - length;
drivers/usb/dwc3/gadget.c +5 -0
index 1f97729..b68b6a4 100644
@@ -244,6 +244,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
 
 	list_del(&req->list);
 	req->trb = NULL;
+	dwc3_flush_cache((int)req->request.dma, req->request.length);
 
 	if (req->request.status == -EINPROGRESS)
 		req->request.status = status;
@@ -769,6 +770,9 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
 		trb->ctrl |= DWC3_TRB_CTRL_SID_SOFN(req->request.stream_id);
 
 	trb->ctrl |= DWC3_TRB_CTRL_HWO;
+
+	dwc3_flush_cache((int)dma, length);
+	dwc3_flush_cache((int)trb, sizeof(*trb));
 }
 
 /*
@@ -1770,6 +1774,7 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
 		slot %= DWC3_TRB_NUM;
 		trb = &dep->trb_pool[slot];
 
+		dwc3_flush_cache((int)trb, sizeof(*trb));
 		ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb,
 				event, status);
 		if (ret)
drivers/usb/dwc3/io.h +6 -0
index b6da135..31606de 100644
@@ -20,6 +20,7 @@
 
 #include <asm/io.h>
 
+#define	CACHELINE_SIZE		CONFIG_SYS_CACHELINE_SIZE
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
 {
 	u32 offs = offset - DWC3_GLOBALS_REGS_START;
@@ -47,4 +48,9 @@ static inline void dwc3_writel(void __iomem *base, u32 offset, u32 value)
 	writel(value, base + offs);
 }
 
+static inline void dwc3_flush_cache(int addr, int length)
+{
+	flush_dcache_range(addr & ~(CACHELINE_SIZE - 1),
+			   ALIGN(addr + length, CACHELINE_SIZE));
+}
 #endif /* __DRIVERS_USB_DWC3_IO_H */
Signature · 1 line
1.7.9.5
#78 lore raw

PATCH 30/40 dwc3: flush the buffers before using it

Hi Kishon,

Quoted 109 lines

In the linux kernel, non cacheable buffers are used. However in uboot since there are no APIs to allocate non cacheable memory, all the buffers should be flushed before using it.

---
 drivers/usb/dwc3/core.c   |    7 +++++++
 drivers/usb/dwc3/ep0.c    |    6 ++++++
 drivers/usb/dwc3/gadget.c |    5 +++++
 drivers/usb/dwc3/io.h     |    6 ++++++
 4 files changed, 24 insertions(+)
drivers/usb/dwc3/core.c +7 -0
index 5a8d5ea..4c3637f 100644
@@ -769,11 +769,18 @@ void dwc3_uboot_exit(int index)
 void dwc3_uboot_handle_interrupt(int index)
 {
 	struct dwc3 *dwc = NULL;
+	int i;
+	struct dwc3_event_buffer *evt;
 
 	list_for_each_entry(dwc, &dwc3_list, list) {
 		if (dwc->index != index)
 			continue;
 
+		for (i = 0; i < dwc->num_event_buffers; i++) {
+			evt = dwc->ev_buffs[i];
+			dwc3_flush_cache((int)evt->buf, evt->length);
+		}
+
 		dwc3_gadget_uboot_handle_interrupt(dwc);
 		break;
 	}
drivers/usb/dwc3/ep0.c +0 -0
index 803ba51..977d6d4 100644
@@ -74,6 +74,9 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc,

u8 epnum, dma_addr_t buf_dma, | DWC3_TRB_CTRL_IOC

drivers/usb/dwc3/ep0.c +6 -0
 			| DWC3_TRB_CTRL_ISP_IMI);
 
+	dwc3_flush_cache((int)buf_dma, len);
+	dwc3_flush_cache((int)trb, sizeof(*trb));
+
 	memset(&params, 0, sizeof(params));
 	params.param0 = upper_32_bits(dwc->ep0_trb_addr);
 	params.param1 = lower_32_bits(dwc->ep0_trb_addr);
@@ -774,6 +777,8 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc, if (!r)
 		return;
 
+	dwc3_flush_cache((int)trb, sizeof(*trb));
+
 	status = DWC3_TRB_SIZE_TRBSTS(trb->size);
 	if (status == DWC3_TRBSTS_SETUP_PENDING) {
 		dev_dbg(dwc->dev, "Setup Pending received");
@@ -795,6 +800,7 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc, transfer_size += (maxp - (transfer_size % maxp));
 		transferred = min_t(u32, ur->length,
 				transfer_size - length);
+		dwc3_flush_cache((int)dwc->ep0_bounce,
 DWC3_EP0_BOUNCE_SIZE); memcpy(ur->buf, dwc->ep0_bounce, transferred);
 	} else {
 		transferred = ur->length - length;
drivers/usb/dwc3/gadget.c +5 -0
index 1f97729..b68b6a4 100644
@@ -244,6 +244,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep,
 struct dwc3_request *req, 
 	list_del(&req->list);
 	req->trb = NULL;
+	dwc3_flush_cache((int)req->request.dma, req->request.length);
 
 	if (req->request.status == -EINPROGRESS)
 		req->request.status = status;
@@ -769,6 +770,9 @@ static void dwc3_prepare_one_trb(struct dwc3_ep
 *dep, trb->ctrl |= DWC3_TRB_CTRL_SID_SOFN(req->request.stream_id);
 
 	trb->ctrl |= DWC3_TRB_CTRL_HWO;
+
+	dwc3_flush_cache((int)dma, length);
+	dwc3_flush_cache((int)trb, sizeof(*trb));
 }
 
 /*
@@ -1770,6 +1774,7 @@ static int dwc3_cleanup_done_reqs(struct dwc3
 *dwc, struct dwc3_ep *dep, slot %= DWC3_TRB_NUM;
 		trb = &dep->trb_pool[slot];
 
+		dwc3_flush_cache((int)trb, sizeof(*trb));
 		ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb,
 				event, status);
 		if (ret)
drivers/usb/dwc3/io.h +1 -0
index b6da135..31606de 100644
@@ -20,6 +20,7 @@
 
 #include <asm/io.h>
 
+#define	CACHELINE_SIZE

CONFIG_SYS_CACHELINE_SIZE static inline u32 dwc3_readl(void __iomem *base, u32 offset) {

drivers/usb/dwc3/io.h +0 -0
 	u32 offs = offset - DWC3_GLOBALS_REGS_START;

drivers/usb/dwc3/io.h static inline void dwc3_writel(void __iomem *base, · line 54

Quoted 7 lines
drivers/usb/dwc3/io.h +4 -0
@@ -47,4 +48,9 @@ static inline void dwc3_writel(void __iomem *base,
 u32 offset, u32 value) writel(value, base + offs);
 }
 
+static inline void dwc3_flush_cache(int addr, int length)
+{
+	flush_dcache_range(addr & ~(CACHELINE_SIZE - 1),
+			   ALIGN(addr + length, CACHELINE_SIZE));

Is this safe cache operation?

For example, the size of struct dwc3_trb is 16B [1] and the CACHELINE_SIZE is equal to 64B or 32B.

Since trb buffer is not padded to CACHELINE_SIZE it is perfectly correct to flush the CACHELINE_SIZE bytes, which may be allocated to hold other data. In this way we would have data corruption very difficult to fix.

Please consider s3c_udc_otg_xfer_dma.c for a reference (dwc2 gadget driver): (some useful code snippets)

flush_dcache_range((unsigned long) ep->dma_buf,

		   (unsigned long) ep->dma_buf +
		   ROUND(ep->len, CONFIG_SYS_CACHELINE_SIZE));

req = memalign(CONFIG_SYS_CACHELINE_SIZE, sizeof(*req)); if (!req)

	return 0;

And the buffers:

ALLOC_CACHE_ALIGN_BUFFER(struct data_rsp_box, rsp,

			 sizeof(struct data_rsp_box)); 

			[automatic variable allocation]

DEFINE_CACHE_ALIGN_BUFFER(unsigned char, thor_rx_data_buf,

			  sizeof(struct rqt_box));

			[global one]

All relevant structures should be allocated with using above API. Then we can use presented above flush_dcache_range() function (with CONFIG_SYS_CACHELINE_SIZE alignment).

Quoted 2 lines
drivers/usb/dwc3/io.h +1 -0
+}
 #endif /* __DRIVERS_USB_DWC3_IO_H */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#79 lore raw

PATCH 31/40 usb: dwc3: ep0: preparation for implementing chained TRB

In reply to Kishon Vijay Abraham I

No functional change. Modified few things so that there are no code duplication while implementing chained TRB.

---
 drivers/usb/dwc3/ep0.c |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/usb/dwc3/ep0.c +12 -8
index 977d6d4..fce2558 100644
@@ -761,7 +761,10 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 	struct usb_request	*ur;
 	struct dwc3_trb		*trb;
 	struct dwc3_ep		*ep0;
-	u32			transferred;
+	unsigned		transfer_size = 0;
+	unsigned		maxp;
+	void			*buf;
+	u32			transferred = 0;
 	u32			status;
 	u32			length;
 	u8			epnum;
@@ -790,18 +793,19 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 	}
 
 	ur = &r->request;
+	buf = ur->buf;
 
 	length = trb->size & DWC3_TRB_SIZE_MASK;
 
-	if (dwc->ep0_bounced) {
-		unsigned transfer_size = ur->length;
-		unsigned maxp = ep0->endpoint.maxpacket;
+	maxp = ep0->endpoint.maxpacket;
 
-		transfer_size += (maxp - (transfer_size % maxp));
-		transferred = min_t(u32, ur->length,
-				transfer_size - length);
+	if (dwc->ep0_bounced) {
+		transfer_size = roundup((ur->length - transfer_size),
+					maxp);
+		transferred = min_t(u32, ur->length - transferred,
+				    transfer_size - length);
 		dwc3_flush_cache((int)dwc->ep0_bounce, DWC3_EP0_BOUNCE_SIZE);
-		memcpy(ur->buf, dwc->ep0_bounce, transferred);
+		memcpy(buf, dwc->ep0_bounce, transferred);
 	} else {
 		transferred = ur->length - length;
 	}
Signature · 1 line
1.7.9.5
#80 lore raw

PATCH 31/40 usb: dwc3: ep0: preparation for implementing chained TRB

Hi Kishon,

Quoted 51 lines

No functional change. Modified few things so that there are no code duplication while implementing chained TRB.

---
 drivers/usb/dwc3/ep0.c |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/usb/dwc3/ep0.c +12 -8
index 977d6d4..fce2558 100644
@@ -761,7 +761,10 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc, struct usb_request	*ur;
 	struct dwc3_trb		*trb;
 	struct dwc3_ep		*ep0;
-	u32			transferred;
+	unsigned		transfer_size = 0;
+	unsigned		maxp;
+	void			*buf;
+	u32			transferred = 0;
 	u32			status;
 	u32			length;
 	u8			epnum;
@@ -790,18 +793,19 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc, }
 
 	ur = &r->request;
+	buf = ur->buf;
 
 	length = trb->size & DWC3_TRB_SIZE_MASK;
 
-	if (dwc->ep0_bounced) {
-		unsigned transfer_size = ur->length;
-		unsigned maxp = ep0->endpoint.maxpacket;
+	maxp = ep0->endpoint.maxpacket;
 
-		transfer_size += (maxp - (transfer_size % maxp));
-		transferred = min_t(u32, ur->length,
-				transfer_size - length);
+	if (dwc->ep0_bounced) {
+		transfer_size = roundup((ur->length - transfer_size),
+					maxp);
+		transferred = min_t(u32, ur->length - transferred,
+				    transfer_size - length);
 		dwc3_flush_cache((int)dwc->ep0_bounce,
 DWC3_EP0_BOUNCE_SIZE);
-		memcpy(ur->buf, dwc->ep0_bounce, transferred);
+		memcpy(buf, dwc->ep0_bounce, transferred);
 	} else {
 		transferred = ur->length - length;
Quoted 1 line

}

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#81 lore raw

PATCH 32/40 usb: dwc3: Add chained TRB support for ep0

In reply to Kishon Vijay Abraham I

dwc3 can do only max packet aligned transfers. So in case request length is not max packet aligned and is bigger than DWC3_EP0_BOUNCE_SIZE two chained TRBs is required to handle the transfer.

---
 drivers/usb/dwc3/ep0.c    |   72 +++++++++++++++++++++++++++++++++------------
 drivers/usb/dwc3/gadget.c |    2 +-
 2 files changed, 55 insertions(+), 19 deletions(-)
drivers/usb/dwc3/ep0.c +54 -18
index fce2558..c2fe0ec 100644
@@ -48,7 +48,7 @@ static const char *dwc3_ep0_state_string(enum dwc3_ep0_state state)
 }
 
 static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
-		u32 len, u32 type)
+				u32 len, u32 type, unsigned chain)
 {
 	struct dwc3_gadget_ep_cmd_params params;
 	struct dwc3_trb			*trb;
@@ -62,7 +62,10 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
 		return 0;
 	}
 
-	trb = dwc->ep0_trb;
+	trb = &dwc->ep0_trb[dep->free_slot];
+
+	if (chain)
+		dep->free_slot++;
 
 	trb->bpl = lower_32_bits(buf_dma);
 	trb->bph = upper_32_bits(buf_dma);
@@ -70,13 +73,20 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
 	trb->ctrl = type;
 
 	trb->ctrl |= (DWC3_TRB_CTRL_HWO
-			| DWC3_TRB_CTRL_LST
-			| DWC3_TRB_CTRL_IOC
 			| DWC3_TRB_CTRL_ISP_IMI);
 
+	if (chain)
+		trb->ctrl |= DWC3_TRB_CTRL_CHN;
+	else
+		trb->ctrl |= (DWC3_TRB_CTRL_IOC
+				| DWC3_TRB_CTRL_LST);
+
 	dwc3_flush_cache((int)buf_dma, len);
 	dwc3_flush_cache((int)trb, sizeof(*trb));
 
+	if (chain)
+		return 0;
+
 	memset(&params, 0, sizeof(params));
 	params.param0 = upper_32_bits(dwc->ep0_trb_addr);
 	params.param1 = lower_32_bits(dwc->ep0_trb_addr);
@@ -289,7 +299,7 @@ void dwc3_ep0_out_start(struct dwc3 *dwc)
 	int				ret;
 
 	ret = dwc3_ep0_start_trans(dwc, 0, dwc->ctrl_req_addr, 8,
-			DWC3_TRBCTL_CONTROL_SETUP);
+				   DWC3_TRBCTL_CONTROL_SETUP, 0);
 	WARN_ON(ret < 0);
 }
 
@@ -799,6 +809,23 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 
 	maxp = ep0->endpoint.maxpacket;
 
+	/* Handle the first TRB before handling the bounce buffer if the request
+	 * length is greater than the bounce buffer size
+	 */
+	if (!IS_ALIGNED(ur->length, maxp) &&
+	    ur->length > DWC3_EP0_BOUNCE_SIZE) {
+		transfer_size = (ur->length / maxp) * maxp;
+		transferred = transfer_size - length;
+		buf = (u8 *)buf + transferred;
+		ur->actual += transferred;
+
+		trb++;
+		dwc3_flush_cache((int)trb, sizeof(*trb));
+		length = trb->size & DWC3_TRB_SIZE_MASK;
+
+		ep0->free_slot = 0;
+	}
+
 	if (dwc->ep0_bounced) {
 		transfer_size = roundup((ur->length - transfer_size),
 					maxp);
@@ -827,7 +854,7 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 
 			ret = dwc3_ep0_start_trans(dwc, epnum,
 					dwc->ctrl_req_addr, 0,
-					DWC3_TRBCTL_CONTROL_DATA);
+					DWC3_TRBCTL_CONTROL_DATA, 0);
 			WARN_ON(ret < 0);
 		}
 	}
@@ -908,11 +935,11 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
 
 	if (req->request.length == 0) {
 		ret = dwc3_ep0_start_trans(dwc, dep->number,
-				dwc->ctrl_req_addr, 0,
-				DWC3_TRBCTL_CONTROL_DATA);
-	} else if (!IS_ALIGNED(req->request.length, dep->endpoint.maxpacket)
-			&& (dep->number == 0)) {
-		u32	transfer_size;
+					   dwc->ctrl_req_addr, 0,
+					   DWC3_TRBCTL_CONTROL_DATA, 0);
+	} else if (!IS_ALIGNED(req->request.length, dep->endpoint.maxpacket) &&
+			(dep->number == 0)) {
+		u32	transfer_size = 0;
 		u32	maxpacket;
 
 		ret = usb_gadget_map_request(&dwc->gadget, &req->request,
@@ -922,10 +949,18 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
 			return;
 		}
 
-		WARN_ON(req->request.length > DWC3_EP0_BOUNCE_SIZE);
-
 		maxpacket = dep->endpoint.maxpacket;
-		transfer_size = roundup(req->request.length, maxpacket);
+		if (req->request.length > DWC3_EP0_BOUNCE_SIZE) {
+			transfer_size = (req->request.length / maxpacket) *
+						maxpacket;
+			ret = dwc3_ep0_start_trans(dwc, dep->number,
+						   req->request.dma,
+						   transfer_size,
+						   DWC3_TRBCTL_CONTROL_DATA, 1);
+		}
+
+		transfer_size = roundup((req->request.length - transfer_size),
+					maxpacket);
 
 		dwc->ep0_bounced = true;
 
@@ -935,8 +970,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
 		 * TRBs to handle the transfer.
 		 */
 		ret = dwc3_ep0_start_trans(dwc, dep->number,
-				dwc->ep0_bounce_addr, transfer_size,
-				DWC3_TRBCTL_CONTROL_DATA);
+					   dwc->ep0_bounce_addr, transfer_size,
+					   DWC3_TRBCTL_CONTROL_DATA, 0);
 	} else {
 		ret = usb_gadget_map_request(&dwc->gadget, &req->request,
 				dep->number);
@@ -946,7 +981,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
 		}
 
 		ret = dwc3_ep0_start_trans(dwc, dep->number, req->request.dma,
-				req->request.length, DWC3_TRBCTL_CONTROL_DATA);
+					   req->request.length,
+					   DWC3_TRBCTL_CONTROL_DATA, 0);
 	}
 
 	WARN_ON(ret < 0);
@@ -961,7 +997,7 @@ static int dwc3_ep0_start_control_status(struct dwc3_ep *dep)
 		: DWC3_TRBCTL_CONTROL_STATUS2;
 
 	return dwc3_ep0_start_trans(dwc, dep->number,
-			dwc->ctrl_req_addr, 0, type);
+			dwc->ctrl_req_addr, 0, type, 0);
 }
 
 static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep)
drivers/usb/dwc3/gadget.c +1 -1
index b68b6a4..01bc83b 100644
@@ -2580,7 +2580,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 		goto err0;
 	}
 
-	dwc->ep0_trb = dma_alloc_coherent(sizeof(*dwc->ep0_trb),
+	dwc->ep0_trb = dma_alloc_coherent(sizeof(*dwc->ep0_trb) * 2,
 					  (unsigned long *)&dwc->ep0_trb_addr);
 	if (!dwc->ep0_trb) {
 		dev_err(dwc->dev, "failed to allocate ep0 trb\n");
Signature · 1 line
1.7.9.5
#82 lore raw

PATCH 32/40 usb: dwc3: Add chained TRB support for ep0

Hi Kishon,

Quoted 75 lines

dwc3 can do only max packet aligned transfers. So in case request length is not max packet aligned and is bigger than DWC3_EP0_BOUNCE_SIZE two chained TRBs is required to handle the transfer.

---
 drivers/usb/dwc3/ep0.c    |   72

+++++++++++++++++++++++++++++++++------------
drivers/usb/dwc3/gadget.c | 2 +- 2 files changed, 55
insertions(+), 19 deletions(-)

drivers/usb/dwc3/ep0.c +1 -1
index fce2558..c2fe0ec 100644
@@ -48,7 +48,7 @@ static const char *dwc3_ep0_state_string(enum
 dwc3_ep0_state state) }
 
 static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum,
 dma_addr_t buf_dma,
-		u32 len, u32 type)
+				u32 len, u32 type, unsigned chain)
 {
 	struct dwc3_gadget_ep_cmd_params params;
drivers/usb/dwc3/ep0.c +15 -4
 	struct dwc3_trb			*trb;
@@ -62,7 +62,10 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc,
 u8 epnum, dma_addr_t buf_dma, return 0;
 	}
 
-	trb = dwc->ep0_trb;
+	trb = &dwc->ep0_trb[dep->free_slot];
+
+	if (chain)
+		dep->free_slot++;
 
 	trb->bpl = lower_32_bits(buf_dma);
 	trb->bph = upper_32_bits(buf_dma);
@@ -70,13 +73,20 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc,
 u8 epnum, dma_addr_t buf_dma, trb->ctrl = type;
 
 	trb->ctrl |= (DWC3_TRB_CTRL_HWO
-			| DWC3_TRB_CTRL_LST
-			| DWC3_TRB_CTRL_IOC
 			| DWC3_TRB_CTRL_ISP_IMI);
 
+	if (chain)
+		trb->ctrl |= DWC3_TRB_CTRL_CHN;
+	else
+		trb->ctrl |= (DWC3_TRB_CTRL_IOC
+				| DWC3_TRB_CTRL_LST);
+
 	dwc3_flush_cache((int)buf_dma, len);
 	dwc3_flush_cache((int)trb, sizeof(*trb));
 
+	if (chain)
+		return 0;
+
 	memset(&params, 0, sizeof(params));
 	params.param0 = upper_32_bits(dwc->ep0_trb_addr);
 	params.param1 = lower_32_bits(dwc->ep0_trb_addr);
@@ -289,7 +299,7 @@ void dwc3_ep0_out_start(struct dwc3 *dwc)
 	int				ret;
 
 	ret = dwc3_ep0_start_trans(dwc, 0, dwc->ctrl_req_addr, 8,
-			DWC3_TRBCTL_CONTROL_SETUP);
+				   DWC3_TRBCTL_CONTROL_SETUP, 0);
 	WARN_ON(ret < 0);
 }
 
@@ -799,6 +809,23 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc, 
 	maxp = ep0->endpoint.maxpacket;
 
+	/* Handle the first TRB before handling the bounce buffer if
Quoted 1 line

the request

Minor comment - please fix above comment.

Quoted 113 lines
drivers/usb/dwc3/ep0.c +20 -6
+	 * length is greater than the bounce buffer size
+	 */
+	if (!IS_ALIGNED(ur->length, maxp) &&
+	    ur->length > DWC3_EP0_BOUNCE_SIZE) {
+		transfer_size = (ur->length / maxp) * maxp;
+		transferred = transfer_size - length;
+		buf = (u8 *)buf + transferred;
+		ur->actual += transferred;
+
+		trb++;
+		dwc3_flush_cache((int)trb, sizeof(*trb));
+		length = trb->size & DWC3_TRB_SIZE_MASK;
+
+		ep0->free_slot = 0;
+	}
+
 	if (dwc->ep0_bounced) {
 		transfer_size = roundup((ur->length - transfer_size),
 					maxp);
@@ -827,7 +854,7 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc, 
 			ret = dwc3_ep0_start_trans(dwc, epnum,
 					dwc->ctrl_req_addr, 0,
-					DWC3_TRBCTL_CONTROL_DATA);
+					DWC3_TRBCTL_CONTROL_DATA, 0);
 			WARN_ON(ret < 0);
 		}
 	}
@@ -908,11 +935,11 @@ static void __dwc3_ep0_do_control_data(struct
 dwc3 *dwc, 
 	if (req->request.length == 0) {
 		ret = dwc3_ep0_start_trans(dwc, dep->number,
-				dwc->ctrl_req_addr, 0,
-				DWC3_TRBCTL_CONTROL_DATA);
-	} else if (!IS_ALIGNED(req->request.length,
 dep->endpoint.maxpacket)
-			&& (dep->number == 0)) {
-		u32	transfer_size;
+					   dwc->ctrl_req_addr, 0,
+					   DWC3_TRBCTL_CONTROL_DATA,
 0);
+	} else if (!IS_ALIGNED(req->request.length,

dep->endpoint.maxpacket) &&

drivers/usb/dwc3/ep0.c +2 -0
+			(dep->number == 0)) {
+		u32	transfer_size = 0;
 		u32	maxpacket;
 
 		ret = usb_gadget_map_request(&dwc->gadget,

&req->request, @@ -922,10 +949,18 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, return;

drivers/usb/dwc3/ep0.c +0 -3
 		}
 
-		WARN_ON(req->request.length > DWC3_EP0_BOUNCE_SIZE);
-
 		maxpacket = dep->endpoint.maxpacket;
-		transfer_size = roundup(req->request.length,

maxpacket);

drivers/usb/dwc3/ep0.c +2 -0
+		if (req->request.length > DWC3_EP0_BOUNCE_SIZE) {
+			transfer_size = (req->request.length /

maxpacket) *

drivers/usb/dwc3/ep0.c +5 -0
+						maxpacket;
+			ret = dwc3_ep0_start_trans(dwc, dep->number,
+						   req->request.dma,
+						   transfer_size,
+

DWC3_TRBCTL_CONTROL_DATA, 1);

drivers/usb/dwc3/ep0.c +3 -0
+		}
+
+		transfer_size = roundup((req->request.length -

transfer_size),

drivers/usb/dwc3/ep0.c +3 -2
+					maxpacket);
 
 		dwc->ep0_bounced = true;
@@ -935,8 +970,8 @@ static void __dwc3_ep0_do_control_data(struct
 dwc3 *dwc,
 		 * TRBs to handle the transfer.
 		 */
 		ret = dwc3_ep0_start_trans(dwc, dep->number,
-				dwc->ep0_bounce_addr, transfer_size,
-				DWC3_TRBCTL_CONTROL_DATA);
+					   dwc->ep0_bounce_addr,
 transfer_size,
+					   DWC3_TRBCTL_CONTROL_DATA,
 0); } else {

ret = usb_gadget_map_request(&dwc->gadget,
&req->request, dep->number);

drivers/usb/dwc3/ep0.c +2 -1
@@ -946,7 +981,8 @@ static void __dwc3_ep0_do_control_data(struct
 dwc3 *dwc, }
 
 		ret = dwc3_ep0_start_trans(dwc, dep->number,
 req->request.dma,
-				req->request.length,
 DWC3_TRBCTL_CONTROL_DATA);
+					   req->request.length,
+					   DWC3_TRBCTL_CONTROL_DATA,
 0); }
drivers/usb/dwc3/ep0.c +1 -1
 	WARN_ON(ret < 0);
@@ -961,7 +997,7 @@ static int dwc3_ep0_start_control_status(struct
 dwc3_ep *dep) : DWC3_TRBCTL_CONTROL_STATUS2;
 
 	return dwc3_ep0_start_trans(dwc, dep->number,
-			dwc->ctrl_req_addr, 0, type);
+			dwc->ctrl_req_addr, 0, type, 0);
 }
 
 static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct

dwc3_ep *dep) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index b68b6a4..01bc83b 100644

drivers/usb/dwc3/gadget.c int dwc3_gadget_init(struct dwc3 *dwc) · line 2586

Quoted 8 lines
drivers/usb/dwc3/gadget.c +1 -1
@@ -2580,7 +2580,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
 		goto err0;
 	}
 
-	dwc->ep0_trb = dma_alloc_coherent(sizeof(*dwc->ep0_trb),
+	dwc->ep0_trb = dma_alloc_coherent(sizeof(*dwc->ep0_trb) * 2,
 					  (unsigned long
 *)&dwc->ep0_trb_addr); if (!dwc->ep0_trb) {
 		dev_err(dwc->dev, "failed to allocate ep0 trb\n");

Apart minor comment issue,

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#83 lore raw

PATCH 32/40 usb: dwc3: Add chained TRB support for ep0

Hi Lukasz,

Quoted 72 lines · Lukasz Majewski

Hi Kishon,

Quoted 70 lines

dwc3 can do only max packet aligned transfers. So in case request length is not max packet aligned and is bigger than DWC3_EP0_BOUNCE_SIZE two chained TRBs is required to handle the transfer.

---
  drivers/usb/dwc3/ep0.c    |   72

+++++++++++++++++++++++++++++++++------------
drivers/usb/dwc3/gadget.c | 2 +- 2 files changed, 55
insertions(+), 19 deletions(-)

drivers/usb/dwc3/ep0.c +1 -1
index fce2558..c2fe0ec 100644
@@ -48,7 +48,7 @@ static const char *dwc3_ep0_state_string(enum
 dwc3_ep0_state state) }
 
  static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum,
 dma_addr_t buf_dma,
-		u32 len, u32 type)
+				u32 len, u32 type, unsigned chain)
  {
  	struct dwc3_gadget_ep_cmd_params params;

struct dwc3_trb *trb;

drivers/usb/dwc3/ep0.c +14 -4
@@ -62,7 +62,10 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc,
 u8 epnum, dma_addr_t buf_dma, return 0;
  	}
 
-	trb = dwc->ep0_trb;
+	trb = &dwc->ep0_trb[dep->free_slot];
+
+	if (chain)
+		dep->free_slot++;
 
  	trb->bpl = lower_32_bits(buf_dma);
  	trb->bph = upper_32_bits(buf_dma);
@@ -70,13 +73,20 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc,
 u8 epnum, dma_addr_t buf_dma, trb->ctrl = type;
 
  	trb->ctrl |= (DWC3_TRB_CTRL_HWO
-			| DWC3_TRB_CTRL_LST
-			| DWC3_TRB_CTRL_IOC
  			| DWC3_TRB_CTRL_ISP_IMI);
 
+	if (chain)
+		trb->ctrl |= DWC3_TRB_CTRL_CHN;
+	else
+		trb->ctrl |= (DWC3_TRB_CTRL_IOC
+				| DWC3_TRB_CTRL_LST);
+
  	dwc3_flush_cache((int)buf_dma, len);
  	dwc3_flush_cache((int)trb, sizeof(*trb));
 
+	if (chain)
+		return 0;
+
  	memset(&params, 0, sizeof(params));
  	params.param0 = upper_32_bits(dwc->ep0_trb_addr);
  	params.param1 = lower_32_bits(dwc->ep0_trb_addr);
@@ -289,7 +299,7 @@ void dwc3_ep0_out_start(struct dwc3 *dwc)
  	int				ret;
 
  	ret = dwc3_ep0_start_trans(dwc, 0, dwc->ctrl_req_addr, 8,
-			DWC3_TRBCTL_CONTROL_SETUP);
+				   DWC3_TRBCTL_CONTROL_SETUP, 0);
  	WARN_ON(ret < 0);
  }
 
Quoted 8 lines
Quoted 6 lines
drivers/usb/dwc3/ep0.c +1 -0
@@ -799,6 +809,23 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc,
  	maxp = ep0->endpoint.maxpacket;
 
+	/* Handle the first TRB before handling the bounce buffer if

the request

Minor comment - please fix above comment.

Sorry. Didn't get what should I fix here?

Btw thanks for reviewing all the patches.

Cheers
Kishon

#84 lore raw

PATCH 32/40 usb: dwc3: Add chained TRB support for ep0

Hi Kishon,

Quoted 79 lines

Hi Lukasz,

Quoted 76 lines · Lukasz Majewski

Hi Kishon,

Quoted 74 lines

dwc3 can do only max packet aligned transfers. So in case request length is not max packet aligned and is bigger than DWC3_EP0_BOUNCE_SIZE two chained TRBs is required to handle the transfer.

---
  drivers/usb/dwc3/ep0.c    |   72

+++++++++++++++++++++++++++++++++------------
drivers/usb/dwc3/gadget.c | 2 +- 2 files changed, 55
insertions(+), 19 deletions(-)

drivers/usb/dwc3/ep0.c +1 -1
index fce2558..c2fe0ec 100644
@@ -48,7 +48,7 @@ static const char *dwc3_ep0_state_string(enum
 dwc3_ep0_state state) }
 
  static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum,
 dma_addr_t buf_dma,
-		u32 len, u32 type)
+				u32 len, u32 type, unsigned chain)
  {
  	struct dwc3_gadget_ep_cmd_params params;

struct dwc3_trb *trb;

drivers/usb/dwc3/ep0.c +14 -4
@@ -62,7 +62,10 @@ static int dwc3_ep0_start_trans(struct dwc3
 *dwc, u8 epnum, dma_addr_t buf_dma, return 0;
  	}
 
-	trb = dwc->ep0_trb;
+	trb = &dwc->ep0_trb[dep->free_slot];
+
+	if (chain)
+		dep->free_slot++;
 
  	trb->bpl = lower_32_bits(buf_dma);
  	trb->bph = upper_32_bits(buf_dma);
@@ -70,13 +73,20 @@ static int dwc3_ep0_start_trans(struct dwc3
 *dwc, u8 epnum, dma_addr_t buf_dma, trb->ctrl = type;
 
  	trb->ctrl |= (DWC3_TRB_CTRL_HWO
-			| DWC3_TRB_CTRL_LST
-			| DWC3_TRB_CTRL_IOC
  			| DWC3_TRB_CTRL_ISP_IMI);
 
+	if (chain)
+		trb->ctrl |= DWC3_TRB_CTRL_CHN;
+	else
+		trb->ctrl |= (DWC3_TRB_CTRL_IOC
+				| DWC3_TRB_CTRL_LST);
+
  	dwc3_flush_cache((int)buf_dma, len);
  	dwc3_flush_cache((int)trb, sizeof(*trb));
 
+	if (chain)
+		return 0;
+
  	memset(&params, 0, sizeof(params));
  	params.param0 = upper_32_bits(dwc->ep0_trb_addr);
  	params.param1 = lower_32_bits(dwc->ep0_trb_addr);
@@ -289,7 +299,7 @@ void dwc3_ep0_out_start(struct dwc3 *dwc)
  	int				ret;
 
  	ret = dwc3_ep0_start_trans(dwc, 0, dwc->ctrl_req_addr, 8,
-			DWC3_TRBCTL_CONTROL_SETUP);
+				   DWC3_TRBCTL_CONTROL_SETUP, 0);
  	WARN_ON(ret < 0);
  }
 
@@ -799,6 +809,23 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc,
  	maxp = ep0->endpoint.maxpacket;
 
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
drivers/usb/dwc3/ep0.c +1 -0
+	/* Handle the first TRB before handling the bounce buffer

if the request

Minor comment - please fix above comment.

Sorry. Didn't get what should I fix here?

	The comment should be as follow:

	/*
	 * Handle the first .....
	 *
	 *
	 */

The first line is wrong (/* Handle ...).

Quoted 5 lines

Btw thanks for reviewing all the patches.

Cheers
Kishon

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#85 lore raw

PATCH 32/40 usb: dwc3: Add chained TRB support for ep0

Hi,

Quoted 96 lines · Lukasz Majewski

Hi Kishon,

Quoted 79 lines

Hi Lukasz,

Quoted 76 lines · Lukasz Majewski

Hi Kishon,

Quoted 74 lines

dwc3 can do only max packet aligned transfers. So in case request length is not max packet aligned and is bigger than DWC3_EP0_BOUNCE_SIZE two chained TRBs is required to handle the transfer.

---
   drivers/usb/dwc3/ep0.c    |   72

+++++++++++++++++++++++++++++++++------------
drivers/usb/dwc3/gadget.c | 2 +- 2 files changed, 55
insertions(+), 19 deletions(-)

drivers/usb/dwc3/ep0.c +1 -1
index fce2558..c2fe0ec 100644
@@ -48,7 +48,7 @@ static const char *dwc3_ep0_state_string(enum
 dwc3_ep0_state state) }
 
   static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum,
 dma_addr_t buf_dma,
-		u32 len, u32 type)
+				u32 len, u32 type, unsigned chain)
   {
   	struct dwc3_gadget_ep_cmd_params params;
   	struct dwc3_trb			*trb;
drivers/usb/dwc3/ep0.c +14 -4
@@ -62,7 +62,10 @@ static int dwc3_ep0_start_trans(struct dwc3
 *dwc, u8 epnum, dma_addr_t buf_dma, return 0;
   	}
 
-	trb = dwc->ep0_trb;
+	trb = &dwc->ep0_trb[dep->free_slot];
+
+	if (chain)
+		dep->free_slot++;
 
   	trb->bpl = lower_32_bits(buf_dma);
   	trb->bph = upper_32_bits(buf_dma);
@@ -70,13 +73,20 @@ static int dwc3_ep0_start_trans(struct dwc3
 *dwc, u8 epnum, dma_addr_t buf_dma, trb->ctrl = type;
 
   	trb->ctrl |= (DWC3_TRB_CTRL_HWO
-			| DWC3_TRB_CTRL_LST
-			| DWC3_TRB_CTRL_IOC
   			| DWC3_TRB_CTRL_ISP_IMI);
 
+	if (chain)
+		trb->ctrl |= DWC3_TRB_CTRL_CHN;
+	else
+		trb->ctrl |= (DWC3_TRB_CTRL_IOC
+				| DWC3_TRB_CTRL_LST);
+
   	dwc3_flush_cache((int)buf_dma, len);
   	dwc3_flush_cache((int)trb, sizeof(*trb));
 
+	if (chain)
+		return 0;
+
   	memset(&params, 0, sizeof(params));
   	params.param0 = upper_32_bits(dwc->ep0_trb_addr);
   	params.param1 = lower_32_bits(dwc->ep0_trb_addr);
@@ -289,7 +299,7 @@ void dwc3_ep0_out_start(struct dwc3 *dwc)
   	int				ret;
 
   	ret = dwc3_ep0_start_trans(dwc, 0, dwc->ctrl_req_addr, 8,
-			DWC3_TRBCTL_CONTROL_SETUP);
+				   DWC3_TRBCTL_CONTROL_SETUP, 0);
   	WARN_ON(ret < 0);
   }
 
@@ -799,6 +809,23 @@ static void dwc3_ep0_complete_data(struct dwc3
 *dwc,
   	maxp = ep0->endpoint.maxpacket;
 
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
drivers/usb/dwc3/ep0.c +1 -0
+	/* Handle the first TRB before handling the bounce buffer

if the request

Minor comment - please fix above comment.

Sorry. Didn't get what should I fix here?

	The comment should be as follow:

	/*
	 * Handle the first .....
	 *
	 *
	 */
Quoted 1 line

The first line is wrong (/* Handle ...).

ah.. alright.

Thanks
Kishon

#86 lore raw

PATCH 33/40 usb: dwc3: Makefile: Make dwc3 driver compile in u-boot

In reply to Kishon Vijay Abraham I

Now that the entire dwc3 driver is adapted to compile with uboot build, modify the Makefiles so that the dwc3 driver can be built.

---
 Makefile                        |    2 ++
 drivers/usb/dwc3/Makefile       |   35 +++--------------------------------
 drivers/usb/gadget/udc/Makefile |    2 +-
 3 files changed, 6 insertions(+), 33 deletions(-)
Makefile +2 -0
index 1eb6821..ca0fd76 100644
@@ -632,8 +632,10 @@ libs-y += drivers/spi/
 libs-$(CONFIG_FMAN_ENET) += drivers/net/fm/
 libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/
 libs-y += drivers/serial/
+libs-y += drivers/usb/dwc3/
 libs-y += drivers/usb/eth/
 libs-y += drivers/usb/gadget/
+libs-y += drivers/usb/gadget/udc/
 libs-y += drivers/usb/host/
 libs-y += drivers/usb/musb/
 libs-y += drivers/usb/musb-new/
drivers/usb/dwc3/Makefile +3 -32
index afaa767..e455a52 100644
@@ -1,37 +1,8 @@
-ccflags-$(CONFIG_USB_DWC3_DEBUG)	:= -DDEBUG
-ccflags-$(CONFIG_USB_DWC3_VERBOSE)	+= -DVERBOSE_DEBUG
-
 obj-$(CONFIG_USB_DWC3)			+= dwc3.o
 
-dwc3-y					:= core.o debug.o
-
-ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
-	dwc3-y				+= host.o
-endif
-
-ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
-	dwc3-y				+= gadget.o ep0.o
-endif
-
-ifneq ($(CONFIG_DEBUG_FS),)
-	dwc3-y				+= debugfs.o
-endif
+dwc3-y					:= core.o
 
-##
-# Platform-specific glue layers go here
-#
-# NOTICE: Make sure your glue layer doesn't depend on anything
-# which is arch-specific and that it compiles on all situations.
-#
-# We want to keep this requirement in order to be able to compile
-# the entire driver (with all its glue layers) on several architectures
-# and make sure it compiles fine. This will also help with allmodconfig
-# and allyesconfig builds.
-##
+dwc3-y					+= gadget.o ep0.o
 
 obj-$(CONFIG_USB_DWC3_OMAP)		+= dwc3-omap.o
-obj-$(CONFIG_USB_DWC3_EXYNOS)		+= dwc3-exynos.o
-obj-$(CONFIG_USB_DWC3_PCI)		+= dwc3-pci.o
-obj-$(CONFIG_USB_DWC3_KEYSTONE)		+= dwc3-keystone.o
-obj-$(CONFIG_USB_DWC3_QCOM)		+= dwc3-qcom.o
-obj-$(CONFIG_USB_DWC3_ST)		+= dwc3-st.o
+obj-$(CONFIG_USB_DWC3_PHY_OMAP)		+= ti_usb_phy.o
drivers/usb/gadget/udc/Makefile +1 -1
index be265aa..12380f4 100644
@@ -1,4 +1,4 @@
 #
 # USB peripheral controller drivers
 #
-obj-$(CONFIG_USB_GADGET)	+= udc-core.o
+obj-$(CONFIG_USB_DWC3_GADGET)	+= udc-core.o
Signature · 1 line
1.7.9.5
#87 lore raw

PATCH 33/40 usb: dwc3: Makefile: Make dwc3 driver compile in u-boot

Hi Kishon,

Quoted 77 lines

Now that the entire dwc3 driver is adapted to compile with uboot build, modify the Makefiles so that the dwc3 driver can be built.

---
 Makefile                        |    2 ++
 drivers/usb/dwc3/Makefile       |   35

+++-------------------------------- drivers/usb/gadget/udc/Makefile
| 2 +- 3 files changed, 6 insertions(+), 33 deletions(-)

Makefile +2 -0
index 1eb6821..ca0fd76 100644
@@ -632,8 +632,10 @@ libs-y += drivers/spi/
 libs-$(CONFIG_FMAN_ENET) += drivers/net/fm/
 libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/
 libs-y += drivers/serial/
+libs-y += drivers/usb/dwc3/
 libs-y += drivers/usb/eth/
 libs-y += drivers/usb/gadget/
+libs-y += drivers/usb/gadget/udc/
 libs-y += drivers/usb/host/
 libs-y += drivers/usb/musb/
 libs-y += drivers/usb/musb-new/
drivers/usb/dwc3/Makefile +1 -24
index afaa767..e455a52 100644
@@ -1,37 +1,8 @@
-ccflags-$(CONFIG_USB_DWC3_DEBUG)	:= -DDEBUG
-ccflags-$(CONFIG_USB_DWC3_VERBOSE)	+= -DVERBOSE_DEBUG
-
 obj-$(CONFIG_USB_DWC3)			+= dwc3.o
 
-dwc3-y					:= core.o debug.o
-
-ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST)
 $(CONFIG_USB_DWC3_DUAL_ROLE)),)
-	dwc3-y				+= host.o
-endif
-
-ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET)
 $(CONFIG_USB_DWC3_DUAL_ROLE)),)
-	dwc3-y				+= gadget.o ep0.o
-endif
-
-ifneq ($(CONFIG_DEBUG_FS),)
-	dwc3-y				+= debugfs.o
-endif
+dwc3-y					:= core.o
 
-##
-# Platform-specific glue layers go here
-#
-# NOTICE: Make sure your glue layer doesn't depend on anything
-# which is arch-specific and that it compiles on all situations.
-#
-# We want to keep this requirement in order to be able to compile
-# the entire driver (with all its glue layers) on several

architectures -# and make sure it compiles fine. This will also help with allmodconfig -# and allyesconfig builds.

drivers/usb/dwc3/Makefile +2 -6
-##
+dwc3-y					+= gadget.o ep0.o
 
 obj-$(CONFIG_USB_DWC3_OMAP)		+= dwc3-omap.o
-obj-$(CONFIG_USB_DWC3_EXYNOS)		+= dwc3-exynos.o
-obj-$(CONFIG_USB_DWC3_PCI)		+= dwc3-pci.o
-obj-$(CONFIG_USB_DWC3_KEYSTONE)		+= dwc3-keystone.o
-obj-$(CONFIG_USB_DWC3_QCOM)		+= dwc3-qcom.o
-obj-$(CONFIG_USB_DWC3_ST)		+= dwc3-st.o
+obj-$(CONFIG_USB_DWC3_PHY_OMAP)		+= ti_usb_phy.o
(quoted diff) +0 -0

b/drivers/usb/gadget/udc/Makefile index be265aa..12380f4 100644

drivers/usb/gadget/udc/Makefile line 4

Quoted 5 lines
drivers/usb/gadget/udc/Makefile +1 -1
@@ -1,4 +1,4 @@
 #
 # USB peripheral controller drivers
 #
-obj-$(CONFIG_USB_GADGET)	+= udc-core.o
+obj-$(CONFIG_USB_DWC3_GADGET)	+= udc-core.o
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#88 lore raw

PATCH 34/40 usb: gadget: defer setting maxpacket till ->setup()

In reply to Kishon Vijay Abraham I

Taken from linux kernel with commit
commit 765f5b830e547229bb752e7b232ee83e2b3d49d5

Author: Sebastian Andrzej Siewior <[email protected]>
Date:   Thu Jun 23 14:26:11 2011 +0200

usb: gadget: defer setting maxpacket till ->setup()

---
 drivers/usb/gadget/composite.c |    4 +++-
 drivers/usb/gadget/ether.c     |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/usb/gadget/composite.c +3 -1
index a4c5606..5cedc9e 100644
@@ -283,7 +283,7 @@ static void device_qual(struct usb_composite_dev *cdev)
 	qual->bDeviceSubClass = cdev->desc.bDeviceSubClass;
 	qual->bDeviceProtocol = cdev->desc.bDeviceProtocol;
 	/* ASSUME same EP0 fifo size at both speeds */
-	qual->bMaxPacketSize0 = cdev->desc.bMaxPacketSize0;
+	qual->bMaxPacketSize0 = cdev->gadget->ep0->maxpacket;
 	qual->bNumConfigurations = count_configs(cdev, USB_DT_DEVICE_QUALIFIER);
 	qual->bRESERVED = 0;
 }
@@ -736,6 +736,8 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 		case USB_DT_DEVICE:
 			cdev->desc.bNumConfigurations =
 				count_configs(cdev, USB_DT_DEVICE);
+			cdev->desc.bMaxPacketSize0 =
+				cdev->gadget->ep0->maxpacket;
 			value = min(w_length, (u16) sizeof cdev->desc);
 			memcpy(req->buf, &cdev->desc, value);
 			break;
drivers/usb/gadget/ether.c +1 -1
index ba442d5..8ccf9b0 100644
@@ -1249,6 +1249,7 @@ eth_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 		switch (wValue >> 8) {
 
 		case USB_DT_DEVICE:
+			device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
 			value = min(wLength, (u16) sizeof device_desc);
 			memcpy(req->buf, &device_desc, value);
 			break;
@@ -2133,7 +2134,6 @@ autoconf_fail:
 		hs_subset_descriptors();
 	}
 
-	device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
 	usb_gadget_set_selfpowered(gadget);
 
 	/* For now RNDIS is always a second config */
Signature · 1 line
1.7.9.5
#89 lore raw

PATCH 34/40 usb: gadget: defer setting maxpacket till ->setup()

Hi Kishon,

Quoted 48 lines

Taken from linux kernel with commit
commit 765f5b830e547229bb752e7b232ee83e2b3d49d5

Author: Sebastian Andrzej Siewior <[email protected]>
Date:   Thu Jun 23 14:26:11 2011 +0200

usb: gadget: defer setting maxpacket till ->setup()

---
 drivers/usb/gadget/composite.c |    4 +++-
 drivers/usb/gadget/ether.c     |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/usb/gadget/composite.c index a4c5606..5cedc9e 100644

drivers/usb/gadget/composite.c +1 -1
@@ -283,7 +283,7 @@ static void device_qual(struct usb_composite_dev
 *cdev) qual->bDeviceSubClass = cdev->desc.bDeviceSubClass;
 	qual->bDeviceProtocol = cdev->desc.bDeviceProtocol;
 	/* ASSUME same EP0 fifo size at both speeds */
-	qual->bMaxPacketSize0 = cdev->desc.bMaxPacketSize0;
+	qual->bMaxPacketSize0 = cdev->gadget->ep0->maxpacket;
 	qual->bNumConfigurations = count_configs(cdev,
 USB_DT_DEVICE_QUALIFIER); qual->bRESERVED = 0;
 }
@@ -736,6 +736,8 @@ composite_setup(struct usb_gadget *gadget, const

struct usb_ctrlrequest *ctrl) case USB_DT_DEVICE:

drivers/usb/gadget/composite.c +2 -0
 			cdev->desc.bNumConfigurations =
 				count_configs(cdev, USB_DT_DEVICE);
+			cdev->desc.bMaxPacketSize0 =
+				cdev->gadget->ep0->maxpacket;
 			value = min(w_length, (u16) sizeof

cdev->desc); memcpy(req->buf, &cdev->desc, value);

drivers/usb/gadget/composite.c +0 -0
 			break;
drivers/usb/gadget/ether.c +1 -0
index ba442d5..8ccf9b0 100644
@@ -1249,6 +1249,7 @@ eth_setup(struct usb_gadget *gadget, const
 struct usb_ctrlrequest *ctrl) switch (wValue >> 8) {
 
 		case USB_DT_DEVICE:
+			device_desc.bMaxPacketSize0 =

gadget->ep0->maxpacket; value = min(wLength, (u16) sizeof device_desc); memcpy(req->buf, &device_desc, value);

drivers/usb/gadget/ether.c +0 -0
 			break;

drivers/usb/gadget/ether.c autoconf_fail: · line 2139

Quoted 7 lines
drivers/usb/gadget/ether.c +0 -1
@@ -2133,7 +2134,6 @@ autoconf_fail:
 		hs_subset_descriptors();
 	}
 
-	device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
 	usb_gadget_set_selfpowered(gadget);
 
 	/* For now RNDIS is always a second config */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#90 lore raw

PATCH 35/40 common: cmd_dfu: invoke board_usb_cleanup() for cleaning up

In reply to Kishon Vijay Abraham I

Invoked board_usb_cleanup for cleaning up initialized USB. It will be invoked if the user enterts ctrl-C.

---
 common/cmd_dfu.c |    1 +
 common/usb.c     |    7 +++++++
 2 files changed, 8 insertions(+)
common/cmd_dfu.c +1 -0
index e975abe..161d38b 100644
@@ -68,6 +68,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	}
 exit:
 	g_dnl_unregister();
+	board_usb_cleanup(controller_index, USB_INIT_DEVICE);
 done:
 	dfu_free_entities();
 
common/usb.c +7 -0
index 736cd9f..c7cc1b1 100644
@@ -1063,4 +1063,11 @@ int board_usb_init(int index, enum usb_init_type init)
 {
 	return 0;
 }
+
+
+__weak
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+	return 0;
+}
 /* EOF */
Signature · 1 line
1.7.9.5
#91 lore raw

PATCH 35/40 common: cmd_dfu: invoke board_usb_cleanup() for cleaning up

Hi Kishon,

Quoted 26 lines

Invoked board_usb_cleanup for cleaning up initialized USB. It will be invoked if the user enterts ctrl-C.

---
 common/cmd_dfu.c |    1 +
 common/usb.c     |    7 +++++++
 2 files changed, 8 insertions(+)
common/cmd_dfu.c +1 -0
index e975abe..161d38b 100644
@@ -68,6 +68,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int
 argc, char * const argv[]) }
 exit:
 	g_dnl_unregister();
+	board_usb_cleanup(controller_index, USB_INIT_DEVICE);
 done:
 	dfu_free_entities();
 
common/usb.c +0 -0
index 736cd9f..c7cc1b1 100644

common/usb.c int board_usb_init(int index, enum · line 1067

Quoted 5 lines
common/usb.c +2 -0
@@ -1063,4 +1063,11 @@ int board_usb_init(int index, enum
 usb_init_type init) {
 	return 0;
 }
+
+

Extra blank line is not needed here.

common/usb.c int board_usb_init(int index, enum usb_init_type init) · line 1073

Quoted 6 lines
common/usb.c +5 -0
+__weak
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+	return 0;
+}
 /* EOF */
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#92 lore raw

PATCH 36/40 board: ti: DRA7: added USB initializtion code

In reply to Kishon Vijay Abraham I

Implemented board_usb_init(), board_usb_cleanup() and usb_gadget_handle_interrupts() in dra7xx board file that can be invoked by various gadget drivers.

---
 arch/arm/include/asm/arch-omap5/omap.h |   12 ++++
 board/ti/dra7xx/evm.c                  |  109 ++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)
arch/arm/include/asm/arch-omap5/omap.h +12 -0
index e218159..e844bfb 100644
@@ -33,6 +33,18 @@
 #define CONTROL_ID_CODE		CONTROL_CORE_ID_CODE
 #endif
 
+#ifdef CONFIG_DRA7XX
+#define DRA7_USB_OTG_SS1_BASE		0x48890000
+#define DRA7_USB_OTG_SS1_GLUE_BASE	0x48880000
+#define DRA7_USB3_PHY1_PLL_CTRL		0x4A084C00
+#define DRA7_USB3_PHY1_POWER		0x4A002370
+#define DRA7_USB2_PHY1_POWER		0x4A002300
+
+#define DRA7_USB_OTG_SS2_BASE		0x488D0000
+#define DRA7_USB_OTG_SS2_GLUE_BASE	0x488C0000
+#define DRA7_USB2_PHY2_POWER		0x4A002E74
+#endif
+
 /* To be verified */
 #define OMAP5430_CONTROL_ID_CODE_ES1_0		0x0B94202F
 #define OMAP5430_CONTROL_ID_CODE_ES2_0          0x1B94202F
board/ti/dra7xx/evm.c +109 -0

126 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#93 lore raw

PATCH 36/40 board: ti: DRA7: added USB initializtion code

Hi Kishon,

Quoted 159 lines

Implemented board_usb_init(), board_usb_cleanup() and usb_gadget_handle_interrupts() in dra7xx board file that can be invoked by various gadget drivers.

---
 arch/arm/include/asm/arch-omap5/omap.h |   12 ++++
 board/ti/dra7xx/evm.c                  |  109

++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+)

(quoted diff) +0 -0

b/arch/arm/include/asm/arch-omap5/omap.h index e218159..e844bfb 100644

arch/arm/include/asm/arch-omap5/omap.h +12 -0
@@ -33,6 +33,18 @@
 #define CONTROL_ID_CODE		CONTROL_CORE_ID_CODE
 #endif
 
+#ifdef CONFIG_DRA7XX
+#define DRA7_USB_OTG_SS1_BASE		0x48890000
+#define DRA7_USB_OTG_SS1_GLUE_BASE	0x48880000
+#define DRA7_USB3_PHY1_PLL_CTRL		0x4A084C00
+#define DRA7_USB3_PHY1_POWER		0x4A002370
+#define DRA7_USB2_PHY1_POWER		0x4A002300
+
+#define DRA7_USB_OTG_SS2_BASE		0x488D0000
+#define DRA7_USB_OTG_SS2_GLUE_BASE	0x488C0000
+#define DRA7_USB2_PHY2_POWER		0x4A002E74
+#endif
+
 /* To be verified */
 #define OMAP5430_CONTROL_ID_CODE_ES1_0		0x0B94202F
 #define OMAP5430_CONTROL_ID_CODE_ES2_0          0x1B94202F
board/ti/dra7xx/evm.c +69 -0
index 6522241..284775c 100644
@@ -14,11 +14,16 @@
 #include <palmas.h>
 #include <sata.h>
 #include <asm/gpio.h>
+#include <usb.h>
+#include <linux/usb/gadget.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sata.h>
 #include <environment.h>
+#include <dwc3-uboot.h>
+#include <dwc3-omap-uboot.h>
+#include <ti-usb-phy-uboot.h>
 
 #include "mux_data.h"
 
@@ -123,6 +128,110 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
+#ifdef CONFIG_USB_DWC3
+static struct dwc3_device usb_otg_ss1 = {
+	.maximum_speed = USB_SPEED_SUPER,
+	.base = DRA7_USB_OTG_SS1_BASE,
+	.tx_fifo_resize = false,
+	.index = 0,
+};
+
+static struct dwc3_omap_device usb_otg_ss1_glue = {
+	.base = (void *)DRA7_USB_OTG_SS1_GLUE_BASE,
+	.utmi_mode = DWC3_OMAP_UTMI_MODE_SW,
+	.vbus_id_status = OMAP_DWC3_VBUS_VALID,
+	.index = 0,
+};
+
+static struct ti_usb_phy_device usb_phy1_device = {
+	.pll_ctrl_base = (void *)DRA7_USB3_PHY1_PLL_CTRL,
+	.usb2_phy_power = (void *)DRA7_USB2_PHY1_POWER,
+	.usb3_phy_power = (void *)DRA7_USB3_PHY1_POWER,
+	.index = 0,
+};
+
+static struct dwc3_device usb_otg_ss2 = {
+	.maximum_speed = USB_SPEED_SUPER,
+	.base = DRA7_USB_OTG_SS2_BASE,
+	.tx_fifo_resize = false,
+	.index = 1,
+};
+
+static struct dwc3_omap_device usb_otg_ss2_glue = {
+	.base = (void *)DRA7_USB_OTG_SS2_GLUE_BASE,
+	.utmi_mode = DWC3_OMAP_UTMI_MODE_SW,
+	.vbus_id_status = OMAP_DWC3_VBUS_VALID,
+	.index = 1,
+};
+
+static struct ti_usb_phy_device usb_phy2_device = {
+	.usb2_phy_power = (void *)DRA7_USB2_PHY2_POWER,
+	.index = 1,
+};
+
+int board_usb_init(int index, enum usb_init_type init)
+{
+	switch (index) {
+	case 0:
+		if (init == USB_INIT_DEVICE) {
+			usb_otg_ss1.dr_mode = USB_DR_MODE_PERIPHERAL;
+			usb_otg_ss1_glue.vbus_id_status =
 OMAP_DWC3_VBUS_VALID;
+		} else {
+			usb_otg_ss1.dr_mode = USB_DR_MODE_HOST;
+			usb_otg_ss1_glue.vbus_id_status =
 OMAP_DWC3_ID_GROUND;
+		}
+
+		ti_usb_phy_uboot_init(&usb_phy1_device);
+		dwc3_omap_uboot_init(&usb_otg_ss1_glue);
+		dwc3_uboot_init(&usb_otg_ss1);
+		break;
+	case 1:
+		if (init == USB_INIT_DEVICE) {
+			usb_otg_ss2.dr_mode = USB_DR_MODE_PERIPHERAL;
+			usb_otg_ss2_glue.vbus_id_status =
 OMAP_DWC3_VBUS_VALID;
+		} else {
+			usb_otg_ss2.dr_mode = USB_DR_MODE_HOST;
+			usb_otg_ss2_glue.vbus_id_status =

OMAP_DWC3_ID_GROUND;

board/ti/dra7xx/evm.c +33 -0
+		}
+
+		ti_usb_phy_uboot_init(&usb_phy2_device);
+		dwc3_omap_uboot_init(&usb_otg_ss2_glue);
+		dwc3_uboot_init(&usb_otg_ss2);
+		break;
+	default:
+		printf("Invalid Controller Index\n");
+	}
+
+	return 0;
+}
+
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+	switch (index) {
+	case 0:
+	case 1:
+		ti_usb_phy_uboot_exit(index);
+		dwc3_uboot_exit(index);
+		dwc3_omap_uboot_exit(index);
+		break;
+	default:
+		printf("Invalid Controller Index\n");
+	}
+	return 0;
+}
+
+int usb_gadget_handle_interrupts(void)
+{
+	u32 status;
+
+	status = dwc3_omap_uboot_interrupt_status(0);

board/ti/dra7xx/evm.c int board_mmc_init(bd_t *bis) · line 237

Quoted 10 lines
board/ti/dra7xx/evm.c +7 -0
+	if (status)
+		dwc3_uboot_handle_interrupt(0);
+
+	return 0;
+}
+#endif
+
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_OS_BOOT)
 int spl_start_uboot(void)
 {
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group