From patchwork Mon Mar 18 08:45:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 10856989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C06B015AC for ; Mon, 18 Mar 2019 08:45:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6584292A1 for ; Mon, 18 Mar 2019 08:45:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99B7B292C7; Mon, 18 Mar 2019 08:45:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4668B292A1 for ; Mon, 18 Mar 2019 08:45:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726998AbfCRIpj (ORCPT ); Mon, 18 Mar 2019 04:45:39 -0400 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76]:41002 "EHLO wens.csie.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726946AbfCRIpi (ORCPT ); Mon, 18 Mar 2019 04:45:38 -0400 Received: by wens.csie.org (Postfix, from userid 1000) id 38A945FD14; Mon, 18 Mar 2019 16:45:36 +0800 (CST) Date: Mon, 18 Mar 2019 16:45:36 +0800 From: Chen-Yu Tsai To: Maxime Ripard , Greg Kroah-Hartman , Grygorii Strashko Cc: Kishon Vijay Abraham I , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [BUG] USB (EHCI/OHCI) broken on Allwinner SoCs Message-ID: <20190318084536.GA27150@wens.csie.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi everyone, USB EHCI/OHCI hosts are broken on Allwinner SoCs on v5.1-rc1. I believe this is partially triggered by commit b97a31348379 ("usb: core: comply to PHY framework"), and partially due to how the Allwinner USB PHY driver handles phy_set_mode for non-OTG PHYs. Note this is not from a bisect. The following changes fix this. Hunk 1 makes our PHY driver accept PHY_MODE_USB_HOST for the non-OTG PHYs as a no-op. --- If the two changes make sense I'll send them out as actual patches. diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 5163097b43df..4bbd9ede38c8 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -485,8 +485,11 @@ static int sun4i_usb_phy_set_mode(struct phy *_phy, struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy); int new_mode; - if (phy->index != 0) + if (phy->index != 0) { + if (mode == PHY_MODE_USB_HOST) + return 0; return -EINVAL; + } switch (mode) { case PHY_MODE_USB_HOST: --- Hunk 2 makes the USB core call phy_set_mode with PHY_MODE_USB_HOST instead of PHY_MODE_USB_HOST_SS. Not sure why PHY_MODE_USB_HOST_SS was used here, but I believe only a small set of hardware actually support SuperSpeed, so it might be better to use the more encompasing PHY_MODE_USB_HOST. That or the core code would have to check which speed class the port is for and pass in the appropriate mode. The Allwinner PHYs do not support SuperSpeed. diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 3189181bb628..7f25e384144d 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -2740,7 +2740,7 @@ int usb_add_hcd(struct usb_hcd *hcd, return retval; retval = usb_phy_roothub_set_mode(hcd->phy_roothub, - PHY_MODE_USB_HOST_SS); + PHY_MODE_USB_HOST); if (retval) goto err_usb_phy_roothub_power_on;