Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp4972500pxu; Tue, 22 Dec 2020 05:33:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyP/x6WO0mO5uWo9xQJWNPpnyP8vW+K5m3lpzYo0Sr728q1DHf7vRLo2ZCOpYTAnnFq5OhQ X-Received: by 2002:a50:f40e:: with SMTP id r14mr19854643edm.5.1608644033851; Tue, 22 Dec 2020 05:33:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608644033; cv=none; d=google.com; s=arc-20160816; b=YbaHa31a7VDxvIM23+fe9E2HhmdG/5Nc9xwrcUiTj6PUnwIcpgpNYGlIZSEYaIPl/S kihBHykLBRmI09IjBKnNdt75Q5S0BALonpSAvxvrM2EPgFx4iIr8cYy6Eti/MqH7vM8I TQ1Z7wYvXfZ6APV3UaTsn6777xJ2BpQ/Bkh5T/qj+l56EIWht2265Burq5aT1YLjSuba UBNlN+TNhYXCXQAMenO4oUvzao4EEN7QsOnP0r+653fIYgfYfcozZ35KQ7kdgtNDHk6k 0gJIEdgPHF4xfsZPUV0Cy79x3C6Fv17vX8YkeDTeTZfst2Hk1hybKwy4spfJ0Bgz5QVY oumA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=OW/E0zK1SjqOD/QiwKaP9HZr6sN5ytLYVoK00xSv7OU=; b=d2HeY1KpmQMGOdUnwkPm4AZmSuZWzHwoyrGDtM+m4xhRls1x4HpCRRCgVK7ujPhRwY ZyPUIN+vO2vqm9VDw1qduq9PA2NdqeGBdfdTISW1yiktvY5RETyaf1ONkBh2P48+K5eh HWZOd6f2Pp1EHC8ATwngkhDQWHhKAuBnwpJDzF0LSL64tp1jtnhwwidcyaqvcjjn6ZBD /WvTqpt4ITdlWu/2dhp+9fFJsgq4smn0ZjdaG8KElLtykSUYedl8DilRCtxXljisasNB mngcTBA0c9EWKNhbpE6+VPMSNaVNln8KOSMG6Y4hCBZ96eA5yZPNlHID3OEIGot6jk9T kM3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LVEjdkyE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f12si11885664ejl.311.2020.12.22.05.33.30; Tue, 22 Dec 2020 05:33:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LVEjdkyE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727505AbgLVNbf (ORCPT + 99 others); Tue, 22 Dec 2020 08:31:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:45392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727146AbgLVNbe (ORCPT ); Tue, 22 Dec 2020 08:31:34 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id C7C09229C6; Tue, 22 Dec 2020 13:30:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608643853; bh=1WvxvtX20HsPEDDPqNB0howPhU2hqueA4ilWZni7BSQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LVEjdkyEec4DNI0h6cFv/S11CfyPsNRZY8nwEUIBdNAn33FLcIT2At9h8WY0eUOkQ GoCFwbvJj9SisZdTbjW5vXtx4tW8MNXjJUmgJAPQgdSAuVwY5Q6s+iRlbh8ik9r/p2 iucShZb4Do74KGM3jXBwkyddVKDMRJhv/FkNaaETocGQnmgwzvtdGWlDukUJNujv0H BFruNq9Q6mdwCyD1SuPFYw8K4dyJzzudMMtrgX4icgUfqOJV7fdHMQ1VkDqE9rOSqO rSDiGAH9roSF6OVrdqOglp1CMhL6oqrTHY8jiMG3vbhlhOP3LgjisY0V0z9gt6CEdS X4iUSe+xZP4AQ== Received: by pali.im (Postfix) id A2D4B848; Tue, 22 Dec 2020 14:30:51 +0100 (CET) Date: Tue, 22 Dec 2020 14:30:51 +0100 From: Pali =?utf-8?B?Um9ow6Fy?= To: Peter Chen Cc: Mathias Nyman , Greg Kroah-Hartman , Jun Li , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] usb: host: xhci-plat: fix support for XHCI_SKIP_PHY_INIT quirk Message-ID: <20201222133051.jfvrgkcdhjnldz3z@pali> References: <20201221150903.26630-1-pali@kernel.org> <20201222021416.GB4706@b29397-desktop> <20201222092327.jq5b7g4bffeccq3o@pali> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201222092327.jq5b7g4bffeccq3o@pali> User-Agent: NeoMutt/20180716 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday 22 December 2020 10:23:27 Pali Rohár wrote: > On Tuesday 22 December 2020 02:14:45 Peter Chen wrote: > > On 20-12-21 16:09:03, 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. > > > > > > Fixes: f768e718911e0 ("usb: host: xhci-plat: add priv quirk for skip PHY initialization") > > > Signed-off-by: Pali Rohár > > > --- > > > drivers/usb/host/xhci-plat.c | 14 +++++++------- > > > 1 file changed, 7 insertions(+), 7 deletions(-) > > > > > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > > > index 4d34f6005381..58704c5b002b 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,6 +323,13 @@ 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) { > > > + ret = xhci_priv_init_quirk(hcd); > > > + if (ret) > > > + goto disable_usb_phy; > > > + } > > > + > > > if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) > > > hcd->skip_phy_initialization = 1; > > > > > > > Hi Pali, > > > > What's problem you have met? In structure xhci_plat_priv, the quirks are > > defined at .quirks entry which is got at below code. .init_quirk is the > > routine if special initializations are needed. > > Hello! > > I'm talking about .init_quirk. And if XHCI_SKIP_PHY_INIT quirk is set in > this function then has no effect. Ok, this patch is not enough, I will send V2. > I'm working currently on patch for xhci mvebu which conditionally enable > or disable XHCI_SKIP_PHY_INIT quirk (it is going to fix existing > regression since v5.1 kernel) and without this patch XHCI_SKIP_PHY_INIT > quirk from the init_quirk does not work. And now I have tested V2 with my mvebu regression fix. I will send it to mailing list for review. > > if (pdev->dev.of_node) > > priv_match = of_device_get_match_data(&pdev->dev); > > else > > priv_match = dev_get_platdata(&pdev->dev); > > > > if (priv_match) { > > priv = hcd_to_xhci_priv(hcd); > > /* Just copy data for now */ > > *priv = *priv_match; > > } > > -- > > > > Thanks, > > Peter Chen