From patchwork Mon Apr 5 08:54:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 415284 Delivered-To: patch@linaro.org Received: by 2002:a17:906:5290:0:0:0:0 with SMTP id c16csp3279373ejm; Mon, 5 Apr 2021 02:13:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2JHyl3pZgbA+1SnApj2k0fj+YME2cgX+UyG+Dw44n7AzMEBdbBjpIM1sGYQTXP36JcYSE X-Received: by 2002:a17:906:3515:: with SMTP id r21mr615301eja.518.1617613910387; Mon, 05 Apr 2021 02:11:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617613910; cv=none; d=google.com; s=arc-20160816; b=WVvBV+ihXGAbK2EOtjAKODtL4UjaNEen6L+dSy1a6RDMFyAE9s1hW5gZ7Xwe+zIiaA YAGyPUP3h3iMdJ664nJ5hq39leC6dVOEG1rwcwjJBZIVKjfwe0CzukmUsArSW7eNaT5o VxCDRcTQGEttmzQX4GOc8SetqSkVEK6wfns6VeHyVAuCrWwT1LSKfZR2pEGsRkjBmtyb XgQYMIXkaWDs6ob3BnD5BxWNu+H2eE78wDovTQQ133vhJdXtqm0bXBEQ68JmtO6b7pfv AoH1Cb26tUMlV/j1t8vFut/8TxFMAcEvdAI4xWqEoa8UOiMWU2B/BEurJ87+5TV4UBw1 n3/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eJF54svdCSjIKdUyh7ksMj+Gijn2dON/c48UIHhi2EU=; b=Fv99LfVhsFAcMrQnkr+eAwcjQTUI9XnzpQcWLz7xRznxjK48N5A5t38v8KNX+3VsTU Wx4+d36UON+CSwqDgZPmAYr9BgXH98aeFD+4cJC3D/I2ErUITWXUy5LQPkIV7QaVJf6l ZO69VVnimZJB7ujwFQqKZTKgSgY31s+our7ASHzky2DF9AcPVpYFp4C/S4xsqYK0jjfn jbEzVLMWZPF4GOR6cUkY5rk8MKye3Ky9z/9+7tbLWuXoGiPxk0jbFnZEy1G7WmNeCgt3 j+xlJCBUbilRDr0UitnNgkHokFLEFnGM1a34MaBI7HtoAB66NMeObD/zIL4A9yoHMAQD nL7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=MoGWGT3i; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v20si7281595edr.126.2021.04.05.02.11.49; Mon, 05 Apr 2021 02:11:50 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=MoGWGT3i; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239052AbhDEJLw (ORCPT + 12 others); Mon, 5 Apr 2021 05:11:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:58694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239037AbhDEJLt (ORCPT ); Mon, 5 Apr 2021 05:11:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2097161398; Mon, 5 Apr 2021 09:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613890; bh=OGJAUkr8EK1c6DbvydAiJAYmXQmidWmn7825VsxDhGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MoGWGT3iW0qGKX4BNM3MDm5h0gKMHxcH14dBlqVCQUYPbkMGY8cZM8JFdOwUU3A66 ZtF58uiH4KtjQ4+6+IvzxDgEeEIL+vrxfQv63hXkHEZvG5iSPzLCl/gwwC8pSTc77W PqVkc9jNoEjleqVQAirU9M9m+6EG3Rl3tg2JSnIw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shawn Guo Subject: [PATCH 5.10 117/126] usb: dwc3: qcom: skip interconnect init for ACPI probe Date: Mon, 5 Apr 2021 10:54:39 +0200 Message-Id: <20210405085034.912125152@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085031.040238881@linuxfoundation.org> References: <20210405085031.040238881@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shawn Guo commit 5e4010e36a58978e42b2ee13739ff9b50209c830 upstream. The ACPI probe starts failing since commit bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver"), because there is no interconnect support for ACPI, and of_icc_get() call in dwc3_qcom_interconnect_init() will just return -EINVAL. Fix the problem by skipping interconnect init for ACPI probe, and then the NULL icc_path_ddr will simply just scheild all ICC calls. Fixes: bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver") Signed-off-by: Shawn Guo Cc: stable Link: https://lore.kernel.org/r/20210311060318.25418-1-shawn.guo@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc3/dwc3-qcom.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -244,6 +244,9 @@ static int dwc3_qcom_interconnect_init(s struct device *dev = qcom->dev; int ret; + if (has_acpi_companion(dev)) + return 0; + qcom->icc_path_ddr = of_icc_get(dev, "usb-ddr"); if (IS_ERR(qcom->icc_path_ddr)) { dev_err(dev, "failed to get usb-ddr path: %ld\n",