From patchwork Mon Dec 9 11:19:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13899354 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A024421A43F; Mon, 9 Dec 2024 11:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733743237; cv=none; b=ED1M4QtW+xVdW1I1PA+21zYpq971LKAt/KD/7+3YRaiRVu9snlytzHzFWIA2tMUJQfkIXq3p6RdSEMQThMuWwpLQYw2F4NZIpbtL/mxUZlUTUUwLgg2mYNM5jzkFEymBgCtPovSPIWDjUmTq7171ncAI2OyQbdjyKTo1GIkMguE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733743237; c=relaxed/simple; bh=3N4d65t8tlhYSC9lPSzOeAEj9EIZZf5ZHkBDz8Cb1h4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r9Yl0EMpJ6DvsQTWmEspQErigPKjlGe6gkyyqc/u+V+uWg0/YOgFwZ/D7HDzJ+B5JSSjYZMX75st/aIBm95TRfxgDywgXm9FRB7ZKeLE42+P8RhcyiwrZALeac2DF64g1M+VVLRQ0Rb44M5tqZI+Vh77dY3WM/6cn1lPAJXdRpM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D7b0x2Q+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D7b0x2Q+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1820DC4CEE6; Mon, 9 Dec 2024 11:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733743237; bh=3N4d65t8tlhYSC9lPSzOeAEj9EIZZf5ZHkBDz8Cb1h4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D7b0x2Q+Fxpzs2aBXIahli02huv675iF4LEw99zGOmTykQFRCw7NJui1LwCiyH+aS 02717DdIJ/9NjAjXVdYBiMK21cA+yqoB0tqVMTnPQfAg07I5g19CNoztGoroXiV6ad 3adKoMcLdeXmGuTSpjgfko8zOCQvcW0WqYqnFKWxI0hyvSYlWedYvhBF48ZMI2UwoO 3EFqlluLvR6RyE2q/Y4N1iWlF3olc5vx+UvdgahUIwnoBHM+GPipr5NV11Bs5MK+pT Fv+sEzfba3fkFFNpgUyv+5cDl49hCXOgfM2snxRp1wLH7yujFXk6eOU5KN19ysq9ld 5NRtYnYWIpuPw== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1tKboc-0000000086B-2EEI; Mon, 09 Dec 2024 12:20:38 +0100 From: Johan Hovold To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dmitry Baryshkov , Jonathan Marek , Stephan Gerhold , Abel Vesa , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, regressions@lists.linux.dev, Johan Hovold Subject: [PATCH v2 1/2] Revert "arm64: dts: qcom: x1e78100-t14s: enable otg on usb-c ports" Date: Mon, 9 Dec 2024 12:19:04 +0100 Message-ID: <20241209111905.31017-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241209111905.31017-1-johan+linaro@kernel.org> References: <20241209111905.31017-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This reverts commit 1a48dd7b9ac809d1bd0fd2fef509abba83433846. A recent change enabling OTG mode on the Lenovo ThinkPad T14s USB-C ports can break SuperSpeed device hotplugging. The host controller is enumerated, but the device is not: xhci-hcd xhci-hcd.5.auto: xHCI Host Controller xhci-hcd xhci-hcd.5.auto: new USB bus registered, assigned bus number 3 xhci-hcd xhci-hcd.5.auto: hcc params 0x0110ffc5 hci version 0x110 quirks 0x000080a000000810 xhci-hcd xhci-hcd.5.auto: irq 247, io mem 0x0a800000 xhci-hcd xhci-hcd.5.auto: xHCI Host Controller xhci-hcd xhci-hcd.5.auto: new USB bus registered, assigned bus number 4 xhci-hcd xhci-hcd.5.auto: Host supports USB 3.1 Enhanced SuperSpeed hub 3-0:1.0: USB hub found hub 3-0:1.0: 1 port detected hub 4-0:1.0: USB hub found hub 4-0:1.0: 1 port detected Once this happens on either of the two ports, no amount of disconnecting and reconnecting makes the SuperSpeed device be enumerated, while FullSpeed device enumeration still works. With retimer (and orientation detection) support not even merged yet, let's revert at least until we have stable host mode in mainline. Fixes: 1a48dd7b9ac8 ("arm64: dts: qcom: x1e78100-t14s: enable otg on usb-c ports") Cc: Jonathan Marek Signed-off-by: Johan Hovold --- .../arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts index 5a4a72a030d4..b4b6260c670c 100644 --- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts +++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts @@ -1515,6 +1515,10 @@ &usb_1_ss0 { status = "okay"; }; +&usb_1_ss0_dwc3 { + dr_mode = "host"; +}; + &usb_1_ss0_dwc3_hs { remote-endpoint = <&pmic_glink_ss0_hs_in>; }; @@ -1543,6 +1547,10 @@ &usb_1_ss1 { status = "okay"; }; +&usb_1_ss1_dwc3 { + dr_mode = "host"; +}; + &usb_1_ss1_dwc3_hs { remote-endpoint = <&pmic_glink_ss1_hs_in>; }; From patchwork Mon Dec 9 11:19:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13899353 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FFE8218AB3; Mon, 9 Dec 2024 11:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733743237; cv=none; b=KGhODpnNYOzsMDuaqLhLj4v2gVUR8RlS5El3JFv0gOmJFBRFgVpkrG8yPeINHHGNzvuZfzSaflQAW43XCEmOO7BhieYvwiP1/uZqT97PEL5t63mh3UN2xW/SRkkPO034pQmNNflKTZJhy0rsms+qkd4MBwDsT5+HoBuNGDRu6dk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733743237; c=relaxed/simple; bh=jdcd1UtGAai1fWkfFvIjFbaFosjgIwsdkMA1Odz4TBs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZPRBWfhVYtUcytWG6y8HR6V2jEQ/PVSpW6g81E7UGxlhlSW/1m/ixuNbvXNyvumA8Po/sP6JlU5aIgY47KT24W5fMy1CFkKlGa1LfpTi6K23YFZZtmhjJtxpNnGB/pTdEskFyOKB3YE1PaQt12diobBmw4SVhH3iH+YCy+OwEjk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P0Lscgoa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P0Lscgoa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDB01C4CEDD; Mon, 9 Dec 2024 11:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733743237; bh=jdcd1UtGAai1fWkfFvIjFbaFosjgIwsdkMA1Odz4TBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P0LscgoaFrzmcDQc6z0pmtB0o5RcdyPbQ/M/e2tKRkK1zib4mVVmgZdCkuC6noN+3 QAHyeGlrLpvkpiApoNC4vU4cjnQY/Tf1dgtespTGkeETpIuk9xwm4t1e50wgTuwOmy DEYm6liwPm7eT3VwyhLcyvllQoeWDLgzEsqR/JusE2cxAE+44fEE6p49q+bPDYBJA8 LZN6tgjfGSDBp2u5/7bcaRhraKYvUyuK6Okkx+S26GEIBHgZcd2U+qzrlBLbQ6ZWjo P8L/dtHgVw/V32Sr7hgbNAT0I0Rri8Pnj7HofXjUEPPG0KzddxJiF+E6lbybZu7c0/ jBz3Ux4EcF+cQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1tKboc-0000000086D-2ec0; Mon, 09 Dec 2024 12:20:38 +0100 From: Johan Hovold To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dmitry Baryshkov , Jonathan Marek , Stephan Gerhold , Abel Vesa , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, regressions@lists.linux.dev, Johan Hovold Subject: [PATCH v2 2/2] Revert "arm64: dts: qcom: x1e80100-crd: enable otg on usb ports" Date: Mon, 9 Dec 2024 12:19:05 +0100 Message-ID: <20241209111905.31017-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241209111905.31017-1-johan+linaro@kernel.org> References: <20241209111905.31017-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This reverts commit 2dd3250191bcfe93b0c9da46624af830310400a7. A recent change enabling OTG mode on the x1e81000 CRD breaks suspend. Specifically, the device hard resets during resume if suspended with all controllers in device mode (i.e. no USB device connected). The corresponding change on the T14s also led to SuperSpeed hotplugs not being detected. With retimer (and orientation detection) support not even merged yet, let's revert at least until we have stable host mode in mainline. Fixes: 2dd3250191bc ("arm64: dts: qcom: x1e80100-crd: enable otg on usb ports") Reported-by: Abel Vesa Cc: Jonathan Marek Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts index 199f6b42aa11..66360390ae7d 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts @@ -1840,6 +1840,10 @@ &usb_1_ss0 { status = "okay"; }; +&usb_1_ss0_dwc3 { + dr_mode = "host"; +}; + &usb_1_ss0_dwc3_hs { remote-endpoint = <&pmic_glink_ss0_hs_in>; }; @@ -1868,6 +1872,10 @@ &usb_1_ss1 { status = "okay"; }; +&usb_1_ss1_dwc3 { + dr_mode = "host"; +}; + &usb_1_ss1_dwc3_hs { remote-endpoint = <&pmic_glink_ss1_hs_in>; }; @@ -1896,6 +1904,10 @@ &usb_1_ss2 { status = "okay"; }; +&usb_1_ss2_dwc3 { + dr_mode = "host"; +}; + &usb_1_ss2_dwc3_hs { remote-endpoint = <&pmic_glink_ss2_hs_in>; };