From patchwork Mon Apr 26 07:30:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 427531 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6d12:0:0:0:0 with SMTP id m18csp3589279ejr; Mon, 26 Apr 2021 00:46:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCLCv0lkvMnuNo1RoIILmCf9rUrWjTMZCFHISBFu42wxhCsKs4k9xAtjqpnUeSaNlskAOq X-Received: by 2002:a17:903:304b:b029:eb:4cf:8321 with SMTP id u11-20020a170903304bb02900eb04cf8321mr17281949pla.40.1619423131599; Mon, 26 Apr 2021 00:45:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619423131; cv=none; d=google.com; s=arc-20160816; b=RdtL+Db6ylniz1gkFI6WhHw2Xhn/SfhPGVFhtcOWLv/dOrTsLrOZqGigP23sLgSEOK xlypF4vd01k/Tr/u4NUj+FMmBeLZsKPEYrfwr3L0bpPy55nD+lnrOIbcN43fAGSam2GX EUKjxkIWbJ1rA9pwqonN5JNvcLkSnh+wEqhHKiTQ3Fl0ujOUYkDE+vadOF4Sg9eTThUh xTituHCHBRUKY3a44/iZ8sNVje2DPJtpuiMLOjbhXN0HEmZ1BvdFlZn64TuQeRXM0wMt od5lTjocpWdAWoTBP35/XaVtkbzHhJMA4WSSThiCJe55/QZHRZzBJLOJq35+fisKAW3j DG2g== 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=k6+or8w0hlPS9BfUysHRQJyGyr8qp36gvpVWtvdr5/8=; b=ZiMcEtboBrJSXkYgHoy8Z7CVImx3XHAjNWOItI92mn4EZbOFp2BIf+5IT8lSj9CTgQ LD9+LPJyc/E0s7sa1aScToC2IyVWynTYP07+5U37a8WIx1u8sRQkX1sX2yryXeK8IZyX MBfPj2wAzm0hnyCLghP9ZoJT1y+Qzc9/iKvVdblWmdeeQ1FZYqYRpGAFoFTF9yt9nHEk 4zH2KOWYHIYbsvnnSNB9rt1ZQgjz+71hmEy9Q1NSokOyedNYQBpQUaF1sHJLDWzaTn9X UrJOJl8ZA5WpNYOYujlbb2fIovAA8Fi4/vt0dPtAkgHK5zGL9U//2XIUWsaAzur3JlWt Cq/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WUBnr9kv; 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 n3si15446916pgp.546.2021.04.26.00.45.31; Mon, 26 Apr 2021 00:45:31 -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=WUBnr9kv; 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 S232901AbhDZHqK (ORCPT + 12 others); Mon, 26 Apr 2021 03:46:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:33434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234225AbhDZHpC (ORCPT ); Mon, 26 Apr 2021 03:45:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B39726115B; Mon, 26 Apr 2021 07:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422920; bh=fLGDTO4vZkaAfbFcATg/22G+9ZUgFi8xRlu4Z6L0ViQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WUBnr9kvN5/kvxFNV6XoEaU/8nLx84bxmURVRin1NcNP8Aa4EBJXCNrLU4jOu1ijE 6AzuJTTn8hn5i8BGe/goqKq7t9sPXx97LTrPqV2Su9jRuSotShfPAyIn6ynGvfZFlu YJP+OTUroopVLOGE3YGDBJfvQQMmvvIlEECfncz8= 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.11 27/41] soc: qcom: geni: shield geni_icc_get() for ACPI boot Date: Mon, 26 Apr 2021 09:30:14 +0200 Message-Id: <20210426072820.608781907@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072819.666570770@linuxfoundation.org> References: <20210426072819.666570770@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 1fd29f93ff6d..5bdfb1565c14 100644 --- a/drivers/soc/qcom/qcom-geni-se.c +++ b/drivers/soc/qcom/qcom-geni-se.c @@ -756,6 +756,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;