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=-17.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 0C412C433E9 for ; Tue, 26 Jan 2021 11:24:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6D0122795 for ; Tue, 26 Jan 2021 11:24:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392440AbhAZLY0 (ORCPT ); Tue, 26 Jan 2021 06:24:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:55260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390885AbhAZJGu (ORCPT ); Tue, 26 Jan 2021 04:06:50 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2BE8E230FC; Tue, 26 Jan 2021 09:06:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611651969; bh=G5+l47/40WQqE8sMD8qHB812E6j2RpLT91B3pVSXqyw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=F3YdcChjzZ4m2PRiMIxSJqeqyrGB5esbPCu1IPZXWNcqzInT6iM+95xJBgi+ACP/W Tqb4fbpwdB3exg7MXjJJrxcPcgg+xu7v/ru3/k6wv7+Qd4Su7128UJE6ngK8OS1wi/ pL9SnZq4oiXBaKBQBfpEtjK8bx0qZhVFsztxUiH2w/TCIVUdISTfptJny9laJ0b7Mh ddFng6XXSQEp9ZAXJMg2PUfl724HZAR5ehOnRmmzu4qrVqBpYbSSVD8wcSUWYY4BuW xpwgNu/xJ4sBwhhLkTsABgJYZ7idXfozIDFvfjtvcF+BnGCFHey9XGnTte01GJLVf5 9lblsQQWpidSA== Received: by pali.im (Postfix) id CD203FA4; Tue, 26 Jan 2021 10:06:06 +0100 (CET) Date: Tue, 26 Jan 2021 10:06:06 +0100 From: Pali =?utf-8?B?Um9ow6Fy?= To: Yoshihiro Shimoda Cc: Mathias Nyman , Peter Chen , Mathias Nyman , Greg Kroah-Hartman , Jun Li , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v2] usb: host: xhci-plat: fix support for XHCI_SKIP_PHY_INIT quirk Message-ID: <20210126090606.svpamobnrbdxyhgg@pali> References: <20201221150903.26630-1-pali@kernel.org> <20201223161847.10811-1-pali@kernel.org> <20201224055836.GB27629@b29397-desktop> <20210113232057.niqamgsqlaw7gojw@pali> <88b48c61-65e4-cc24-d90d-5fba92f05f27@linux.intel.com> <20210125142028.th4sscs27arhihm2@pali> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: NeoMutt/20180716 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday 26 January 2021 04:27:37 Yoshihiro Shimoda wrote: > Hi Pali, > > > From: Pali Rohár, Sent: Monday, January 25, 2021 11:20 PM > > On Friday 15 January 2021 15:32:30 Mathias Nyman wrote: > > > On 14.1.2021 1.20, Pali Rohár wrote: > > > > On Thursday 24 December 2020 05:59:05 Peter Chen wrote: > > > >> On 20-12-23 17:18:47, Pali Rohár wrote: > > > >>> Currently init_quirk callbacks for xhci platform drivers are called > > > >>> xhci_plat_setup() function which is called after chip reset completes. > > > >>> It happens in the middle of the usb_add_hcd() function. > > > >>> > > > >>> But XHCI_SKIP_PHY_INIT quirk is checked in the xhci_plat_probe() function > > > >>> prior calling usb_add_hcd() function. Therefore this XHCI_SKIP_PHY_INIT > > > >>> currently does nothing as prior xhci_plat_setup() it is not set. > > > >>> > > > >>> Quirk XHCI_SKIP_PHY_INIT is only setting hcd->skip_phy_initialization value > > > >>> which really needs to be set prior calling usb_add_hcd() as this function > > > >>> at its beginning skips PHY init if this member is set. > > > >>> > > > >>> This patch fixes implementation of the XHCI_SKIP_PHY_INIT quirk by calling > > > >>> init_quirk callbacks (via xhci_priv_init_quirk()) prior checking if > > > >>> XHCI_SKIP_PHY_INIT is set. Also checking if either xhci->quirks or > > > >>> priv->quirks contains this XHCI_SKIP_PHY_INIT quirk. > > > >>> > > > >>> Signed-off-by: Pali Rohár > > > >>> > > > >>> --- > > > >>> Changes in v2: > > > >>> * Check also xhci->quirks as xhci_priv_init_quirk() callbacks are setting xhci->quirks > > > >>> * Tested with "usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720" patch > > > >>> * Removed Fixes: line > > > >>> --- > > > >>> drivers/usb/host/xhci-plat.c | 16 ++++++++-------- > > > >>> 1 file changed, 8 insertions(+), 8 deletions(-) > > > >>> > > > >>> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > > > >>> index 4d34f6005381..0eab7cb5a767 100644 > > > >>> --- a/drivers/usb/host/xhci-plat.c > > > >>> +++ b/drivers/usb/host/xhci-plat.c > > > >>> @@ -89,13 +89,6 @@ static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci) > > > >>> /* called during probe() after chip reset completes */ > > > >>> static int xhci_plat_setup(struct usb_hcd *hcd) > > > >>> { > > > >>> - int ret; > > > >>> - > > > >>> - > > > >>> - ret = xhci_priv_init_quirk(hcd); > > > >>> - if (ret) > > > >>> - return ret; > > > >>> - > > > >>> return xhci_gen_setup(hcd, xhci_plat_quirks); > > > >>> } > > > >>> > > > >>> @@ -330,7 +323,14 @@ static int xhci_plat_probe(struct platform_device *pdev) > > > >>> > > > >>> hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node); > > > >>> xhci->shared_hcd->tpl_support = hcd->tpl_support; > > > >>> - if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) > > > >>> + > > > >>> + if (priv) { > > > >>> + ret = xhci_priv_init_quirk(hcd); > > > >>> + if (ret) > > > >>> + goto disable_usb_phy; > > > >>> + } > > > >>> + > > > >>> + if ((xhci->quirks & XHCI_SKIP_PHY_INIT) || (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))) > > > >>> hcd->skip_phy_initialization = 1; > > > >> > > > >> I am not sure if others agree with you move the position of > > > >> xhci_priv_init_quirk, Let's see Mathias opinion. > > > > > > > > Hello! Do you have an opinion how to handle this issue? As currently it > > > > is needed for another patch which is fixing issue/regression in xhci-mvebu: > > > > > > > > > > > > > > > I can see the benefit in this. > > > In the xhci-plat case usb_create_hcd and usb_add_hcd are separate steps, and > > > we could both copy the xhci_plat_priv .quirks and run the .init_qurks before > > > adding the hcd. > > > I guess the current way is inherited from pci case where the earliest place > > > to do this after hcd is created is the hcd->driver->reset callback (which is > > > set to xhci_pci_setup() or xhci_plat_setup()). > > > > > > xhci-rcar.c is using the .init_quirk to load firmware, we need to check with > > > them if this change is ok. (added Yoshihiro Shimoda to cc) > > > > Yoshihiro, is this change OK? > > > > Can we move forward? I really need to now how to handle regression in > > xhci-mvebu driver. And one option is with this patch... > > Thank you for asking me about this topic. I tested the patch, but unfortunately, > this patch is possible to break a rcar platform because a phy initialization is > needed before the firmware loading if the platform uses the phy. (Note that > upstream code (salvator-common.dtsi) doesn't use the phy for xhci. But, > if we use the phy on other board with this patch, the xhci will not work.) > > So, I think we need to add a new function pointer for your case. Ok, thank you for testing! I will try to come up with other solution to mentioned mvebu-xhci issue. > Best regards, > Yoshihiro Shimoda > > > > Their firmware would be loaded before phy parts are initialized, usb bus > > > registered, or roothub device allocated. > > > > > > Thanks > > > -Mathias