From patchwork Mon Apr 26 07:30:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427524 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6d12:0:0:0:0 with SMTP id m18csp3587224ejr; Mon, 26 Apr 2021 00:43:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyqV9C+2Mhkwd86jWX4DAuX37EbtjsMv1+155mNwYln7lzhEXpvD2+JK62iNcusQB27PXV X-Received: by 2002:a17:902:8a8c:b029:ed:223b:2881 with SMTP id p12-20020a1709028a8cb02900ed223b2881mr5463524plo.8.1619423007202; Mon, 26 Apr 2021 00:43:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619423007; cv=none; d=google.com; s=arc-20160816; b=MJM8xLtJ51+CZZ/FJGkE7n/2/61uhlzmdagzUzAX4UnAsc6UfHBAWMy4gJGbF5ng8o e4lyY9teHxrIOZV5munoS9vyWyPYjKmANvDNNG6s/PjeeFJbtgPLQbDdXdR6mxNWuGHw 136p1DGLqSpEZUzKRX7dUJjpRJ5nf8DoIgGYOJs/JUORh38NAHRnh8B3sJi5HVw6oSo3 q5vS7+2CX+Gb3BSZ54XFbGlrroJE0zOW7qI3eyAs8rHWd7Owg1ZqhYECD+kqSogeMKCo xE38FToyGhABcPhtWfEIex1pWTnAIh+sp1Mdb77BhTy7gp/2fR6G9FrnjUzZhmQkxMpu uGPw== 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=FAajAH0gthGetNpGanCIfT6zSVfd0X8pDXNWpSCH3js=; b=pPYLeRwRFkh8GjGAK/ZXaVpNHzSmgd9XTPtyVOyOm2PxmhGrosDN5XA23RgJmhJK+t vuIo6+D8W+idzlUJ5hd6YhiQTh3kFQmLR4Yx437O8wh8Ayiz17aup/sy0O07inJlyNIh JgFBjsuCqB6usHpaFI8s5eQJ0/7C33q7fkdqDuqeQ6Mu8/S7mV0F98oX95EiLi8sxZLW OuJ8c0ZVF33Ktb62xZYIpWbHDos30LyP9S3DyIwmqYamQCcZ4ciejRvM43ooFrYRwLW+ 6Lu4ad6u32SqeMj5eIvPeKqw/B43xJg2/STK1dXnYVRop6OSW3LFHrJfRszmDJjR7q/D Brtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SSiO0v1Y; 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 lt4si18063974pjb.32.2021.04.26.00.43.26; Mon, 26 Apr 2021 00:43:27 -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=SSiO0v1Y; 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 S233315AbhDZHoF (ORCPT + 12 others); Mon, 26 Apr 2021 03:44:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:34610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233671AbhDZHnK (ORCPT ); Mon, 26 Apr 2021 03:43:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4B67E613BA; Mon, 26 Apr 2021 07:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422774; bh=P20kHEYm4uUCgh052ecN3NDKkwWJw8kGBA9GgpWC6HE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SSiO0v1Y82pvP8oxEfRmMzNND7DUnvPbkHy2qoK0APUZeYQUZTFyDGPeYalZxDXdQ yATSFXPoh1nmXUGDi4QuTmTTZShrWe/H1bz5BiQa2sgr5hdYBSoOhixumWZXhYUlWR pmVuMTisVX89xhhF29fceHlx/vt5IhiUmQdMUj8g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Andersson , Shawn Guo , Sasha Levin Subject: [PATCH 5.10 22/36] soc: qcom: geni: shield geni_icc_get() for ACPI boot Date: Mon, 26 Apr 2021 09:30:04 +0200 Message-Id: <20210426072819.548695474@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072818.777662399@linuxfoundation.org> References: <20210426072818.777662399@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 [ Upstream commit 0c9fdcdba68208270ae85d39600ea97da1718344 ] Currently, GENI devices like i2c-qcom-geni fails to probe in ACPI boot, if interconnect support is enabled. That's because interconnect driver only supports DT right now. As interconnect is not necessarily required for basic function of GENI devices, let's shield geni_icc_get() call, and then all other ICC calls become nop due to NULL icc_path, so that GENI devices keep working for ACPI boot. Reviewed-by: Bjorn Andersson Signed-off-by: Shawn Guo Link: https://lore.kernel.org/r/20210114112928.11368-1-shawn.guo@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/qcom-geni-se.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.30.2 diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c index be76fddbf524..0dbca679bd32 100644 --- a/drivers/soc/qcom/qcom-geni-se.c +++ b/drivers/soc/qcom/qcom-geni-se.c @@ -741,6 +741,9 @@ int geni_icc_get(struct geni_se *se, const char *icc_ddr) int i, err; const char *icc_names[] = {"qup-core", "qup-config", icc_ddr}; + if (has_acpi_companion(se->dev)) + return 0; + for (i = 0; i < ARRAY_SIZE(se->icc_paths); i++) { if (!icc_names[i]) continue;