From mboxrd@z Thu Jan 1 00:00:00 1970 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 07FE8C433FE for ; Wed, 9 Nov 2022 22:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231373AbiKIWUD (ORCPT ); Wed, 9 Nov 2022 17:20:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230262AbiKIWUC (ORCPT ); Wed, 9 Nov 2022 17:20:02 -0500 X-Greylist: delayed 62 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 09 Nov 2022 14:19:59 PST Received: from mailfilter06-out40.webhostingserver.nl (mailfilter06-out40.webhostingserver.nl [195.211.73.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC5B9120AA for ; Wed, 9 Nov 2022 14:19:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=exalondelft.nl; s=whs1; h=content-transfer-encoding:mime-version:message-id:date:subject:cc:to:from: from; bh=BwQD9pj5b/WWSsnWxPYCsQ/PgXjWas3i27VLj8Y6Clc=; b=ZkY8uv6/hN9/FoAwFfXnWm4GMQg7cJ1jSyMvQ7tJ+ilUOB7nPzqBfUU8u/Z2Snwf1/rbGnOPQvmRA x4K23/yrAMk6SoyyKB9dEolvHKnk0AHgF6bWTNPXFG7pjTfsyiyxWMOOec/B9KdKGtY+3oUTBdEQN0 NSAp+DGOdSRPl3ctQAjzhVRqft37d73lqpX5/3cyuq1oTGW+JOPllcQb0MmM1CVOW9WZBJR2IFirVm aYBgmvkm/Low6Sf6QtTClCfZILKJWtJ+0ZmOqaPC/UQhOy0vULvq7pXS4KY/5Xn4b6sfod+Rhjgrdo HR8ICGNM9BzzHnCac3HStBcVZzQ+2rw== X-Halon-ID: 7f4b7a72-607c-11ed-837b-001a4a4cb958 Received: from s198.webhostingserver.nl (s198.webhostingserver.nl [141.138.168.154]) by mailfilter06.webhostingserver.nl (Halon) with ESMTPSA id 7f4b7a72-607c-11ed-837b-001a4a4cb958; Wed, 09 Nov 2022 23:18:54 +0100 (CET) Received: from 2a02-a466-68ed-1-6127-ee99-b8c1-12c4.fixed6.kpn.net ([2a02:a466:68ed:1:6127:ee99:b8c1:12c4] helo=localhost.localdomain) by s198.webhostingserver.nl with esmtpa (Exim 4.96) (envelope-from ) id 1ostPK-002HIn-0s; Wed, 09 Nov 2022 23:18:54 +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 , Stephen Boyd , Andrey Smirnov , Andy Shevchenko , Ferry Toth Subject: [PATCH v1 1/1] usb: ulpi: defer ulpi_register on ulpi_read_id timeout Date: Wed, 9 Nov 2022 23:17:49 +0100 Message-Id: <20221109221749.8210-1-ftoth@exalondelft.nl> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Antivirus-Scanner: Clean mail though you should still use an Antivirus Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org 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. Due to the timeout being masked dwc3 probe continues by calling dwc3_core_soft_reset() followed by dwc3_get_extcon() which happens to return -EPROBE_DEFER. On deferred probe ulpi_read_id() finally succeeds. This patch changes ulpi_read_id() to return -ETIMEDOUT when it occurs and catches the error in dwc3_core_init(). It handles the error by calling dwc3_core_soft_reset() after which it requests -EPROBE_DEFER. On deferred probe ulpi_read_id() again succeeds. Signed-off-by: Ferry Toth --- drivers/usb/common/ulpi.c | 5 +++-- drivers/usb/dwc3/core.c | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index d7c8461976ce..d8f22bc2f9d0 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -206,8 +206,9 @@ static int ulpi_read_id(struct ulpi *ulpi) /* Test the interface */ ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); - if (ret < 0) - goto err; + if (ret < 0) { + return ret; + } ret = ulpi_read(ulpi, ULPI_SCRATCH); if (ret < 0) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 648f1c570021..e293ef70039b 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1106,8 +1106,11 @@ static int dwc3_core_init(struct dwc3 *dwc) if (!dwc->ulpi_ready) { ret = dwc3_core_ulpi_init(dwc); - if (ret) + if (ret) { + dwc3_core_soft_reset(dwc); + ret = -EPROBE_DEFER; goto err0; + } dwc->ulpi_ready = true; } -- 2.34.1