Currently the DWC3 driver supports only single port controller which requires at most two PHYs ie HS and SS PHYs. There are SoCs that has DWC3 controller with multiple ports that can operate in host mode. Some of the port supports both SS+HS and other port supports only HS mode. This change primarily refactors the Phy logic in core driver to allow multiport support with Generic Phy's. Changes have been tested on QCOM SoC SA8295P which has 4 ports (2 are HS+SS capable and 2 are HS only capable). Changes in v10: Refactored phy init/exit/power-on/off functions in dwc3 core Refactored dwc3-qcom irq registration and handling Implemented wakeup for multiport irq's Moved few macros from xhci.h to xhci-ext-caps.h Fixed nits pointed out in v9 Fixed Co-developed by and SOB tags in patches 5 and 11 Changes in v9: Added IRQ support for DP/DM/SS MP Irq's of SC8280 Refactored code to read port count by accessing xhci registers Changes in v8: Reorganised code in patch-5 Fixed nitpicks in code according to comments received on v7 Fixed indentation in DT patches Added drive strength for pinctrl nodes in SA8295 DT Changes in v7: Added power event irq's for Multiport controller. Udpated commit text for patch-9 (adding DT changes for enabling first port of multiport controller on sa8540-ride). Fixed check-patch warnings for driver code. Fixed DT binding errors for changes in snps,dwc3.yaml Reabsed code on top of usb-next Changes in v6: Updated comments in code after. Updated variables names appropriately as per review comments. Updated commit text in patch-2 and added additional info as per review comments. The patch header in v5 doesn't have "PATHCH v5" notation present. Corrected it in this version. Changes in v5: Added DT support for first port of Teritiary USB controller on SA8540-Ride Added support for reading port info from XHCI Extended Params registers. Changes in RFC v4: Added DT support for SA8295p. Changes in RFC v3: Incase any PHY init fails, then clear/exit the PHYs that are already initialized. Changes in RFC v2: Changed dwc3_count_phys to return the number of PHY Phandles in the node. This will be used now in dwc3_extract_num_phys to increment num_usb2_phy and num_usb3_phy. Added new parameter "ss_idx" in dwc3_core_get_phy_ny_node and changed its structure such that the first half is for HS-PHY and second half is for SS-PHY. In dwc3_core_get_phy, for multiport controller, only if SS-PHY phandle is present, pass proper SS_IDX else pass -1. Tests done on v10: Enumeration: / # lsusb Bus 003 Device 001: ID 1d6b:0002 Bus 001 Device 001: ID 1d6b:0002 Bus 001 Device 002: ID 045e:0040 Bus 004 Device 001: ID 1d6b:0003 Bus 002 Device 001: ID 1d6b:0003 Bus 001 Device 003: ID 17ef:60d1 Interrupt registration: / # cat /proc/interrupts | grep dwc 184: 0 0 0 0 0 0 0 0 PDC 127 Level qcom_dwc3 DP_HS1 185: 0 0 0 0 0 0 0 0 PDC 126 Level qcom_dwc3 DM_HS1 186: 0 0 0 0 0 0 0 0 PDC 16 Level qcom_dwc3 SS1 187: 0 0 0 0 0 0 0 0 PDC 129 Level qcom_dwc3 DP_HS2 188: 0 0 0 0 0 0 0 0 PDC 128 Level qcom_dwc3 DM_HS2 189: 0 0 0 0 0 0 0 0 PDC 17 Level qcom_dwc3 SS2 190: 0 0 0 0 0 0 0 0 PDC 131 Level qcom_dwc3 DP_HS3 191: 0 0 0 0 0 0 0 0 PDC 130 Level qcom_dwc3 DM_HS3 192: 0 0 0 0 0 0 0 0 PDC 133 Level qcom_dwc3 DP_HS4 193: 0 0 0 0 0 0 0 0 PDC 132 Level qcom_dwc3 DM_HS4 195: 0 0 0 0 0 0 0 0 PDC 14 Level qcom_dwc3 DP_HS 196: 0 0 0 0 0 0 0 0 PDC 15 Level qcom_dwc3 DM_HS 197: 0 0 0 0 0 0 0 0 PDC 138 Level qcom_dwc3 SS 198: 32 0 0 0 0 0 0 0 GICv3 835 Leel dwc3 199: 0 0 0 0 0 0 0 0 PDC 12 Level qcom_dwc3 DP_HS 200: 0 0 0 0 0 0 0 0 PDC 13 Level qcom_dwc3 DM_HS 201: 0 0 0 0 0 0 0 0 PDC 136 Level qcom_dwc3 SS Interrupt connfiguration during suspend entry and suspend exit upon device connect. Speed here in the following log indicates enum usb_device_speed in dwc3-qcom. [ 151.625326] K: dwc3_qcom_enable_interrupts index: 0 speed: 0 [ 151.680985] K: dwc3_qcom_enable_interrupts index: 0 speed: 2 [ 151.686841] K: dwc3_qcom_enable_interrupts index: 1 speed: 2 [ 151.692665] K: dwc3_qcom_enable_interrupts index: 2 speed: 0 [ 151.692678] K: dwc3_qcom_enable_interrupts index: 3 speed: 0 [ 151.724912] K: dwc3_qcom_disable_interrupts index: 0 speed: 2 [ 151.730832] K: dwc3_qcom_disable_interrupts index: 1 speed: 2 [ 151.736740] K: dwc3_qcom_disable_interrupts index: 2 speed: 0 [ 151.742646] K: dwc3_qcom_disable_interrupts index: 3 speed: 0 [ 152.010699] K: dwc3_qcom_disable_interrupts index: 0 speed: 0 [ 152.107836] OOM killer enabled. [ 152.111070] Restarting tasks ... done. [ 152.115742] random: crng reseeded on system resumption [ 152.121298] PM: suspend exit / # [ 152.240015] usb 1-3: new low-speed USB device number 8 using xhci-hcd On SC7280 CRD Herobrine variant, enumeration and wakeup was tested and it works fine: Enumeration: localhost ~ # lsusb Bus 002 Device 004: ID 0bda:8153 Realtek Semiconductor Corp. USB 10/100/1000 LAN Bus 002 Device 003: ID 05e3:0626 Genesys Logic, Inc. USB3.1 Hub Bus 002 Device 002: ID 0bda:0411 Realtek Semiconductor Corp. 4-Port USB 3.1 Hub Bus 002 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 001 Device 024: ID 046d:c06a Logitech, Inc. USB Optical Mouse Bus 001 Device 007: ID 05e3:0610 Genesys Logic, Inc. 4-port hub Bus 001 Device 002: ID 0bda:5411 Realtek Semiconductor Corp. 4-Port USB 2.1 Hub Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub localhost ~ # dmesg | grep hub [ 3.713331] hub 1-0:1.0: USB hub found [ 3.717222] hub 1-0:1.0: 1 port detected [ 3.764330] hub 2-0:1.0: USB hub found [ 3.768216] hub 2-0:1.0: 1 port detected [ 4.159720] hub 1-1:1.0: USB hub found [ 4.165010] hub 1-1:1.0: 4 ports detected [ 4.322363] hub 2-1:1.0: USB hub found [ 4.327220] hub 2-1:1.0: 4 ports detected [ 5.504227] hub 2-1.4:1.0: USB hub found [ 5.508724] hub 2-1.4:1.0: 4 ports detected [ 7.263756] hub 1-1.4:1.0: USB hub found [ 7.268273] hub 1-1.4:1.0: 4 ports detected [ 10.030906] hub 1-1.4:1.0: USB hub found [ 10.035352] hub 1-1.4:1.0: 4 ports detected Interrupt registration on SC7280-CRD: localhost ~ # cat /proc/interrupts | grep dwc 82: 0 0 0 0 0 0 0 0 GICv3 163 Level qcom_dwc3 HS 211: 0 0 0 0 0 0 0 0 PDC 14 Level qcom_dwc3 DP_HS 212: 0 0 0 0 0 0 0 0 PDC 15 Level qcom_dwc3 DM_HS 213: 0 0 0 0 0 0 0 0 PDC 17 Level qcom_dwc3 SS Wakeup from system suspend upon mouse click: [ 1159.589739] K: dwc3_qcom_enable_interrupts port: 0 speed: 3 [ 1160.025300] K: qcom_dwc3_resume_irq irq: 211 [ 1160.149660] K: dwc3_qcom_disable_interrupts port: 0 speed: 3 [ 1161.649610] Resume caused by IRQ 211, qcom_dwc3 DP_HS Also DT Binding checks were done on both modified yaml files. Links to previous versions: Link to v9: https://lore.kernel.org/all/20230621043628.21485-1-quic_kriskura@xxxxxxxxxxx/ Link to v8: https://lore.kernel.org/all/20230514054917.21318-1-quic_kriskura@xxxxxxxxxxx/ Link to v7: https://lore.kernel.org/all/20230501143445.3851-1-quic_kriskura@xxxxxxxxxxx/ Link to v6: https://lore.kernel.org/all/20230405125759.4201-1-quic_kriskura@xxxxxxxxxxx/ Link to v5: https://lore.kernel.org/all/20230310163420.7582-1-quic_kriskura@xxxxxxxxxxx/ Link to RFC v4: https://lore.kernel.org/all/20230115114146.12628-1-quic_kriskura@xxxxxxxxxxx/ Link to RFC v3: https://lore.kernel.org/all/1654709787-23686-1-git-send-email-quic_harshq@xxxxxxxxxxx/#r Link to RFC v2: https://lore.kernel.org/all/1653560029-6937-1-git-send-email-quic_harshq@xxxxxxxxxxx/#r Andrew Halaney (1): arm64: dts: qcom: sa8540-ride: Enable first port of tertiary usb controller Harsh Agarwal (1): usb: dwc3: core: Refactor PHY logic to support Multiport Controller Krishna Kurapati (9): dt-bindings: usb: qcom,dwc3: Add bindings for SC8280 Multiport dt-bindings: usb: Add bindings for multiport properties on DWC3 controller usb: dwc3: core: Access XHCI address space temporarily to read port info usb: dwc3: core: Skip setting event buffers for host only controllers usb: dwc3: qcom: Refactor IRQ handling in QCOM Glue driver usb: dwc3: qcom: Enable wakeup for applicable ports of multiport usb: dwc3: qcom: Add multiport suspend/resume support for wrapper arm64: dts: qcom: sc8280xp: Add multiport controller node for SC8280 arm64: dts: qcom: sa8295p: Enable tertiary controller and its 4 USB ports .../devicetree/bindings/usb/qcom,dwc3.yaml | 29 ++ .../devicetree/bindings/usb/snps,dwc3.yaml | 13 +- arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 53 +++ arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 22 ++ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 77 ++++ drivers/usb/dwc3/core.c | 326 ++++++++++++---- drivers/usb/dwc3/core.h | 16 +- drivers/usb/dwc3/drd.c | 15 +- drivers/usb/dwc3/dwc3-qcom.c | 358 ++++++++++++------ drivers/usb/host/xhci-ext-caps.h | 5 + drivers/usb/host/xhci.h | 3 - 11 files changed, 714 insertions(+), 203 deletions(-) -- 2.40.0
