From patchwork Mon Apr 5 08:54:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 415288 Delivered-To: patch@linaro.org Received: by 2002:a17:906:5290:0:0:0:0 with SMTP id c16csp3285465ejm; Mon, 5 Apr 2021 02:23:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuruEgRRWUApup1IRbQ/BFgZjtGSUIYbo+QzqrATN0dnnNUIYIF0MM5KU6IP+NR1ZS4htk X-Received: by 2002:a92:d44c:: with SMTP id r12mr8121460ilm.275.1617614637032; Mon, 05 Apr 2021 02:23:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617614637; cv=none; d=google.com; s=arc-20160816; b=B7xKjizRDmx/YB8cl9JRMOKvmp8vIpngUa16+0VtVVbBWkEFjZpKWD57Fu8TuRu5Ju 2Vb/Xl3e02w4URnBahMEJJg5q/iz2dUo8i21/ENxzXQqFwbo6LRZdxf5WPJxCRfYEXu+ ZJyGCeSxtw461JnXosoK1MpzFL8qQrlPFJb9EOjy5Fw1VwvQxOFRlqPfFHfye3xr4FlM cjQYUFM7bkI8e+X5fyrPVF8PoDwsOgHMXynOD7EkzeKH1rxLh6oMAsgFOjRPaD5FWNI/ jpzWdZ7I4KL1+X4bMZHbtk5VyMs62pEO9aosX4rmCp1Vim5MnpWjYR1VLLCfYLtK9IUF fIfg== 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=Mysf10bj4DtoAc9Z32LurTvmEMhdK2METuGu9oX8o7hnyArxehU+OToaPAD9pdUJaR 2gmPcTioMSmOdoipzA5snqqmQ9vaZfv+9NkBtF4rLSaQpUnFB22sabh0foyZoNDP5UgJ 87M9t1+JhUSuxcNfnTxjDJVbWnR2EMyYxHtpJsSYY2OWPQmTbc7wMzguXHmxDUhCq+Sr GJ+KtHdVqIIuLptl/eApqRTzecOMmqMz1TIgFBwLakVNC0zHdxgXzDc5O4Co645SALIv X8zAsAZNcZzIt4Cba4PksawHSTmcqZXOgqA6V9jLthLpxL2vktAWxmiVJHfVvJzw/JHf LSoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QS1+sSSM; 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 o18si14774673jat.92.2021.04.05.02.23.55; Mon, 05 Apr 2021 02:23:57 -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=QS1+sSSM; 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 S240604AbhDEJRx (ORCPT + 12 others); Mon, 5 Apr 2021 05:17:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:39784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239751AbhDEJRr (ORCPT ); Mon, 5 Apr 2021 05:17:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 651AC61398; Mon, 5 Apr 2021 09:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617614261; bh=OGJAUkr8EK1c6DbvydAiJAYmXQmidWmn7825VsxDhGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QS1+sSSMaie/aQmwfy8U1hph1AZTsUAfhmiSTn7qJhpgedEgbKryKj6kBKsMQg5A2 0T7i5aa2bw20l7T93ea4R2Iyq2xL+s3qIE2N7aVGRd6JJbWLiHZasfBkHMAeoH3nIK Gw6DLp35aKA/ou8acZehcgWB2G5s6A2HufcFsVQw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shawn Guo Subject: [PATCH 5.11 142/152] usb: dwc3: qcom: skip interconnect init for ACPI probe Date: Mon, 5 Apr 2021 10:54:51 +0200 Message-Id: <20210405085038.833450909@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085034.233917714@linuxfoundation.org> References: <20210405085034.233917714@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",