| Message ID | 20221222205302.45761-1-ftoth@exalondelft.nl |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp158528wrn;
Thu, 22 Dec 2022 12:57:11 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXv8Z/9XpKX2A88uR2eckELBIu7pI0qbDtLrGa1mZoO8H1fPpHByIqbrmUVNlpYdaqxg7uEw
X-Received: by 2002:a17:907:7094:b0:844:1d1d:1fa with SMTP id
yj20-20020a170907709400b008441d1d01famr3790249ejb.23.1671742630849;
Thu, 22 Dec 2022 12:57:10 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1671742630; cv=none;
d=google.com; s=arc-20160816;
b=UjH8KaJHwrRtuSCMEAwYC57NULASdUzhjmL+SR0Au2YcpOowEojjXXgdlJS0nYWGLf
PFOiYfGo8fOvbbetjwJPNp7Y9cQbNDyrGCNxvOKTldoO8ISRYf5mR4WYkpS2d6pme3Oq
RhQu+/975nJEfeA9MWWQKDtkLuwvI9arIrUeFhHt7euwFGuiUU2+rxkApAtHAvCB7yg+
gxYgqRIVUikPmH8yG/8lEPjwYMM8uggWKDfPD1g1cMlFXMMYSpKSpqQG6ehdu70gJgh2
086mMo42sQ7ZF3KQv6mbQuMQBd9pldng0Z/irpMtSlhjQ2l2afvFNvIbAuVmEkpbrMWL
7QgA==
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
:message-id:date:subject:cc:to:from:dkim-signature;
bh=5qhayPKhfBfDxM0F+uRbZ4HQENiaq8XOO7xJH6gBv6g=;
b=enowyWF5GaaZgzIpX1LeQ2kbkZfo7JY2Au/QBFaRuN5guv/iH3mCixg5Elt/kaiEgF
LPK0WvxjQRYQ376SHnZd9dF9dgW6bKpQW250vLska/qL6+NZAuQR0vx7/AXlnSNyNs3k
MNqqf4Q89bEedGABgbHGHtgLCOOZlOvpAI9GrakVjIO9F2UjCXOkBIgeSdFR/q3w9fB4
3WXhv7QV+17uAD/9ZeSQUme36pobIRE3oqtcRodFJeyJz8jMvVZl8NeWu7zemzXwTDUP
CI3buLv/EGjrSQcCh9XUqhdnKsbIptFQQdPsfP0ePHZkOwp10yfe8lLqZqwQgYRcP3/h
A+bg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@exalondelft.nl header.s=whs1 header.b=QSDzSMyX;
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
hg3-20020a1709072cc300b007af13652caasi1176301ejc.325.2022.12.22.12.56.23;
Thu, 22 Dec 2022 12:57:10 -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=QSDzSMyX;
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 S229843AbiLVUxR (ORCPT <rfc822;pacteraone@gmail.com> + 99 others);
Thu, 22 Dec 2022 15:53:17 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35826 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229603AbiLVUxO (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 22 Dec 2022 15:53:14 -0500
Received: from mailfilter02-out40.webhostingserver.nl
(mailfilter02-out40.webhostingserver.nl [195.211.72.22])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D48861C916
for <linux-kernel@vger.kernel.org>;
Thu, 22 Dec 2022 12:53:11 -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=5qhayPKhfBfDxM0F+uRbZ4HQENiaq8XOO7xJH6gBv6g=;
b=QSDzSMyXiXkIT2XfNUMGCDngq1KffMLlXc/Vp5DTxhMGzp0uElrvLombgdcXDnmtic8SteS08kZP9
KShbF2USqJxxLOTuhx/DdwrqCGEQ+7mdHjJpn/n7UsDDCOLsZY5w40bFP1JuNzgrudZTRYey7vVTuf
dpRtP7Kq+/SU7GdiUxJLlwUl13e0MozJF5Qw1Ygy/qe0ZFx8zXgrdaRvnYUyg84X/hm97fAeNDNplu
DcBaM5LCQhbV8ZR1SULHNcsLzTH8BvKIR/i72+w5iYBR4bbHsvT3H7J79BPGAqF9+MsjBahgolP9f9
3002f32NF29DFRCwshAqU1mHtlTxwHQ==
X-Halon-ID: a4057b1d-823a-11ed-ac07-001a4a4cb922
Received: from s198.webhostingserver.nl (s198.webhostingserver.nl
[141.138.168.154])
by mailfilter02.webhostingserver.nl (Halon) with ESMTPSA
id a4057b1d-823a-11ed-ac07-001a4a4cb922;
Thu, 22 Dec 2022 21:53:09 +0100 (CET)
Received: from 2a02-a466-68ed-1-86df-abe6-f3ae-663d.fixed6.kpn.net
([2a02:a466:68ed:1:86df:abe6:f3ae:663d] helo=delfion.fritz.box)
by s198.webhostingserver.nl with esmtpa (Exim 4.96)
(envelope-from <ftoth@exalondelft.nl>)
id 1p8SYu-00Gils-2c;
Thu, 22 Dec 2022 21:53:08 +0100
From: Ferry Toth <ftoth@exalondelft.nl>
To: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sean Anderson <sean.anderson@seco.com>,
Liu Shixin <liushixin2@huawei.com>,
Ferry Toth <fntoth@gmail.com>,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Ferry Toth <ftoth@exalondelft.nl>,
Guenter Roeck <linux@roeck-us.net>, stable@vger.kernel.org
Subject: [PATCH v2 1/1] Revert "usb: ulpi: defer ulpi_register on ulpi_read_id
timeout"
Date: Thu, 22 Dec 2022 21:53:02 +0100
Message-Id: <20221222205302.45761-1-ftoth@exalondelft.nl>
X-Mailer: git-send-email 2.37.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1752949200876094620?=
X-GMAIL-MSGID: =?utf-8?q?1752949200876094620?=
|
| Series |
[v2,1/1] Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"
|
|
Commit Message
Ferry Toth
Dec. 22, 2022, 8:53 p.m. UTC
This reverts commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac.
This patch results in some qemu test failures, specifically xilinx-zynq-a9
machine and zynq-zc702 as well as zynq-zed devicetree files, when trying
to boot from USB drive.
Fixes: 8a7b31d545d3 ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/lkml/20221220194334.GA942039@roeck-us.net/
Signed-off-by: Ferry Toth <ftoth@exalondelft.nl>
---
drivers/usb/common/ulpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Thu, Dec 22, 2022 at 09:53:02PM +0100, Ferry Toth wrote: > This reverts commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac. > > This patch results in some qemu test failures, specifically xilinx-zynq-a9 > machine and zynq-zc702 as well as zynq-zed devicetree files, when trying > to boot from USB drive. > > Fixes: 8a7b31d545d3 ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout") > Reported-by: Guenter Roeck <linux@roeck-us.net> > Cc: stable@vger.kernel.org > Link: https://lore.kernel.org/lkml/20221220194334.GA942039@roeck-us.net/ > Signed-off-by: Ferry Toth <ftoth@exalondelft.nl> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > 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 60e8174686a1..d7c8461976ce 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) > - return ret; > + goto err; > > ret = ulpi_read(ulpi, ULPI_SCRATCH); > if (ret < 0) > -- > 2.37.2
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index 60e8174686a1..d7c8461976ce 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) - return ret; + goto err; ret = ulpi_read(ulpi, ULPI_SCRATCH); if (ret < 0)