From patchwork Mon Dec 21 15:09:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 346562 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.0 required=3.0 tests=BAYES_00, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 A7BE2C433DB for ; Mon, 21 Dec 2020 15:10:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7CEE322BEA for ; Mon, 21 Dec 2020 15:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725783AbgLUPJ6 (ORCPT ); Mon, 21 Dec 2020 10:09:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:33456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725777AbgLUPJ6 (ORCPT ); Mon, 21 Dec 2020 10:09:58 -0500 From: =?utf-8?q?Pali_Roh=C3=A1r?= Authentication-Results: mail.kernel.org; dkim=permerror (bad message/signature format) To: Mathias Nyman , Greg Kroah-Hartman , Peter Chen Cc: Jun Li , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] usb: host: xhci-plat: fix support for XHCI_SKIP_PHY_INIT quirk Date: Mon, 21 Dec 2020 16:09:03 +0100 Message-Id: <20201221150903.26630-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org 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;