From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [2/2] usb: core: Try generic PHY_MODE_USB_HOST if usb_phy_roothub_set_mode fails From: Chen-Yu Tsai Message-Id: <20190322085108.18693-3-wens@kernel.org> Date: Fri, 22 Mar 2019 16:51:08 +0800 To: Maxime Ripard , Greg Kroah-Hartman , Kishon Vijay Abraham I Cc: Chen-Yu Tsai , Grygorii Strashko , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org List-ID: RnJvbTogQ2hlbi1ZdSBUc2FpIDx3ZW5zQGNzaWUub3JnPgoKU29tZSBQSFlzIGRvIG5vdCBzdXBw b3J0IFBIWV9NT0RFX1VTQl9IT1NUX1NTLCBpLmUuIFVTQiAzLjAgb3IgaGlnaGVyLgpGYWxsIGJh Y2sgYW5kIHRyeSB0aGUgbW9yZSBnZW5lcmljIFBIWV9NT0RFX1VTQl9IT1NUIGlmIGl0IGZhaWxz LgoKRml4ZXM6IGI5N2EzMTM0ODM3OSAoInVzYjogY29yZTogY29tcGx5IHRvIFBIWSBmcmFtZXdv cmsiKQpTaWduZWQtb2ZmLWJ5OiBDaGVuLVl1IFRzYWkgPHdlbnNAY3NpZS5vcmc+Ci0tLQogZHJp dmVycy91c2IvY29yZS9oY2QuYyB8IDMgKysrCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25z KCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvY29yZS9oY2QuYyBiL2RyaXZlcnMvdXNiL2Nv cmUvaGNkLmMKaW5kZXggMzE4OTE4MWJiNjI4Li45NzVkN2MxMjg4ZTMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvdXNiL2NvcmUvaGNkLmMKKysrIGIvZHJpdmVycy91c2IvY29yZS9oY2QuYwpAQCAtMjc0 MSw2ICsyNzQxLDkgQEAgaW50IHVzYl9hZGRfaGNkKHN0cnVjdCB1c2JfaGNkICpoY2QsCiAKIAkJ cmV0dmFsID0gdXNiX3BoeV9yb290aHViX3NldF9tb2RlKGhjZC0+cGh5X3Jvb3RodWIsCiAJCQkJ CQkgIFBIWV9NT0RFX1VTQl9IT1NUX1NTKTsKKwkJaWYgKHJldHZhbCkKKwkJCXJldHZhbCA9IHVz Yl9waHlfcm9vdGh1Yl9zZXRfbW9kZShoY2QtPnBoeV9yb290aHViLAorCQkJCQkJCSAgUEhZX01P REVfVVNCX0hPU1QpOwogCQlpZiAocmV0dmFsKQogCQkJZ290byBlcnJfdXNiX3BoeV9yb290aHVi X3Bvd2VyX29uOwogCg== 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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 134F5C43381 for ; Fri, 22 Mar 2019 08:52:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D7950218B0 for ; Fri, 22 Mar 2019 08:52:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B7KDWVua" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D7950218B0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lW3Wa6oyzJ/Oe2padsIJADANA8ns1iUDV0pbscjmxus=; b=B7KDWVuaty/9DX u02vQPUJj0iAkM4RfBUkA4xbIRWadARqidXv0nLFrSyAtAp6xqyQXmSgxwD2dHuIcDgr++YxUb7QB aVME3oMAFX9KRCX9BIllS9IGYYXf5W7hlmVWBkg1OpTAV4kBXSWUWSBEUsAHn8vwDfuhwzTm6HKrG TEHht1z5VHUccL9hVPrE1m4QC4yfY3zXNPhvsiNsqSa6FSNAVcgrx6E3MIGxTqNWV87k2daz+/Mlg qyprDNjODQuMhQeqi12MaSHdAuZYhFf0PQG9ECC10QHXn8zID+F8Il4j/VRsDHN3SPhxE5ym3EZN1 ump8jcHNbhGyrjviC+Sw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h7FuB-0000fa-AY; Fri, 22 Mar 2019 08:51:59 +0000 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76] helo=wens.csie.org) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h7Fth-00008K-8i for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2019 08:51:30 +0000 Received: by wens.csie.org (Postfix, from userid 1000) id CD03B5FD69; Fri, 22 Mar 2019 16:51:15 +0800 (CST) From: Chen-Yu Tsai To: Maxime Ripard , Greg Kroah-Hartman , Kishon Vijay Abraham I Subject: [PATCH 2/2] usb: core: Try generic PHY_MODE_USB_HOST if usb_phy_roothub_set_mode fails Date: Fri, 22 Mar 2019 16:51:08 +0800 Message-Id: <20190322085108.18693-3-wens@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190322085108.18693-1-wens@kernel.org> References: <20190322085108.18693-1-wens@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190322_015129_467383_DD0BFC70 X-CRM114-Status: UNSURE ( 8.77 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chen-Yu Tsai , Grygorii Strashko , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chen-Yu Tsai Some PHYs do not support PHY_MODE_USB_HOST_SS, i.e. USB 3.0 or higher. Fall back and try the more generic PHY_MODE_USB_HOST if it fails. Fixes: b97a31348379 ("usb: core: comply to PHY framework") Signed-off-by: Chen-Yu Tsai --- drivers/usb/core/hcd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 3189181bb628..975d7c1288e3 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -2741,6 +2741,9 @@ int usb_add_hcd(struct usb_hcd *hcd, retval = usb_phy_roothub_set_mode(hcd->phy_roothub, PHY_MODE_USB_HOST_SS); + if (retval) + retval = usb_phy_roothub_set_mode(hcd->phy_roothub, + PHY_MODE_USB_HOST); if (retval) goto err_usb_phy_roothub_power_on; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6894C43381 for ; Fri, 22 Mar 2019 08:51:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8297A218D3 for ; Fri, 22 Mar 2019 08:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553244683; bh=rldEdrr5rCUngUjDLMHQBj1zn9ZZLEGs+jkZJmgEgzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Edg5lMZuMrgwPaLTrDiAN35pcVd6/MTEfNGWSApQbcGsUdanfjcj0D7wuPdO31Gj0 ns2eF+CyDfyUq58xRRizRUFy3ysbsnmM9TiK2A9Fxfw1MMTBRqzeYIW6EEGN7UR5t9 K0esqx5+4b+jMAV3nBjoNftGERQgWf1WChlqyUIw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727823AbfCVIvV (ORCPT ); Fri, 22 Mar 2019 04:51:21 -0400 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76]:41770 "EHLO wens.csie.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727490AbfCVIvS (ORCPT ); Fri, 22 Mar 2019 04:51:18 -0400 Received: by wens.csie.org (Postfix, from userid 1000) id CD03B5FD69; Fri, 22 Mar 2019 16:51:15 +0800 (CST) From: Chen-Yu Tsai To: Maxime Ripard , Greg Kroah-Hartman , Kishon Vijay Abraham I Cc: Chen-Yu Tsai , Grygorii Strashko , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] usb: core: Try generic PHY_MODE_USB_HOST if usb_phy_roothub_set_mode fails Date: Fri, 22 Mar 2019 16:51:08 +0800 Message-Id: <20190322085108.18693-3-wens@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190322085108.18693-1-wens@kernel.org> References: <20190322085108.18693-1-wens@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chen-Yu Tsai Some PHYs do not support PHY_MODE_USB_HOST_SS, i.e. USB 3.0 or higher. Fall back and try the more generic PHY_MODE_USB_HOST if it fails. Fixes: b97a31348379 ("usb: core: comply to PHY framework") Signed-off-by: Chen-Yu Tsai --- drivers/usb/core/hcd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 3189181bb628..975d7c1288e3 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -2741,6 +2741,9 @@ int usb_add_hcd(struct usb_hcd *hcd, retval = usb_phy_roothub_set_mode(hcd->phy_roothub, PHY_MODE_USB_HOST_SS); + if (retval) + retval = usb_phy_roothub_set_mode(hcd->phy_roothub, + PHY_MODE_USB_HOST); if (retval) goto err_usb_phy_roothub_power_on; -- 2.20.1