From patchwork Mon Aug 28 13:30:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Kurapati X-Patchwork-Id: 13367985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69BEAC71153 for ; Mon, 28 Aug 2023 13:32:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230188AbjH1Nbq (ORCPT ); Mon, 28 Aug 2023 09:31:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230287AbjH1NbQ (ORCPT ); Mon, 28 Aug 2023 09:31:16 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98404B9; Mon, 28 Aug 2023 06:31:12 -0700 (PDT) Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37SCtkNh010563; Mon, 28 Aug 2023 13:30:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=TXoCTDKQDhczsUJDCINGk1gSay20JWlmukPCaVVlhdU=; b=jrl47WbfhB9vvr521UqbIsFKDVZ8V1zCkbeY8Rr+4r46OBff52yreKjmywm6SMxP6fq6 OkFF8Anl6/5WEHJhZUWDGuZsW4vwaRemtaEMryTEt6ZhMDebrq0m2dXRtHc3A22lcqHV xjnG8vTv8i1+/InXq6LlFsh1CJy9+fsK9SEuuwmwdW19Y6+0sIuZhJ6MoFvIf6hhu99k vm8kSI/Kr96QkhNtr5yuJKfrb262NS26kAkicMo2zw7VFVSbXJ5C5a7xzh3K9K/oMm00 QKFlpcawjJcHZIZ1GgHLiiTwjgoP5Z4CJyNfFc/jgQE9jodGEpSbJFpXtLBGlD5igw4v RA== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3srt8s09bw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Aug 2023 13:30:50 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 37SDUnoa029247 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Aug 2023 13:30:49 GMT Received: from hu-kriskura-hyd.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.36; Mon, 28 Aug 2023 06:30:43 -0700 From: Krishna Kurapati To: Thinh Nguyen , Greg Kroah-Hartman , Philipp Zabel , "Andy Gross" , Bjorn Andersson , "Konrad Dybcio" , Rob Herring , Krzysztof Kozlowski , Felipe Balbi , Wesley Cheng , Johan Hovold , Mathias Nyman CC: , , , , , , , , , Krishna Kurapati Subject: [PATCH v11 00/13] Add multiport support for DWC3 controllers Date: Mon, 28 Aug 2023 19:00:20 +0530 Message-ID: <20230828133033.11988-1-quic_kriskura@quicinc.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: 6zihHlcX3lPPZZF6p4jmbAI5IsWm04ij X-Proofpoint-GUID: 6zihHlcX3lPPZZF6p4jmbAI5IsWm04ij X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-08-28_10,2023-08-28_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 priorityscore=1501 mlxlogscore=999 adultscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 malwarescore=0 clxscore=1011 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2308280118 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 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. Tests done on v11: a. ADB in device mode working on first port of SA8295P-ADP b. Enumeration on 4 ports of SA8295 tested by connecting pendrive, mouse and webcam / # lsusb -t Bus 002 Device 004: ID 046d:085e Bus 001 Device 001: ID 1d6b:0002 Bus 001 Device 008: ID 03f0:094a Bus 002 Device 003: ID 0781:558b Bus 002 Device 001: ID 1d6b:0003 Bus 001 Device 009: ID 046d:c05a / # dmesg | grep hub [ 1.168337] hub 1-0:1.0: USB hub found [ 1.168345] hub 1-0:1.0: 4 ports detected [ 1.169059] hub 2-0:1.0: USB hub found [ 1.169065] hub 2-0:1.0: 2 ports detected c. Wakeup tested on 4 ports of multiport by entering system suspend and connecting a device to each empty port and checking if it wakes up the system or not. This method was chosen because when we enter system suspend, power to connected peripherals was not present. So, the test was done by connecting a peripheral to empty port and seeing if the interrupts wake up the system or not. d. Enumeration and wakeup tested on single port controller of SC7280 in host mode. In this case, wakeup was initiated by a mouse click already connected to it. e. Interrupt registration tested on both single port and mulitport controllers of SA8295P-ADP. 184: 0 0 0 0 0 0 0 0 PDC 127 Level dp_hs_phy_1 185: 0 0 0 0 0 0 0 0 PDC 126 Level dm_hs_phy_1 186: 0 0 0 0 0 0 0 0 PDC 129 Level dp_hs_phy_2 187: 0 0 0 0 0 0 0 0 PDC 128 Level dm_hs_phy_2 188: 0 0 0 0 0 0 0 0 PDC 131 Level dp_hs_phy_3 189: 0 0 0 0 0 0 0 0 PDC 130 Level dm_hs_phy_3 190: 0 0 0 0 0 0 0 0 PDC 133 Level dp_hs_phy_4 191: 0 0 0 0 0 0 0 0 PDC 132 Level dm_hs_phy_4 192: 0 0 0 0 0 0 0 0 PDC 16 Level ss_phy_1 193: 0 0 0 0 0 0 0 0 PDC 17 Level ss_phy_2 194: 630 0 0 0 0 0 0 0 GICv3 165 Level xhci-hcd:usb1 195: 0 0 0 0 0 0 0 0 PDC 14 Level dp_hs_phy_irq 196: 0 0 0 0 0 0 0 0 PDC 15 Level dm_hs_phy_irq 197: 0 0 0 0 0 0 0 0 PDC 138 Level ss_phy_irq 198: 31 0 0 0 0 0 0 0 GICv3 835 Level dwc3 199: 0 0 0 0 0 0 0 0 PDC 12 Level dp_hs_phy_irq 200: 0 0 0 0 0 0 0 0 PDC 13 Level dm_hs_phy_irq 201: 0 0 0 0 0 0 0 0 PDC 136 Level ss_phy_irq Links to previous versions: 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 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 (11): dt-bindings: usb: qcom,dwc3: Add bindings for SC8280 Multiport dt-bindings: usb: Add bindings for multiport properties on DWC3 controller usb: xhci: Move extcaps related macros to respective header file 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: Add helper function to request threaded IRQ 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 | 324 +++++++++++++---- drivers/usb/dwc3/core.h | 16 +- drivers/usb/dwc3/drd.c | 15 +- drivers/usb/dwc3/dwc3-qcom.c | 328 ++++++++++++------ drivers/usb/host/xhci-ext-caps.h | 27 ++ drivers/usb/host/xhci.h | 27 -- 11 files changed, 708 insertions(+), 223 deletions(-)