Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Frank Li <Frank.Li@nxp.com>
To:     jun.li@nxp.com, frank.li@nxp.com
Cc:     a-govindraju@ti.com, gregkh@linuxfoundation.org,
        hzpeterchen@gmail.com, imx@lists.linux.dev,
        linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
        pawell@cadence.com, peter.chen@kernel.org, rogerq@kernel.org,
        stable@kernel.org
Subject: [PATCH v2 1/1] usb: cdns3: host: fix endless superspeed hub port reset
Date:   Wed, 26 Oct 2022 15:07:49 -0400
Message-Id: <20221026190749.2280367-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZWH82Tr573hqa1kIqyEmOd/2g0EgK8584Pwk3Jb7qC0dXzDejPloEYwcH08u?=
 =?us-ascii?Q?KX7oYoTJe2sKFHUu2eAupVON0XmTsc/0WXnlyr+7wDBH/1L/dpZccek60P+v?=
 =?us-ascii?Q?13ZcWF5NubMV02HjKP+/l/9iPubreW8U5ycy6kTFOvosTTOaZyMjvy7Gav0O?=
 =?us-ascii?Q?KKhLC+zYEaWIlVJFlYXbtoqLoRyYNM1iFKEIW/GnEderKykwXIlFRWaT3A+q?=
 =?us-ascii?Q?IVv8oAPwEmLIIQa1czMrvaGVnvCN8svNebIrKMDiTdLU/3ByZ/W+lgUd8K6d?=
 =?us-ascii?Q?LPioQF/UjNSfn4JNcrX7KOOEvNifo1RvMYDOznSh51edX1xgELouq5C5k2/o?=
 =?us-ascii?Q?jh/vCsdjU6AUqg9sAiBFJJHGFXG7FHsQE2UNoUwzmfEvWzrE7cNXJW3FXXjQ?=
 =?us-ascii?Q?f3JIcPi9TYvndYboguL76TofHXE/F7CsGGTpy50MRirtAwfENTUwK/BH6Q0a?=
 =?us-ascii?Q?JZvueTeO2eukJUM3iJT2rqw3eqznvprY4hYaKMuYfuo/bRk5XckJv6nNViu+?=
 =?us-ascii?Q?0u0I2GOebtgajDAj/eVuX6JvUT0b6rkjfMRldD+XFdHV+12YOranVKcvn2RX?=
 =?us-ascii?Q?96cLhHOS2DNewiq6emOk4deTglI4Jvx8bk+6lQk6ItRz9iRuRyN0R3QL9S87?=
 =?us-ascii?Q?NLrQh5VwKkZgyPqEQE9H0w+Wo/kAHQbPoXZj2q5AO/ZKzShjgd3uKTJRZgUi?=
 =?us-ascii?Q?smbQ4wHWarTuqpVfz7RyFjsIv7X9qzR84cbzX/BT6MocnoMndWvCCgln5Acn?=
 =?us-ascii?Q?HVFkv+7PX9COaXYJHRDnqAD7mBmHdl7pyjW6lYSEg70FY48d9sVncXDqzvVx?=
 =?us-ascii?Q?F9mwZAVDQIwFQ4CWpvmRImESrPQWwnO6s+tDucswDmZkOXBM0fpeBfSTQ7MM?=
 =?us-ascii?Q?KuoOzclH8oscH99GuBfKBnkPNr+Pkkbad2xBNh/QtcTh4F2/94r4di4peJLn?=
 =?us-ascii?Q?hYJi7XFuxqzSJqT1Pjq+4Ub2L8gL+AGUBbcao9puCturVDUHMM8zl9pWe4Jh?=
 =?us-ascii?Q?P0B+9Qessv1paut/miZdFIG+abZDUjzLjTXvrsEEdjGscJk0bqm550VCj9Iz?=
 =?us-ascii?Q?HleIZ7eB/4zV0kVF+uitheOTHHSmdSvdrs2OxFNJTKoOsRkpTQZNQ1+DqQWX?=
 =?us-ascii?Q?k8a5ClsSFzrjyet4peyFCTBEkARh/MIiE15yo7qP/8+xe1vFsJNYy5fLC1z6?=
 =?us-ascii?Q?nVJx56ixiG4HQ9UT+4rcxPX4qSBL6Mh1CTyePfrYLBTZyxs+DvpdVkAV1qSt?=
 =?us-ascii?Q?7uXA6CEhOHn8md6qg41pE91ia04pmCIF2ijvpGzwd0xTICs74lS6zq4UN2F+?=
 =?us-ascii?Q?YLvf+4gqY6gTbMDTIK0yoTwkej2RulVr45IgNzPFRfChr2o6UkzC3k2lkxuz?=
 =?us-ascii?Q?0pHkGsxYSJ99QygXAtC5QoXRzyXsY+WUPQuYEFT5KraKV8L9+q01I9rFR0Al?=
 =?us-ascii?Q?wRu1Y5hd67YfVghgRV6tSrjue8YEwE/QmrMNitvY7uC952AZQoQIl7M7JJk/?=
 =?us-ascii?Q?XRKsQ66yJUveA0yRxdfu98skPK5e8h5UJlv+ULuBBsG6KP1IhvACdcrZm2Y/?=
 =?us-ascii?Q?IAm+1eHN9VC/e02bc7qq9/OC5OSx/f12MwhkM4RQ?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 06321447-2993-496f-2d09-08dab7856b11
X-MS-Exchange-CrossTenant-AuthSource: HE1PR0401MB2331.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 19:08:08.2886
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ef8Ww19xJP4JP4R9s07ZaMzFjDQ7LGiZ5Jx8hs8XaEDdGy0DYYU4GGguZG0G+Vnfkl9a81DKZzGU8n+DooUSYg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7925
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Li Jun <jun.li@nxp.com>

When usb 3.0 hub connect with one USB 2.0 device and NO USB 3.0 device,
some usb hub reports endless port reset message.

[  190.324169] usb 2-1: new SuperSpeed USB device number 88 using xhci-hcd
[  190.352834] hub 2-1:1.0: USB hub found
[  190.356995] hub 2-1:1.0: 4 ports detected
[  190.700056] usb 2-1: USB disconnect, device number 88
[  192.472139] usb 2-1: new SuperSpeed USB device number 89 using xhci-hcd
[  192.500820] hub 2-1:1.0: USB hub found
[  192.504977] hub 2-1:1.0: 4 ports detected
[  192.852066] usb 2-1: USB disconnect, device number 89

The reason is the runtime pm state of USB2.0 port is active and
USB 3.0 port is suspend, so parent device is active state.

 cat /sys/bus/platform/devices/5b110000.usb/5b130000.usb/xhci-hcd.1.auto/usb2/power/runtime_status

 suspended

 cat /sys/bus/platform/devices/5b110000.usb/5b130000.usb/xhci-hcd.1.auto/usb1/power/runtime_status

 active

 cat /sys/bus/platform/devices/5b110000.usb/5b130000.usb/xhci-hcd.1.auto/power/runtime_status

 active

 cat /sys/bus/platform/devices/5b110000.usb/5b130000.usb/power/runtime_status

 active

So xhci_cdns3_suspend_quirk() have not called. U3 configure is not applied.

move U3 configure into host start. Reinit again in resume function in case
controller power lost during suspend.

Cc: stable@vger.kernel.org 5.10
Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Change from V1 to V2. 
 - call xhci_cdns3_plat_start() in xhci_cdns3_resume_quirk
in case power lost during suspend

 drivers/usb/cdns3/host.c | 56 ++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/drivers/usb/cdns3/host.c b/drivers/usb/cdns3/host.c
index 9643b905e2d8..6164fc4c96a4 100644
--- a/drivers/usb/cdns3/host.c
+++ b/drivers/usb/cdns3/host.c
@@ -24,11 +24,37 @@
 #define CFG_RXDET_P3_EN		BIT(15)
 #define LPM_2_STB_SWITCH_EN	BIT(25)
 
-static int xhci_cdns3_suspend_quirk(struct usb_hcd *hcd);
+static void xhci_cdns3_plat_start(struct usb_hcd *hcd)
+{
+	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+	u32 value;
+
+	/* set usbcmd.EU3S */
+	value = readl(&xhci->op_regs->command);
+	value |= CMD_PM_INDEX;
+	writel(value, &xhci->op_regs->command);
+
+	if (hcd->regs) {
+		value = readl(hcd->regs + XECP_AUX_CTRL_REG1);
+		value |= CFG_RXDET_P3_EN;
+		writel(value, hcd->regs + XECP_AUX_CTRL_REG1);
+
+		value = readl(hcd->regs + XECP_PORT_CAP_REG);
+		value |= LPM_2_STB_SWITCH_EN;
+		writel(value, hcd->regs + XECP_PORT_CAP_REG);
+	}
+}
+
+static int xhci_cdns3_resume_quirk(struct usb_hcd *hcd)
+{
+	xhci_cdns3_plat_start(hcd);
+	return 0;
+}
 
 static const struct xhci_plat_priv xhci_plat_cdns3_xhci = {
 	.quirks = XHCI_SKIP_PHY_INIT | XHCI_AVOID_BEI,
-	.suspend_quirk = xhci_cdns3_suspend_quirk,
+	.plat_start = xhci_cdns3_plat_start,
+	.resume_quirk = xhci_cdns3_resume_quirk,
 };
 
 static int __cdns_host_init(struct cdns *cdns)
@@ -90,32 +116,6 @@ static int __cdns_host_init(struct cdns *cdns)
 	return ret;
 }
 
-static int xhci_cdns3_suspend_quirk(struct usb_hcd *hcd)
-{
-	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
-	u32 value;
-
-	if (pm_runtime_status_suspended(hcd->self.controller))
-		return 0;
-
-	/* set usbcmd.EU3S */
-	value = readl(&xhci->op_regs->command);
-	value |= CMD_PM_INDEX;
-	writel(value, &xhci->op_regs->command);
-
-	if (hcd->regs) {
-		value = readl(hcd->regs + XECP_AUX_CTRL_REG1);
-		value |= CFG_RXDET_P3_EN;
-		writel(value, hcd->regs + XECP_AUX_CTRL_REG1);
-
-		value = readl(hcd->regs + XECP_PORT_CAP_REG);
-		value |= LPM_2_STB_SWITCH_EN;
-		writel(value, hcd->regs + XECP_PORT_CAP_REG);
-	}
-
-	return 0;
-}
-
 static void cdns_host_exit(struct cdns *cdns)
 {
 	kfree(cdns->xhci_plat_data);
-- 
2.34.1