Skip to contentSkip to conversation

usb: dwc3: add a SPL_USB_DWC3_GENERIC option for the dwc3 driver

PATCH Superseded Angus Ainslie 2 participants 10 messages May 30, 2022 – Jul 14, 2022

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover usb: dwc3: add a SPL_USB_DWC3_GENERIC option for the dwc3 driver

Changes since v2:

Add a second patch to deal with CI failures due to the new options.

Changes since v1:

Updated Kconfig depends

Angus Ainslie (2):
usb: dwc3: add a SPL_USB_DWC3_GENERIC option for the dwc3 driver
configs: get rid of build warnings due to SPL_USB_DWC3_GENERIC

 configs/am43xx_evm_defconfig              | 2 ++
 configs/am43xx_evm_usbhost_boot_defconfig | 2 ++
 configs/am43xx_hs_evm_defconfig           | 2 ++
 configs/am57xx_hs_evm_usb_defconfig       | 2 ++
 configs/am65x_evm_a53_defconfig           | 2 ++
 configs/am65x_evm_r5_usbdfu_defconfig     | 2 ++
 configs/dra7xx_evm_defconfig              | 2 ++
 configs/dra7xx_hs_evm_defconfig           | 2 ++
 configs/dra7xx_hs_evm_usb_defconfig       | 2 ++
 drivers/usb/dwc3/Kconfig                  | 7 +++++++
 drivers/usb/dwc3/Makefile                 | 2 +-
 11 files changed, 26 insertions(+), 1 deletion(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v3 1/2 usb: dwc3: add a SPL_USB_DWC3_GENERIC option for the dwc3 driver

Suppress warnings when building the SPL without USB_DWC3_GENERIC

---
 drivers/usb/dwc3/Kconfig  | 7 +++++++
 drivers/usb/dwc3/Makefile | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/usb/dwc3/Kconfig +7 -0
index 62aa65bf0c..f010291d02 100644
@@ -30,6 +30,13 @@ config USB_DWC3_GENERIC
 	  Select this for Xilinx ZynqMP and similar Platforms.
 	  This wrapper supports Host and Peripheral operation modes.
 
+config SPL_USB_DWC3_GENERIC
+	bool "Generic implementation of a DWC3 wrapper (aka dwc3 glue) for the SPL"
+	depends on SPL_DM_USB && USB_DWC3 && SPL_MISC
+	help
+	  Select this for Xilinx ZynqMP and similar Platforms.
+	  This wrapper supports Host and Peripheral operation modes.
+
 config USB_DWC3_MESON_G12A
 	bool "Amlogic Meson G12A USB wrapper"
 	depends on DM_USB && USB_DWC3 && ARCH_MESON
drivers/usb/dwc3/Makefile +1 -1
index 0dd1ba87cd..97b4f7191c 100644
@@ -9,7 +9,7 @@ obj-$(CONFIG_USB_DWC3_GADGET)		+= gadget.o ep0.o
 obj-$(CONFIG_USB_DWC3_OMAP)		+= dwc3-omap.o
 obj-$(CONFIG_USB_DWC3_MESON_G12A)	+= dwc3-meson-g12a.o
 obj-$(CONFIG_USB_DWC3_MESON_GXL)	+= dwc3-meson-gxl.o
-obj-$(CONFIG_USB_DWC3_GENERIC)		+= dwc3-generic.o
+obj-$(CONFIG_$(SPL_)USB_DWC3_GENERIC)		+= dwc3-generic.o
 obj-$(CONFIG_USB_DWC3_UNIPHIER)		+= dwc3-uniphier.o
 obj-$(CONFIG_USB_DWC3_LAYERSCAPE)	+= dwc3-layerscape.o
 obj-$(CONFIG_USB_DWC3_PHY_OMAP)		+= ti_usb_phy.o
Signature · 1 line
2.34.1
#2 lore raw

PATCH v3 2/2 configs: get rid of build warnings due to SPL_USB_DWC3_GENERIC

In reply to Angus Ainslie

Adding the SPL_USB_DWC3_GENERIC symbol broke some ti builds. This should fix the builds but untested on HW.

---
 configs/am43xx_evm_defconfig              | 2 ++
 configs/am43xx_evm_usbhost_boot_defconfig | 2 ++
 configs/am43xx_hs_evm_defconfig           | 2 ++
 configs/am57xx_hs_evm_usb_defconfig       | 2 ++
 configs/am65x_evm_a53_defconfig           | 2 ++
 configs/am65x_evm_r5_usbdfu_defconfig     | 2 ++
 configs/dra7xx_evm_defconfig              | 2 ++
 configs/dra7xx_hs_evm_defconfig           | 2 ++
 configs/dra7xx_hs_evm_usb_defconfig       | 2 ++
 9 files changed, 18 insertions(+)
configs/am43xx_evm_defconfig +2 -0
index 7a736b6fe1..13a305a53c 100644
@@ -59,6 +59,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_MISC=y
+CONFIG_SPL_MISC=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD=y
@@ -93,6 +94,7 @@ CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am43xx_evm_usbhost_boot_defconfig +2 -0
index e844106243..b1f17c6a9e 100644
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_AM43XX=y
 CONFIG_SPL=y
+CONFIG_SPL_MISC=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
@@ -94,6 +95,7 @@ CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am43xx_hs_evm_defconfig +2 -0
index d436b41a0c..206e5cf7bc 100644
@@ -15,6 +15,7 @@ CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL=y
+CONFIG_SPL_MISC=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
@@ -97,6 +98,7 @@ CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am57xx_hs_evm_usb_defconfig +2 -0
index 194103a7e6..9cfc31cb9f 100644
@@ -14,6 +14,7 @@ CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
 CONFIG_TARGET_AM57XX_EVM=y
 CONFIG_SPL=y
+CONFIG_SPL_MISC=y
 CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
@@ -114,6 +115,7 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/am65x_evm_a53_defconfig +2 -0
index 9f41b397c3..8cf24dd25f 100644
@@ -12,6 +12,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
+CONFIG_SPL_MISC=y
 CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
 CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_SPL_MMC=y
@@ -163,6 +164,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am65x_evm_r5_usbdfu_defconfig +2 -0
index 57cd0f35a5..0430a94a7c 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_K3=y
 CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_SYS_MALLOC_F_LEN=0x55000
 CONFIG_SPL_GPIO=y
+CONFIG_SPL_MISC=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
@@ -111,6 +112,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/dra7xx_evm_defconfig +2 -0
index e972d3b117..f118c172fe 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x40300000
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
+CONFIG_SPL_MISC=y
 CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
@@ -136,6 +137,7 @@ CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/dra7xx_hs_evm_defconfig +2 -0
index 1e872b5cb6..225942e397 100644
@@ -13,6 +13,7 @@ CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
+CONFIG_SPL_MISC=y
 CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
@@ -135,6 +136,7 @@ CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/dra7xx_hs_evm_usb_defconfig +2 -0
index 8c07da9872..d171b18d6d 100644
@@ -15,6 +15,7 @@ CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
+CONFIG_SPL_MISC=y
 CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
@@ -123,6 +124,7 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_SPL_USB_DWC3_GENERIC=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
Signature · 1 line
2.34.1
#3 lore raw
In reply to Angus Ainslie

Did this fix the CI issues now ?

Quoted 24 lines · Angus Ainslie

Changes since v2:

Add a second patch to deal with CI failures due to the new options.

Changes since v1:

Updated Kconfig depends

Angus Ainslie (2):
usb: dwc3: add a SPL_USB_DWC3_GENERIC option for the dwc3 driver
configs: get rid of build warnings due to SPL_USB_DWC3_GENERIC

 configs/am43xx_evm_defconfig              | 2 ++
 configs/am43xx_evm_usbhost_boot_defconfig | 2 ++
 configs/am43xx_hs_evm_defconfig           | 2 ++
 configs/am57xx_hs_evm_usb_defconfig       | 2 ++
 configs/am65x_evm_a53_defconfig           | 2 ++
 configs/am65x_evm_r5_usbdfu_defconfig     | 2 ++
 configs/dra7xx_evm_defconfig              | 2 ++
 configs/dra7xx_hs_evm_defconfig           | 2 ++
 configs/dra7xx_hs_evm_usb_defconfig       | 2 ++
 drivers/usb/dwc3/Kconfig                  | 7 +++++++
 drivers/usb/dwc3/Makefile                 | 2 +-
 11 files changed, 26 insertions(+), 1 deletion(-)
#4 lore raw
In reply to Angus Ainslie

Hi,

Are there any problems with these patches ?

Thanks
Angus

Quoted 24 lines · Angus Ainslie

Changes since v2:

Add a second patch to deal with CI failures due to the new options.

Changes since v1:

Updated Kconfig depends

Angus Ainslie (2):
usb: dwc3: add a SPL_USB_DWC3_GENERIC option for the dwc3 driver
configs: get rid of build warnings due to SPL_USB_DWC3_GENERIC

 configs/am43xx_evm_defconfig              | 2 ++
 configs/am43xx_evm_usbhost_boot_defconfig | 2 ++
 configs/am43xx_hs_evm_defconfig           | 2 ++
 configs/am57xx_hs_evm_usb_defconfig       | 2 ++
 configs/am65x_evm_a53_defconfig           | 2 ++
 configs/am65x_evm_r5_usbdfu_defconfig     | 2 ++
 configs/dra7xx_evm_defconfig              | 2 ++
 configs/dra7xx_hs_evm_defconfig           | 2 ++
 configs/dra7xx_hs_evm_usb_defconfig       | 2 ++
 drivers/usb/dwc3/Kconfig                  | 7 +++++++
 drivers/usb/dwc3/Makefile                 | 2 +-
 11 files changed, 26 insertions(+), 1 deletion(-)
#5 lore raw
Quoted 1 line · Angus Ainslie

Hi,

Hi,

Quoted 1 line

Are there any problems with these patches ?

I missed them, sigh ... sorry.

Can you rebase them on usb/master and resend, so I can pick them up?

#6 lore raw
Quoted 10 lines · Marek Vasut
Quoted 1 line · Angus Ainslie

Hi,

Hi,

Quoted 1 line

Are there any problems with these patches ?

I missed them, sigh ... sorry.

Can you rebase them on usb/master and resend, so I can pick them up?

Sure, could you remind me how to run the CI tests again.

#7 lore raw
Quoted 6 lines · Angus Ainslie
Quoted 5 lines · Marek Vasut
Quoted 1 line · Angus Ainslie

Hi,

Hi,

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Are there any problems with these patches ?

I missed them, sigh ... sorry.

Can you rebase them on usb/master and resend, so I can pick them up?

Sure, could you remind me how to run the CI tests again.

I don't think you can do that yourself unless you have a repo at source.denx.de/u-boot , but I might be wrong.

Really just run git rebase -i on git://source.denx.de/u-boot-usb.git / master and then git send-email --annontate , that's all.

#8 lore raw
Quoted 9 lines · Marek Vasut
Quoted 8 lines · Angus Ainslie
Quoted 7 lines · Marek Vasut
Quoted 1 line · Angus Ainslie

Hi,

Hi,

Quoted 1 line

Are there any problems with these patches ?

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines

I missed them, sigh ... sorry.

Can you rebase them on usb/master and resend, so I can pick them up?

Sure, could you remind me how to run the CI tests again.

I don't think you can do that yourself unless you have a repo at source.denx.de/u-boot , but I might be wrong.

Ah I found it in the gitlab ci script

./tools/buildman/buildman -o /tmp -P -E -W arm

Quoted 2 lines

Really just run git rebase -i on git://source.denx.de/u-boot-usb.git / master and then git send-email --annontate , that's all.

Ok I'll send ASAP

#9 lore raw
Quoted 22 lines · Angus Ainslie
Quoted 9 lines · Marek Vasut
Quoted 8 lines · Angus Ainslie
Quoted 7 lines · Marek Vasut
Quoted 1 line · Angus Ainslie

Hi,

Hi,

Quoted 1 line

Are there any problems with these patches ?

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines

I missed them, sigh ... sorry.

Can you rebase them on usb/master and resend, so I can pick them up?

Sure, could you remind me how to run the CI tests again.

I don't think you can do that yourself unless you have a repo at source.denx.de/u-boot , but I might be wrong.

Ah I found it in the gitlab ci script

Quoted 7 lines

./tools/buildman/buildman -o /tmp -P -E -W arm

Quoted 2 lines

Really just run git rebase -i on git://source.denx.de/u-boot-usb.git / master and then git send-email --annontate , that's all.

Ok I'll send ASAP

Thanks !