| Message ID | 20240420044901.884098-1-quic_kriskura@quicinc.com |
|---|---|
| Headers | show |
| Series | Add multiport support for DWC3 controllers | expand |
> > 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. > > The DWC3 controller supports up to 15 High-Speed phys and 4 SuperSpeed phys. > The multiport controller in Qualcomm SA8295P is paired with two High-Speed + > SuperSpeed and two High-Speed-only ports. It is assumed that the N > SuperSpeed PHYs are paired with the first N High-Speed PHYs. > Hi All, Thinh Can DW multiple port host patches be (patch 1-4) accepted first? Other multiport vendor will use this.
On Mon, Apr 22, 2024 at 01:21:07AM +0000, Minda Chen wrote: > Can DW multiple port host patches be (patch 1-4) accepted first? > Other multiport vendor will use this. The whole series is good to go and should be merged for 6.10 so there's no need to split things up. Johan
On Sat, Apr 20, 2024 at 10:18:52AM +0530, Krishna Kurapati wrote: > Krishna Kurapati (9): > 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: core: Refactor PHY logic to support Multiport Controller > dt-bindings: usb: qcom,dwc3: Add bindings for SC8280 Multiport > usb: dwc3: qcom: Add helper function to request wakeup interrupts > usb: dwc3: qcom: Refactor IRQ handling in glue driver > usb: dwc3: qcom: Enable wakeup for applicable ports of multiport > usb: dwc3: qcom: Add multiport suspend/resume support for wrapper Verified that the finger print reader on the Lenovo ThinkPad X13s works with this series (and not yet merged devicetree changes). Not sure when or why, but the error message I previously reported seeing during suspend is now also gone: dwc3-qcom a4f8800.usb: HS-PHY2 not in L2 Tested-by: Johan Hovold <johan+linaro@kernel.org> Thanks for sticking with it, Krishna. Johan
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. The DWC3 controller supports up to 15 High-Speed phys and 4 SuperSpeed phys. The multiport controller in Qualcomm SA8295P is paired with two High-Speed + SuperSpeed and two High-Speed-only ports. It is assumed that the N SuperSpeed PHYs are paired with the first N High-Speed PHYs. Changes in v21: Updated core driver bindings to support up to 19 max items. Updated commit text in patches 2/5/6. Updated core driver to support 15 HS and 4 SS PHYs as indicated by Thinh in [1]. Chaned usage of sprintf to snprintf while reading phys in core driver. Added a separate macro for DWC3 QCOM driver for indicating max ports. Removed unused PWR_EVENT_IRQ_STAT_REG macro in patch (9/9). Code re-verified internally and added Bjorn.A RB tag for patches. Changes in v20: Modified return check in get_num_ports call. Code re-verified internally and added Bjorn.A RB Tag in patch (2/9) from internal review. Changes in v19: Replaced IS_ERR(ptr) with a NULL check. Modified name of function reading the port num in core file. Changes in v18: Updated variable names in patch-7 for setup_port_irq and find_num_ports calls. Changes in v17: Modified DT handling patch by checking if dp_hs_phy_1 is present or not and then going for DT parsing. Changes in v16: Removing ACPI has simplified the interrupt reading in wrapper. Also the logic to find number of ports is based on dp_hs_phy interrupt check in DT. Enabling and disabling interrupts is now done per port. Added info on power event irq in commit message. Changes in v15: Added minItems property in qcom,dwc3 bindings as suggested by Rob. Retained all RB's/ACK's got in v14. Changes in v14: Moved wrapper binding update to 5th patch in the series as it deals with only wakeup and not enumeration. The first part of the series deals with enumeration and the next part deals with wakeup. Updated commit text for wrapper driver patches. Added error checks in get_port_index and setup_irq call which were missing in v13. Added SOB and CDB tags appropriately for the patches. Rebased code on top of latest usb next. DT changes have been removed and will be sent as a separate series. Changes in v13: This series is a subset of patches in v11 as the first 3 patches in v11 have been mereged into usb-next. Moved dr_mode property from platform specific files to common sc8280xp DT. Fixed function call wrapping, added comments and replaced #defines with enum in dwc3-qcom for identifying IRQ index appropriately. Fixed nitpicks pointed out in v11 for suspend-resume handling. Added reported-by tag for phy refactoring patch as a compile error was found by kernel test bot [1]. Removed reviewed-by tag of maintainer for phy refactoring patch as a minor change of increasing phy-names array size by 2-bytes was done to fix compilation issue mentioned in [1]. Changes in v12: Pushed as a subset of acked but no-yet-merged patches of v11 with intent of making rebase of other patches easy. Active reviewers from community suggested that it would be better to push the whole series in one go as it would give good clarity and context for all the patches in the series. So pushed v13 for the same addressing comments received in v11. Changes in v11: Implemented port_count calculation by reading interrupt-names from DT. Refactored IRQ handling in dwc3-qcom. Moving of macros to xhci-ext-caps.h made as a separate patch. Names of interrupts to be displayed on /proc/interrupts set to the ones present in DT. 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. Tested enumeration interrupt registration on Tertiary controller of SA8295 ADP: / # lsusb Bus 001 Device 001: ID 1d6b:0002 Bus 002 Device 001: ID 1d6b:0003 Bus 001 Device 002: ID 046d:c06a / # / # dmesg | grep ports [ 0.066250] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled [ 0.154668] dwc3 a400000.usb: K: hs-ports: 4 ss-ports: 2 [ 0.223137] xhci-hcd xhci-hcd.0.auto: Host supports USB 3.1 Enhanced SuperSpeed [ 0.227795] hub 1-0:1.0: 4 ports detected [ 0.233724] hub 2-0:1.0: 2 ports detected Tested interrupt registration for all 4 ports of SA8295 ADP: / # cat /proc/interrupts |grep phy 162: 0 0 0 0 0 0 0 0 PDC 127 Edge dp_hs_phy_1 163: 0 0 0 0 0 0 0 0 PDC 129 Edge dp_hs_phy_2 164: 0 0 0 0 0 0 0 0 PDC 131 Edge dp_hs_phy_3 165: 0 0 0 0 0 0 0 0 PDC 133 Edge dp_hs_phy_4 166: 0 0 0 0 0 0 0 0 PDC 126 Edge dm_hs_phy_1 167: 0 0 0 0 0 0 0 0 PDC 16 Level ss_phy_1 168: 0 0 0 0 0 0 0 0 PDC 128 Edge dm_hs_phy_2 169: 0 0 0 0 0 0 0 0 PDC 17 Level ss_phy_2 170: 0 0 0 0 0 0 0 0 PDC 130 Edge dm_hs_phy_3 171: 0 0 0 0 0 0 0 0 PDC 132 Edge dm_hs_phy_4 173: 0 0 0 0 0 0 0 0 PDC 14 Edge dp_hs_phy_irq 174: 0 0 0 0 0 0 0 0 PDC 15 Edge dm_hs_phy_irq 175: 0 0 0 0 0 0 0 0 PDC 138 Level ss_phy_irq Tested working of ADB on SM8450 QRD. Links to previous versions: Link to v20: https://lore.kernel.org/all/20240408132925.1880571-1-quic_kriskura@quicinc.com/ Link to v19: https://lore.kernel.org/all/20240404051229.3082902-1-quic_kriskura@quicinc.com/ Link to v18: https://lore.kernel.org/all/20240326113253.3010447-1-quic_kriskura@quicinc.com/ Link to v17: https://lore.kernel.org/all/20240326102809.2940123-1-quic_kriskura@quicinc.com/ Link to v16: https://lore.kernel.org/all/20240307062052.2319851-1-quic_kriskura@quicinc.com/ Link to v15: https://lore.kernel.org/all/20240216005756.762712-1-quic_kriskura@quicinc.com/ Link to v14: https://lore.kernel.org/all/20240206051825.1038685-1-quic_kriskura@quicinc.com/ Link to v13: https://lore.kernel.org/all/20231007154806.605-1-quic_kriskura@quicinc.com/ Link to v12: https://lore.kernel.org/all/20231004165922.25642-1-quic_kriskura@quicinc.com/ Link to v11: https://lore.kernel.org/all/20230828133033.11988-1-quic_kriskura@quicinc.com/ Link to v10: https://lore.kernel.org/all/20230727223307.8096-1-quic_kriskura@quicinc.com/ Link to v9: https://lore.kernel.org/all/20230621043628.21485-1-quic_kriskura@quicinc.com/ Link to v8: https://lore.kernel.org/all/20230514054917.21318-1-quic_kriskura@quicinc.com/ Link to v7: https://lore.kernel.org/all/20230501143445.3851-1-quic_kriskura@quicinc.com/ Link to v6: https://lore.kernel.org/all/20230405125759.4201-1-quic_kriskura@quicinc.com/ Link to v5: https://lore.kernel.org/all/20230310163420.7582-1-quic_kriskura@quicinc.com/ Link to RFC v4: https://lore.kernel.org/all/20230115114146.12628-1-quic_kriskura@quicinc.com/ Link to RFC v3: https://lore.kernel.org/all/1654709787-23686-1-git-send-email-quic_harshq@quicinc.com/#r Link to RFC v2: https://lore.kernel.org/all/1653560029-6937-1-git-send-email-quic_harshq@quicinc.com/#r [1]: https://lore.kernel.org/linux-usb/20230801013031.ft3zpoatiyfegmh6@synopsys.com/ Krishna Kurapati (9): 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: core: Refactor PHY logic to support Multiport Controller dt-bindings: usb: qcom,dwc3: Add bindings for SC8280 Multiport usb: dwc3: qcom: Add helper function to request wakeup interrupts usb: dwc3: qcom: Refactor IRQ handling in glue driver usb: dwc3: qcom: Enable wakeup for applicable ports of multiport usb: dwc3: qcom: Add multiport suspend/resume support for wrapper .../devicetree/bindings/usb/qcom,dwc3.yaml | 34 ++ .../devicetree/bindings/usb/snps,dwc3.yaml | 13 +- drivers/usb/dwc3/core.c | 329 ++++++++++++++---- drivers/usb/dwc3/core.h | 20 +- drivers/usb/dwc3/drd.c | 15 +- drivers/usb/dwc3/dwc3-qcom.c | 255 +++++++++----- 6 files changed, 493 insertions(+), 173 deletions(-) base-commit: 684e9f5f97eb4b7831298ffad140d5c1d426ff27