From patchwork Thu Nov 10 21:11:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferry Toth X-Patchwork-Id: 18322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp383183wru; Thu, 10 Nov 2022 13:25:27 -0800 (PST) X-Google-Smtp-Source: AMsMyM4TQJSFUpnw8Yi023aCRGMULVuES8IDZHwALT8lidrK6Fxuubp0gfY8AHRNpE1Cpw14/G9a X-Received: by 2002:a05:6402:206b:b0:461:c3d9:c6a3 with SMTP id bd11-20020a056402206b00b00461c3d9c6a3mr3512024edb.154.1668115526884; Thu, 10 Nov 2022 13:25:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668115526; cv=none; d=google.com; s=arc-20160816; b=JthLGFElWTQ9W2eOmreyg2abL611I6thosgxbQnh/cUzMF8cdqR9Ql0WccDGkJHQBH UdYj9vWYxGQeCikgB/r4Zhdpq2WR+RRbgmMlrG/yzNAV04P3Fut6tnre5+DNsU8gAtOG QOExTdJFJHXa24/SshKhXyXgrquIEqrxPTYfKpTy+7TrPVN586LBUH2aToEQWZ4I1Asd w1uF0ODhNiff+3pKWWumBV5q57/SMZwveXSJpOjb5ehWZDnsEhsWrhNQZjuRl+iXA+rW Ey6lWF4Lp1NI+QKrfbfXqVdvIBvEw9gXosO0Y58DUg3LevJr0xz2WDdkvngD5sYVna9f Pleg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cdesS2DQFWedzwuFw/fxWGknLLF3dzMaZQT1dpDtHwc=; b=NqR5FCNzuj9P+V8v8jyhgQifS+Lv8CRB07jc0Y7rhuc9KNAdBqzU2rlKa2W4JIODrN i60qNF9PQaV6a7hd+ETWHPEakhUcoLZ4+cb1/UPRXxHFaGsLwO7XoRWwM3R8rZWszC6X OAF+sQf1ewVRvSLv7UHBPUmADaqtXozCNaltVPr9wwkRkpk6dZV38fPZB0o8FX8anA7a zy0CSKUCq7qaiM+mlLxAhjD5kG/K8FyndolYvlT43CpPsyuy9XlyxjhjpWagph7JRbTA vMdeDoJ8HeagM5ccvY3dQJiCmv8aNoyLwS+Z4zSX/g62aiNCmqS8El7kidgFde3+5cRo dLig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@exalondelft.nl header.s=whs1 header.b=caJy+WdU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=exalondelft.nl Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id js12-20020a17090797cc00b007ae5ce3c730si389253ejc.82.2022.11.10.13.25.02; Thu, 10 Nov 2022 13:25:26 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@exalondelft.nl header.s=whs1 header.b=caJy+WdU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=exalondelft.nl Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231818AbiKJVML (ORCPT + 99 others); Thu, 10 Nov 2022 16:12:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231243AbiKJVMJ (ORCPT ); Thu, 10 Nov 2022 16:12:09 -0500 Received: from mailfilter06-out40.webhostingserver.nl (mailfilter06-out40.webhostingserver.nl [195.211.73.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21F652180B for ; Thu, 10 Nov 2022 13:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=exalondelft.nl; s=whs1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=cdesS2DQFWedzwuFw/fxWGknLLF3dzMaZQT1dpDtHwc=; b=caJy+WdUvdRTLCqJVb6LWi2k99CSVAX9qHeRm4DPOqprEfR3XiMiCBE5DIiNwZl8o5XFGSGeA6qC9 Eqp0ADROaIQLGDl3GrQIWo6MLEnpChexBXHJaALaxLkmeN0qvdWfYYmKQe2AyfzzE+BVLKHL2t3UUQ t+AVzLT/+l0RszEnu3EZ5XdbT+CUsQjztrk/oW2rToUEh/8MhxhqapOifrzqii+hrgg9A2Gm6RS9ME i+3iPpZTm1K/3Q0SlTdZ5ixIQzKbUVtaMe5/q28Xw7+CLwsVhWcTBKRa79HrAc+s2gsrLsBYKE6Vo4 PVEtjZOy53fYf/CM8oGguQKP1Vvh19A== X-Halon-ID: 5285229e-613c-11ed-837b-001a4a4cb958 Received: from s198.webhostingserver.nl (s198.webhostingserver.nl [141.138.168.154]) by mailfilter06.webhostingserver.nl (Halon) with ESMTPSA id 5285229e-613c-11ed-837b-001a4a4cb958; Thu, 10 Nov 2022 22:12:03 +0100 (CET) Received: from 2a02-a466-68ed-1-7ff6-3899-7171-85b5.fixed6.kpn.net ([2a02:a466:68ed:1:7ff6:3899:7171:85b5] helo=delfion.fritz.box) by s198.webhostingserver.nl with esmtpa (Exim 4.96) (envelope-from ) id 1otEqA-005Dpg-28; Thu, 10 Nov 2022 22:12:02 +0100 From: Ferry Toth To: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Heikki Krogerus , Greg Kroah-Hartman , Thinh Nguyen , Sean Anderson , Liu Shixin , Ferry Toth , Andrey Smirnov , Andy Shevchenko , Ferry Toth Subject: [PATCH v2 1/2] usb: ulpi: defer ulpi_register on ulpi_read_id timeout Date: Thu, 10 Nov 2022 22:11:31 +0100 Message-Id: <20221110211132.297512-2-ftoth@exalondelft.nl> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110211132.297512-1-ftoth@exalondelft.nl> References: <20221110211132.297512-1-ftoth@exalondelft.nl> MIME-Version: 1.0 X-Antivirus-Scanner: Clean mail though you should still use an Antivirus X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749145906935520199?= X-GMAIL-MSGID: =?utf-8?q?1749145906935520199?= Since commit 0f010171 Dual Role support on Intel Merrifield platform broke due to rearranging the call to dwc3_get_extcon(). It appears to be caused by ulpi_read_id() on the first test write failing with -ETIMEDOUT. Currently ulpi_read_id() expects to discover the phy via DT when the test write fails and returns 0 in that case even if DT does not provide the phy. As a result usb probe completes without phy. Signed-off-by: Ferry Toth Reviewed-by: Stephen Boyd --- drivers/usb/common/ulpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index d7c8461976ce..60e8174686a1 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulpi) /* Test the interface */ ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); if (ret < 0) - goto err; + return ret; ret = ulpi_read(ulpi, ULPI_SCRATCH); if (ret < 0) From patchwork Thu Nov 10 21:11:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferry Toth X-Patchwork-Id: 18323 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp383717wru; Thu, 10 Nov 2022 13:27:00 -0800 (PST) X-Google-Smtp-Source: AMsMyM743JLvocoRXXtO+1PqAWJcmNu9TvnFnBfeXzUpZeS+jbZLhbzjCPEYFVELR4CIHln27Ne2 X-Received: by 2002:a17:90a:854b:b0:213:5a4d:8138 with SMTP id a11-20020a17090a854b00b002135a4d8138mr2070684pjw.17.1668115620417; Thu, 10 Nov 2022 13:27:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668115620; cv=none; d=google.com; s=arc-20160816; b=OS57rIcUciloFCPKvUBS9b9ZevBJRj/OkoqhbHAYvaMj6r08rJaTBr9KjRLdFdSIut IOcpWDqYuvwx5cr8qGDI/RL69/9iZPVwQL5tvVBThCupHhysc8zIoLv0yVU40yUHeGsm JLrGy9ZWw/+xdZHLFfSIMJt0HzhoddHr2fg0inMnRznCZD/PprlC7J2pzvnm346nf0/k XsKn3E4vupb6ZjNDDp3ZpSUIe4BGN9ij5z3gT6r9RuvqN8Wf7iQx18MpfpDun9F9m5/D 6yIZYkcz5Ty6jqPzczK1XSSj+5RH72e0rdWio4E3B0uJ6Xy07SPEqGfn7byERY2qOYZt +j/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=A4MtRV/Oz/92ZR5qGyeTjm00+NMx36cJ5lbhoagSP70=; b=P+Qi3gl8duCCXHR/exFRexKQo4uxaIRCMr8Ly09n5nobc5G0/WwYHfo45P3R824NR7 /6ciTHZVa777B0BuPZDkrqGznPE2+riwq3VvatFLKf/iZp5ce1CqaY7SbDTP/cHJF8pJ r34SYANngl0pWUiMZ2yqMd+Wjtv2LG8Jw98CT6BgWqvZXvd5ZKdh1+F/p33sBeM0qrOz USr0C/qs0qj3gW06PKVfecQWiD7NWNjI7ROc69vIO5d41ogcwT5d4zNemkBPZDeEXlpP TsPg5D4Tl3N4iWo1x+NpfAs73ZXcGqNT3RSiOmLLXtzyKQyUTxQQ2e3H09u5GazDQoEs 0WOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@exalondelft.nl header.s=whs1 header.b=Mv7dlS1S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=exalondelft.nl Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t3-20020a056a0021c300b00561fb25a42asi283501pfj.303.2022.11.10.13.26.45; Thu, 10 Nov 2022 13:27:00 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@exalondelft.nl header.s=whs1 header.b=Mv7dlS1S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=exalondelft.nl Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231511AbiKJVNs (ORCPT + 99 others); Thu, 10 Nov 2022 16:13:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232182AbiKJVNV (ORCPT ); Thu, 10 Nov 2022 16:13:21 -0500 Received: from mailfilter05-out40.webhostingserver.nl (mailfilter05-out40.webhostingserver.nl [195.211.74.36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3F885E3DA for ; Thu, 10 Nov 2022 13:13:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=exalondelft.nl; s=whs1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=A4MtRV/Oz/92ZR5qGyeTjm00+NMx36cJ5lbhoagSP70=; b=Mv7dlS1SmB5BpnCMLPauvzc5SGhClRH8tqUa1YhqKZsA9nFJTZk6I5VX/EcvmTFDsEo9BBEAiC+sB eCjKeZr8JwGdRLXgtoDNe6HSZFOxP9bjE8BAobx94xsx5KJV0dnPAFnEp90Xd2snK4xRdBWL3tRBH4 XHj3yDb3ahhc8f3UTUhA8uqvDKG+wQHnIox56svGnnPmGOTyuwQBAgjltW96d0LP7R6tEdS0luUeFZ SSzeqipG02o+WRR+ZoE/vZ7oitBhMTlxjkHRb8eGO1urOXGY24CF7Z1CHoaHHo4u4YO5POtlF1bcn8 yKtsUCgu0viJsXgB4oRgSk/Rfx+pJmg== X-Halon-ID: 580cd1a3-613c-11ed-9686-001a4a4cb933 Received: from s198.webhostingserver.nl (s198.webhostingserver.nl [141.138.168.154]) by mailfilter05.webhostingserver.nl (Halon) with ESMTPSA id 580cd1a3-613c-11ed-9686-001a4a4cb933; Thu, 10 Nov 2022 22:12:12 +0100 (CET) Received: from 2a02-a466-68ed-1-7ff6-3899-7171-85b5.fixed6.kpn.net ([2a02:a466:68ed:1:7ff6:3899:7171:85b5] helo=delfion.fritz.box) by s198.webhostingserver.nl with esmtpa (Exim 4.96) (envelope-from ) id 1otEqJ-005Dpg-3B; Thu, 10 Nov 2022 22:12:12 +0100 From: Ferry Toth To: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Heikki Krogerus , Greg Kroah-Hartman , Thinh Nguyen , Sean Anderson , Liu Shixin , Ferry Toth , Andrey Smirnov , Andy Shevchenko , Ferry Toth Subject: [PATCH v2 2/2] usb: dwc3: core: defer probe on ulpi_read_id timeout Date: Thu, 10 Nov 2022 22:11:32 +0100 Message-Id: <20221110211132.297512-3-ftoth@exalondelft.nl> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110211132.297512-1-ftoth@exalondelft.nl> References: <20221110211132.297512-1-ftoth@exalondelft.nl> MIME-Version: 1.0 X-Antivirus-Scanner: Clean mail though you should still use an Antivirus X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749145911191171966?= X-GMAIL-MSGID: =?utf-8?q?1749146004813131443?= Since commit 0f010171 Dual Role support on Intel Merrifield platform broke due to rearranging the call to dwc3_get_extcon(). It appears to be caused by ulpi_read_id() masking the timeout on the first test write. In the past dwc3 probe continued by calling dwc3_core_soft_reset() followed by dwc3_get_extcon() which happend to return -EPROBE_DEFER. On deferred probe ulpi_read_id() finally succeeded. As we now changed ulpi_read_id() to return -ETIMEDOUT in this case, we need to handle the error by calling dwc3_core_soft_reset() and request -EPROBE_DEFER. On deferred probe ulpi_read_id() is retried and succeeds. Signed-off-by: Ferry Toth --- drivers/usb/dwc3/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 648f1c570021..2779f17bffaf 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1106,8 +1106,13 @@ static int dwc3_core_init(struct dwc3 *dwc) if (!dwc->ulpi_ready) { ret = dwc3_core_ulpi_init(dwc); - if (ret) + if (ret) { + if (ret == -ETIMEDOUT) { + dwc3_core_soft_reset(dwc); + ret = -EPROBE_DEFER; + } goto err0; + } dwc->ulpi_ready = true; }