From nobody Sat Apr 18 19:11:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00060C43334 for ; Tue, 12 Jul 2022 02:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229928AbiGLCAJ (ORCPT ); Mon, 11 Jul 2022 22:00:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229767AbiGLCAE (ORCPT ); Mon, 11 Jul 2022 22:00:04 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2324B2F037 for ; Mon, 11 Jul 2022 19:00:02 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id o5-20020a17090a3d4500b001ef76490983so6559412pjf.2 for ; Mon, 11 Jul 2022 19:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ti2okOxO+DUVTFPOrDB0DRHWNFsTePHaWE122EF3rHs=; b=PJNDe6a0viA6D/AS/ZgglVxwJpp2tGbvA73cfqhpomH1a22X/x8cXmgM7v8kH44h0d lP0vc4kvgUKlsaEtbH1tY45TIhsy8VtHvXQIblvyyE60Mdd3uonNwou0VI8RKz+85NL9 KriFmr0YEkbG7E17CFHyTIqNNVl/umHMo4bVTJ1csZG3i64FW+PD3+WYNE5PZ5sdXTOA e9fpafyx0u0wzVrRItJBgfs2g+/6fSxiJVVBGow/3sC6Dux9ZuRXUBXjQGIUKTsSEIdU tvONA5vyLp0RtbSNnZdfQQ85UAi0qTsqkqasdE2Q+/+BiuMh3TuR0TB3mbLasoD2Ml2J yApw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ti2okOxO+DUVTFPOrDB0DRHWNFsTePHaWE122EF3rHs=; b=V+1txRs31NiIzE6IYPkZC0YZRzY/vgr16vgWaDyvm2qyIE8ADJnNP8u4di76N+1GLv 0QSliXHhmLhCI9wwZ94x3YW+KVhJVM2LJgISVpFAR5yUu9Gzy1yrpisavUiHgDZKCcTj qPzE5ajZePx/d2RkvRXDkW0cu3E15YgjwwZNcQ94MQ6r/qZX+wAnSbEpvCXx6ah55pIT Vq3Hmsd13GsriJh9SmlLib9qCVxAK9PwYQhZxLINd1MNV1MdMlkRERG+jtkSS2Q29EJJ MExZRVw3Bx6BrLtTwXToZub5cGCy9VMF4rh9KEwk5AV9aSwKPF1NZ5QzZZkloYsMaryA 6Cmw== X-Gm-Message-State: AJIora8xA8blAwbS2csxe/g5t2X16Bicp1nKOJlDlvx8D5b3GxmaNSnr ePlsW+5YSwZrGCFkLf9rjl+HHA== X-Google-Smtp-Source: AGRyM1vr/s5icczDTeI/15DhHR34Rs1a7o9x3e2jFdM7FZ8eBlMawnE/xiA1Rm9ZX/EH76J21tNwvg== X-Received: by 2002:a17:903:1105:b0:16c:32e4:6453 with SMTP id n5-20020a170903110500b0016c32e46453mr15238400plh.131.1657591201508; Mon, 11 Jul 2022 19:00:01 -0700 (PDT) Received: from leo-build-box.lan (n058152077182.netvigator.com. [58.152.77.182]) by smtp.gmail.com with ESMTPSA id x5-20020a17090a6b4500b001ef76dbae28sm5425821pjl.36.2022.07.11.18.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 19:00:01 -0700 (PDT) From: Leo Yan To: Georgi Djakov , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan , Krzysztof Kozlowski Subject: [PATCH v6 1/5] dt-bindings: interconnect: Update property for icc-rpm path tag Date: Tue, 12 Jul 2022 09:59:25 +0800 Message-Id: <20220712015929.2789881-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712015929.2789881-1-leo.yan@linaro.org> References: <20220712015929.2789881-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To support path tag in icc-rpm driver, the "#interconnect-cells" property is updated as enumerate values: 1 or 2. Setting to 1 means it is compatible with old DT binding that interconnect path only contains node id; if set to 2 for "#interconnect-cells" property, then the second specifier is used as a tag (e.g. vote for which buckets). Signed-off-by: Leo Yan Acked-by: Krzysztof Kozlowski --- .../devicetree/bindings/interconnect/qcom,rpm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b= /Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 8a676fef8c1d..4b37aa88a375 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -45,7 +45,11 @@ properties: - qcom,sdm660-snoc =20 '#interconnect-cells': - const: 1 + description: | + Value: <1> is one cell in an interconnect specifier for the + interconnect node id, <2> requires the interconnect node id and an + extra path tag. + enum: [ 1, 2 ] =20 clocks: minItems: 2 --=20 2.25.1 From nobody Sat Apr 18 19:11:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0D2CC43334 for ; Tue, 12 Jul 2022 02:00:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229817AbiGLCAL (ORCPT ); Mon, 11 Jul 2022 22:00:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbiGLCAH (ORCPT ); Mon, 11 Jul 2022 22:00:07 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0124355088 for ; Mon, 11 Jul 2022 19:00:05 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id v4-20020a17090abb8400b001ef966652a3so10010668pjr.4 for ; Mon, 11 Jul 2022 19:00:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iIetlnAVO8vDaATuFQD/cr++Aq+FOWz0sX+Jtq5yB3U=; b=HfPSkOmcRSSHT5bWGTjam5kWCuFBOqnkUzYqnO+ANFbH159s2w+wk5iEGpx9E3G6vl 5AweHn0ZS7MMuU4Mi+VjT6heOYSekUCzHFGeMtlmDA7Jj7sY92F09rTmglLGFLP8gjZU PGXZE3MMpJB33K+jalkDBkcckTCfHaep119GyRP3HG92FqpZWDhHyyWE9iAllrYPLELD iRLiFqo/hKNY808SSvZWsGWNVgiGbJD0uA6gwCu+OQ+1HMheuwZR7ZxDfh3NzZN4JGu/ 7PpYON8yz41THVRxafnwTTSU9MAqeV6ILS85suwesMu6nwYCxqXk7yjErkKnlqxB+FRR RY6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iIetlnAVO8vDaATuFQD/cr++Aq+FOWz0sX+Jtq5yB3U=; b=3SebJBsUPGLFusRqrOsJQnmhX3nle7nR2AmbQxaZbPR+Q7HRsj1VhLHQSinhCtLDj+ T/emzCVpZcQTyNaceF0r2kRZyc1VymyDPsJ/wMq+ZmKUqGuaCuoOxbq/2Uo5qEDFxcJ7 KOyhVxhu7RyblCkbSOmz0WuErQ/FXw57TYz+xgWRlHFpzJYSzQugT/fE5dYY2g/Pjvq5 crOovU5138D+sjDTD1px/fZSTMNYuyu3VMzhgNgoF8NU/wtn231+GP1HVYx6TnpZfwmE F+Bbtx7blQ1nonXmvKus4P1V3iEnK6hWqYbDWGfsm5IOJrg4VqxVcZ+pto4Z39BZJGaJ 6Gkg== X-Gm-Message-State: AJIora+6CUQHJhwBnJydRFXEzgHnTNuoP+Jvkl3JuMMage7BDQEh86Rc Nn8O3HTg1+WQ3cRsVUHREV00FA== X-Google-Smtp-Source: AGRyM1vGj+GT6VEFO7PTBURNAgdQ2y5E6MdsJS7O5opzSycqamdiRqo+HTTTAKpXwOS2fWzOsdBquw== X-Received: by 2002:a17:902:c641:b0:16b:dd82:c04 with SMTP id s1-20020a170902c64100b0016bdd820c04mr21471314pls.144.1657591205354; Mon, 11 Jul 2022 19:00:05 -0700 (PDT) Received: from leo-build-box.lan (n058152077182.netvigator.com. [58.152.77.182]) by smtp.gmail.com with ESMTPSA id x5-20020a17090a6b4500b001ef76dbae28sm5425821pjl.36.2022.07.11.19.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 19:00:04 -0700 (PDT) From: Leo Yan To: Georgi Djakov , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan , Dmitry Baryshkov Subject: [PATCH v6 2/5] interconnect: qcom: Move qcom_icc_xlate_extended() to a common file Date: Tue, 12 Jul 2022 09:59:26 +0800 Message-Id: <20220712015929.2789881-3-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712015929.2789881-1-leo.yan@linaro.org> References: <20220712015929.2789881-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" since there have conflict between two headers icc-rpmh.h and icc-rpm.h, the function qcom_icc_xlate_extended() is declared in icc-rpmh.h thus it cannot be used by icc-rpm driver. Move the function to a new common file icc-common.c so that allow it to be called by multiple drivers. Signed-off-by: Leo Yan Reviewed-by: Dmitry Baryshkov --- drivers/interconnect/qcom/Makefile | 3 +++ drivers/interconnect/qcom/icc-common.c | 34 ++++++++++++++++++++++++++ drivers/interconnect/qcom/icc-common.h | 13 ++++++++++ drivers/interconnect/qcom/icc-rpmh.c | 26 +------------------- drivers/interconnect/qcom/icc-rpmh.h | 1 - drivers/interconnect/qcom/sm8450.c | 1 + 6 files changed, 52 insertions(+), 26 deletions(-) create mode 100644 drivers/interconnect/qcom/icc-common.c create mode 100644 drivers/interconnect/qcom/icc-common.h diff --git a/drivers/interconnect/qcom/Makefile b/drivers/interconnect/qcom= /Makefile index 8d1fe9d38ac3..e6451470f812 100644 --- a/drivers/interconnect/qcom/Makefile +++ b/drivers/interconnect/qcom/Makefile @@ -1,5 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 =20 +obj-$(CONFIG_INTERCONNECT_QCOM) +=3D interconnect_qcom.o + +interconnect_qcom-y :=3D icc-common.o icc-bcm-voter-objs :=3D bcm-voter.o qnoc-msm8916-objs :=3D msm8916.o qnoc-msm8939-objs :=3D msm8939.o diff --git a/drivers/interconnect/qcom/icc-common.c b/drivers/interconnect/= qcom/icc-common.c new file mode 100644 index 000000000000..0822ce207b5d --- /dev/null +++ b/drivers/interconnect/qcom/icc-common.c @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2022 Linaro Ltd. + */ + +#include +#include + +#include "icc-common.h" + +struct icc_node_data *qcom_icc_xlate_extended(struct of_phandle_args *spec= , void *data) +{ + struct icc_node_data *ndata; + struct icc_node *node; + + node =3D of_icc_xlate_onecell(spec, data); + if (IS_ERR(node)) + return ERR_CAST(node); + + ndata =3D kzalloc(sizeof(*ndata), GFP_KERNEL); + if (!ndata) + return ERR_PTR(-ENOMEM); + + ndata->node =3D node; + + if (spec->args_count =3D=3D 2) + ndata->tag =3D spec->args[1]; + + if (spec->args_count > 2) + pr_warn("%pOF: Too many arguments, path tag is not parsed\n", spec->np); + + return ndata; +} +EXPORT_SYMBOL_GPL(qcom_icc_xlate_extended); diff --git a/drivers/interconnect/qcom/icc-common.h b/drivers/interconnect/= qcom/icc-common.h new file mode 100644 index 000000000000..33bb2c38dff3 --- /dev/null +++ b/drivers/interconnect/qcom/icc-common.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2022 Linaro Ltd. + */ + +#ifndef __DRIVERS_INTERCONNECT_QCOM_ICC_COMMON_H__ +#define __DRIVERS_INTERCONNECT_QCOM_ICC_COMMON_H__ + +#include + +struct icc_node_data *qcom_icc_xlate_extended(struct of_phandle_args *spec= , void *data); + +#endif diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qc= om/icc-rpmh.c index 3c40076eb5fb..505d53e80d96 100644 --- a/drivers/interconnect/qcom/icc-rpmh.c +++ b/drivers/interconnect/qcom/icc-rpmh.c @@ -11,6 +11,7 @@ #include =20 #include "bcm-voter.h" +#include "icc-common.h" #include "icc-rpmh.h" =20 /** @@ -100,31 +101,6 @@ int qcom_icc_set(struct icc_node *src, struct icc_node= *dst) } EXPORT_SYMBOL_GPL(qcom_icc_set); =20 -struct icc_node_data *qcom_icc_xlate_extended(struct of_phandle_args *spec= , void *data) -{ - struct icc_node_data *ndata; - struct icc_node *node; - - node =3D of_icc_xlate_onecell(spec, data); - if (IS_ERR(node)) - return ERR_CAST(node); - - ndata =3D kzalloc(sizeof(*ndata), GFP_KERNEL); - if (!ndata) - return ERR_PTR(-ENOMEM); - - ndata->node =3D node; - - if (spec->args_count =3D=3D 2) - ndata->tag =3D spec->args[1]; - - if (spec->args_count > 2) - pr_warn("%pOF: Too many arguments, path tag is not parsed\n", spec->np); - - return ndata; -} -EXPORT_SYMBOL_GPL(qcom_icc_xlate_extended); - /** * qcom_icc_bcm_init - populates bcm aux data and connect qnodes * @bcm: bcm to be initialized diff --git a/drivers/interconnect/qcom/icc-rpmh.h b/drivers/interconnect/qc= om/icc-rpmh.h index d29929461c17..04391c1ba465 100644 --- a/drivers/interconnect/qcom/icc-rpmh.h +++ b/drivers/interconnect/qcom/icc-rpmh.h @@ -131,7 +131,6 @@ struct qcom_icc_desc { int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, u32 peak_bw, u32 *agg_avg, u32 *agg_peak); int qcom_icc_set(struct icc_node *src, struct icc_node *dst); -struct icc_node_data *qcom_icc_xlate_extended(struct of_phandle_args *spec= , void *data); int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev); void qcom_icc_pre_aggregate(struct icc_node *node); int qcom_icc_rpmh_probe(struct platform_device *pdev); diff --git a/drivers/interconnect/qcom/sm8450.c b/drivers/interconnect/qcom= /sm8450.c index 7e3d372b712f..e821fd0b2f66 100644 --- a/drivers/interconnect/qcom/sm8450.c +++ b/drivers/interconnect/qcom/sm8450.c @@ -12,6 +12,7 @@ #include =20 #include "bcm-voter.h" +#include "icc-common.h" #include "icc-rpmh.h" #include "sm8450.h" =20 --=20 2.25.1 From nobody Sat Apr 18 19:11:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 871A1C433EF for ; Tue, 12 Jul 2022 02:00:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231365AbiGLCAT (ORCPT ); Mon, 11 Jul 2022 22:00:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbiGLCAL (ORCPT ); Mon, 11 Jul 2022 22:00:11 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1150C7CB4F for ; Mon, 11 Jul 2022 19:00:09 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id j12so5984205plj.8 for ; Mon, 11 Jul 2022 19:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5+gYIpHsZ47Eh2pxDFNpWAcmAPIFH2rD2QueXVUKLjQ=; b=F7+XFiMayv44DZU1u90VfmYwY2lDY3XtWAg/SoBU2WdqVyiRqfO/MK4aaA1a+GI0/i AmRAGXmSTTBOoK9G68DhJMLf2LH5i2ZPgg1ZcJ9l8O4zoXXwlMax7YFxoVpAqECf7KPu 5J2urz5HU8UqQUxKjcTQFiQG0j2/LprbKR1q0RTjYV1KSsRgWb+yEq6q+YNyh9ji2xkM 1gJQ76pT7pxMceQVrA2rBj8S/IJ9brmRVEAmTBgF73GRbqqZF0GgSMEmXMu139/kcVLv 3ngBg477iXfEe8EnSzzjpGr9+wJ4EK/tqJNFH6sfIM1ZsWtqj9RjLiUxhCns9W6b8XQ3 6G1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5+gYIpHsZ47Eh2pxDFNpWAcmAPIFH2rD2QueXVUKLjQ=; b=JPC11SCyux5GhmvM7z3/Z+NGtGiEXFw5BKGSsvbn647437+s+TvbEqzeKHrg2RkGai k2dJlEkec7K+gP+IeXdKJ7INmnMlkIUtWRVFuu4wfvUQeigc/FpdjO13JJwAGfxXhW4/ ML57jjxm5w3GN76TrcJRAkcFL/cnNIMa+TvxnlkRO81UjBwHtQmlVTP6fGywannqcD8b 8PoxV+Hv3s5Sbcsfrg8smzIGXqo67USiozFANbg70JucI5MtfpMxA1OtF9s0tpJXMMJE RS2qGN6y/nAVTzWfuX0ZnpYLQ3vZLUsRA5orGdYgHBIQ5yama4DHpDdHMAA28viKCiJZ yM7w== X-Gm-Message-State: AJIora9m4kdFv8muUqTL7adDakhxK2tdNrVAbqx242cmL0YyeaMqGMTc bKlxMSjKbUzuqPb+Cta3613KVQ== X-Google-Smtp-Source: AGRyM1uVTipl6JQXD+xSwYRPGggDqLZ8DuA4ILpqrtlHnYeSwS/6TqN+dBNg+DMSiNiVAunngq9YZw== X-Received: by 2002:a17:903:1210:b0:168:dc70:e9d8 with SMTP id l16-20020a170903121000b00168dc70e9d8mr21845995plh.92.1657591209040; Mon, 11 Jul 2022 19:00:09 -0700 (PDT) Received: from leo-build-box.lan (n058152077182.netvigator.com. [58.152.77.182]) by smtp.gmail.com with ESMTPSA id x5-20020a17090a6b4500b001ef76dbae28sm5425821pjl.36.2022.07.11.19.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 19:00:08 -0700 (PDT) From: Leo Yan To: Georgi Djakov , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan , Dmitry Baryshkov Subject: [PATCH v6 3/5] interconnect: qcom: icc-rpm: Change to use qcom_icc_xlate_extended() Date: Tue, 12 Jul 2022 09:59:27 +0800 Message-Id: <20220712015929.2789881-4-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712015929.2789881-1-leo.yan@linaro.org> References: <20220712015929.2789881-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This commit changes to use callback qcom_icc_xlate_extended(). This is a preparation for population path tags from the interconnect DT binding, it doesn't introduce functionality change for the existed DT binding without path tags. Signed-off-by: Leo Yan Reviewed-by: Dmitry Baryshkov --- drivers/interconnect/qcom/icc-rpm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qco= m/icc-rpm.c index 7e8bcbb2f5db..8c9d5cc7276c 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -16,6 +16,7 @@ #include =20 #include "smd-rpm.h" +#include "icc-common.h" #include "icc-rpm.h" =20 /* QNOC QoS */ @@ -414,7 +415,7 @@ int qnoc_probe(struct platform_device *pdev) provider->dev =3D dev; provider->set =3D qcom_icc_set; provider->aggregate =3D icc_std_aggregate; - provider->xlate =3D of_icc_xlate_onecell; + provider->xlate_extended =3D qcom_icc_xlate_extended; provider->data =3D data; =20 ret =3D icc_provider_add(provider); --=20 2.25.1 From nobody Sat Apr 18 19:11:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4D7EC43334 for ; Tue, 12 Jul 2022 02:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231127AbiGLCAZ (ORCPT ); Mon, 11 Jul 2022 22:00:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230319AbiGLCAR (ORCPT ); Mon, 11 Jul 2022 22:00:17 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0171F8C146 for ; Mon, 11 Jul 2022 19:00:13 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id c15so1161240pla.6 for ; Mon, 11 Jul 2022 19:00:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rsuVX4+Fk0zEwgcAXa4p8Pic6TFa+DVD5bKVK4M/r5c=; b=vYTRoalIhOF+nKTiZoFImZ9iTMUHU65EKw3h40WV0sfhu/d/HW+lh1rMcySSoFIX87 /iQii+hu0HF+p3+LmLIPg960iL6Ap55/nRrqhnFUl5AZFZ5phg97Zzj8N+IG25ooXAZQ Tlk2Qq5YzP9CDxbZs0q2uQ/u6PY85YP4L8bmZ07o3MIwd28MrWJU79fOCXaIzOcfMrAi XJiF6Re8FeUSwKswx8jDITiQyh5oeDLbsCUWj9hg9xvIoM3/jg/HLMbDT5pMcS3RdwHN Gwrb8/jigWfkOOButJsUaknxK0ve8FXcVySFBMHmwC9sTb1b9nvfqezzXiLRX8nNsHge J1uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rsuVX4+Fk0zEwgcAXa4p8Pic6TFa+DVD5bKVK4M/r5c=; b=qFM159w2V/haqlYP1xL9Ule76RY/pryqWZAkReRChI5YtRu82i/R4/0ofibLJC8wUY abydZ6szuUxTyoOSi62VJ94FeGMtfqdyYffoMgWwo1PTR7Hf84bX3D2fTgqlceY2f7Xa tOOV2dzjEnj0pn/f/6Cd7J2rRSROXMvKQf6gJqeDxkgNKkkJ6l2y6kN95YPpppu4LeQ3 a4fXdPFqf5dmcrgGg9xHwNwSr4MkrCK8QqvFiUdOb9/GsgqI9SBpifSkeS/MaodxE0gG 3OlMpCW7u7/dETcjaS8eCsl5LwF9++Mdqq3ZvZvM/Q0RSIXdtx1et1Z7KL+wjBQCmMEC QA5g== X-Gm-Message-State: AJIora9YDSxkhRKmZ9kjPh8Pq1eBOCfrYJAjvcAbjO5SKA5k4pAwja+B wnCBGzl0dCSpzL6z3RdYzOYG8w== X-Google-Smtp-Source: AGRyM1sk/6vX00lbG2KXqurWWloZZq1JohhFyh20A8u3+Gaikm0W/BjEZs8fNbwXcQ8Pv4AtAiSSRw== X-Received: by 2002:a17:902:e9d3:b0:16b:fe8c:e89b with SMTP id 19-20020a170902e9d300b0016bfe8ce89bmr21981830plk.81.1657591212581; Mon, 11 Jul 2022 19:00:12 -0700 (PDT) Received: from leo-build-box.lan (n058152077182.netvigator.com. [58.152.77.182]) by smtp.gmail.com with ESMTPSA id x5-20020a17090a6b4500b001ef76dbae28sm5425821pjl.36.2022.07.11.19.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 19:00:12 -0700 (PDT) From: Leo Yan To: Georgi Djakov , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH v6 4/5] interconnect: qcom: icc-rpm: Support multiple buckets Date: Tue, 12 Jul 2022 09:59:28 +0800 Message-Id: <20220712015929.2789881-5-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712015929.2789881-1-leo.yan@linaro.org> References: <20220712015929.2789881-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The current interconnect rpm driver uses a single aggregate bandwidth to calculate the clock rates for both active and sleep clocks; therefore, it has no chance to separate bandwidth requests for these two kinds of clocks. This patch studies the implementation from interconnect rpmh driver to support multiple buckets. The rpmh driver provides three buckets for AMC, WAKE, and SLEEP; this driver only needs to use WAKE and SLEEP buckets, but we keep the same way with rpmh driver, this can allow us to reuse the DT binding and avoid to define duplicated data structures. This patch introduces two callbacks: qcom_icc_pre_bw_aggregate() is used to clean up bucket values before aggregate bandwidth requests, and qcom_icc_bw_aggregate() is to aggregate bandwidth for buckets. Signed-off-by: Leo Yan --- drivers/interconnect/qcom/icc-rpm.c | 51 ++++++++++++++++++++++++++++- drivers/interconnect/qcom/icc-rpm.h | 6 ++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qco= m/icc-rpm.c index 8c9d5cc7276c..d27b1582521f 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -254,6 +254,54 @@ static int __qcom_icc_set(struct icc_node *n, struct q= com_icc_node *qn, return 0; } =20 +/** + * qcom_icc_pre_bw_aggregate - cleans up values before re-aggregate reques= ts + * @node: icc node to operate on + */ +static void qcom_icc_pre_bw_aggregate(struct icc_node *node) +{ + struct qcom_icc_node *qn; + size_t i; + + qn =3D node->data; + for (i =3D 0; i < QCOM_ICC_NUM_BUCKETS; i++) { + qn->sum_avg[i] =3D 0; + qn->max_peak[i] =3D 0; + } +} + +/** + * qcom_icc_bw_aggregate - aggregate bw for buckets indicated by tag + * @node: node to aggregate + * @tag: tag to indicate which buckets to aggregate + * @avg_bw: new bw to sum aggregate + * @peak_bw: new bw to max aggregate + * @agg_avg: existing aggregate avg bw val + * @agg_peak: existing aggregate peak bw val + */ +static int qcom_icc_bw_aggregate(struct icc_node *node, u32 tag, u32 avg_b= w, + u32 peak_bw, u32 *agg_avg, u32 *agg_peak) +{ + size_t i; + struct qcom_icc_node *qn; + + qn =3D node->data; + + if (!tag) + tag =3D QCOM_ICC_TAG_ALWAYS; + + for (i =3D 0; i < QCOM_ICC_NUM_BUCKETS; i++) { + if (tag & BIT(i)) { + qn->sum_avg[i] +=3D avg_bw; + qn->max_peak[i] =3D max_t(u32, qn->max_peak[i], peak_bw); + } + } + + *agg_avg +=3D avg_bw; + *agg_peak =3D max_t(u32, *agg_peak, peak_bw); + return 0; +} + static int qcom_icc_set(struct icc_node *src, struct icc_node *dst) { struct qcom_icc_provider *qp; @@ -414,7 +462,8 @@ int qnoc_probe(struct platform_device *pdev) INIT_LIST_HEAD(&provider->nodes); provider->dev =3D dev; provider->set =3D qcom_icc_set; - provider->aggregate =3D icc_std_aggregate; + provider->pre_aggregate =3D qcom_icc_pre_bw_aggregate; + provider->aggregate =3D qcom_icc_bw_aggregate; provider->xlate_extended =3D qcom_icc_xlate_extended; provider->data =3D data; =20 diff --git a/drivers/interconnect/qcom/icc-rpm.h b/drivers/interconnect/qco= m/icc-rpm.h index ebee9009301e..a49af844ab13 100644 --- a/drivers/interconnect/qcom/icc-rpm.h +++ b/drivers/interconnect/qcom/icc-rpm.h @@ -6,6 +6,8 @@ #ifndef __DRIVERS_INTERCONNECT_QCOM_ICC_RPM_H #define __DRIVERS_INTERCONNECT_QCOM_ICC_RPM_H =20 +#include + #define RPM_BUS_MASTER_REQ 0x73616d62 #define RPM_BUS_SLAVE_REQ 0x766c7362 =20 @@ -65,6 +67,8 @@ struct qcom_icc_qos { * @links: an array of nodes where we can go next while traversing * @num_links: the total number of @links * @buswidth: width of the interconnect between a node and the bus (bytes) + * @sum_avg: current sum aggregate value of all avg bw requests + * @max_peak: current max aggregate value of all peak bw requests * @mas_rpm_id: RPM id for devices that are bus masters * @slv_rpm_id: RPM id for devices that are bus slaves * @qos: NoC QoS setting parameters @@ -75,6 +79,8 @@ struct qcom_icc_node { const u16 *links; u16 num_links; u16 buswidth; + u64 sum_avg[QCOM_ICC_NUM_BUCKETS]; + u64 max_peak[QCOM_ICC_NUM_BUCKETS]; int mas_rpm_id; int slv_rpm_id; struct qcom_icc_qos qos; --=20 2.25.1 From nobody Sat Apr 18 19:11:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86847CCA481 for ; Tue, 12 Jul 2022 02:00:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231382AbiGLCAf (ORCPT ); Mon, 11 Jul 2022 22:00:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbiGLCAU (ORCPT ); Mon, 11 Jul 2022 22:00:20 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EEC255088 for ; Mon, 11 Jul 2022 19:00:17 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id j3so6268137pfb.6 for ; Mon, 11 Jul 2022 19:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JrLh+9lwzn/hVK+x3i4SIxhqvOdLJGufkP7mGEFOm9c=; b=JyNI/FbvGc5ZUsCcMu6of1CIJXsDPu4qESFa1L5GYZGcSmZSGD8HmF22chR05DLpNR IwQQMOPJil0jwSX2iHcKnJ3iSxEYyRuknAPgeLLG+j2fHk9ZexDrMQ/XNY4hF7QLAtMg Kc3IPFq3PPIYubiXI8KZjFtz33sD55mf++AVbQPYU9y9Su/kRVTpr+H6kPLBSZ/owavj JmyCUWr9oqqYOK8yVHEcoI+dEgjMzxaqTnjaUCJ5/E4wvrRLMhcI1JQApHRZj7G1E7lZ oTLUus32jmtgFUQkaDf3Wt4+nVFSKLzuCu+y6hHUOpx24WdzxWfRYgj1d3NriUnmOJMB xNow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JrLh+9lwzn/hVK+x3i4SIxhqvOdLJGufkP7mGEFOm9c=; b=VdYNm6zukYbueye6dOGpsQOB75LucaYgK79oqu6ERaITTZd4OdLO5vB/AKfREnr4dS wVegXe3hEEnDAlTVUOLov96xczCtIsgTHm2Nae0D4NeihBLTJ6lKyE9DKfOtwJQZVSyX dZIoIne/o+7giWCU7eOyXhBwsJhwUChHhzQHH73vEco9oyHBWJG0ejMBIn4w6QVcSHbR BgTqVM7lBuEI7Sk1e6Jhd7SI7YSSQU/ZKOodtu7zd3VeL8CE4TfVdxaSx0naR1SZKhJL 68V6Qhc4bVJus4nXjLbjtxvG5SaZ4HzIElJ6hfepL6/xJBBdUCT5ZWXkvOV19dHZ8fGj HIdg== X-Gm-Message-State: AJIora/E3K1Q39aT17aAG+fplxIo3oZgac71upSzozSok406tZKfTKd4 aOMXnAX4RCQQFUtgoPrDmwjYCA== X-Google-Smtp-Source: AGRyM1vvGyt5VystS+i0DJ7EvZGc01AZoMkAN3JlckCOtoxswxdxThw9EmkygDkwOIo8HzjlAeHQuA== X-Received: by 2002:a62:5bc5:0:b0:528:c346:9632 with SMTP id p188-20020a625bc5000000b00528c3469632mr21427527pfb.48.1657591216051; Mon, 11 Jul 2022 19:00:16 -0700 (PDT) Received: from leo-build-box.lan (n058152077182.netvigator.com. [58.152.77.182]) by smtp.gmail.com with ESMTPSA id x5-20020a17090a6b4500b001ef76dbae28sm5425821pjl.36.2022.07.11.19.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 19:00:15 -0700 (PDT) From: Leo Yan To: Georgi Djakov , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH v6 5/5] interconnect: qcom: icc-rpm: Set bandwidth and clock for bucket values Date: Tue, 12 Jul 2022 09:59:29 +0800 Message-Id: <20220712015929.2789881-6-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712015929.2789881-1-leo.yan@linaro.org> References: <20220712015929.2789881-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This commit uses buckets for support bandwidth and clock rates. It introduces a new function qcom_icc_bus_aggregate() to calculate the aggregate average and peak bandwidths for every bucket, and also it calculates the maximum value of aggregated average bandwidth across all buckets. The maximum aggregated average is used to calculate the final bandwidth requests. And we can set the clock rate per bucket, we use SLEEP bucket as default bucket if a platform doesn't enable the interconnect path tags in DT binding; otherwise, we use WAKE bucket to set active clock and use SLEEP bucket for other clocks. So far we don't use AMC bucket. Signed-off-by: Leo Yan --- drivers/interconnect/qcom/icc-rpm.c | 75 +++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 14 deletions(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qco= m/icc-rpm.c index d27b1582521f..7f6a70e0256a 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -302,18 +302,57 @@ static int qcom_icc_bw_aggregate(struct icc_node *nod= e, u32 tag, u32 avg_bw, return 0; } =20 +/** + * qcom_icc_bus_aggregate - aggregate bandwidth by traversing all nodes + * @provider: generic interconnect provider + * @agg_avg: an array for aggregated average bandwidth of buckets + * @agg_peak: an array for aggregated peak bandwidth of buckets + * @max_agg_avg: pointer to max value of aggregated average bandwidth + */ +static void qcom_icc_bus_aggregate(struct icc_provider *provider, + u64 *agg_avg, u64 *agg_peak, + u64 *max_agg_avg) +{ + struct icc_node *node; + struct qcom_icc_node *qn; + int i; + + /* Initialise aggregate values */ + for (i =3D 0; i < QCOM_ICC_NUM_BUCKETS; i++) { + agg_avg[i] =3D 0; + agg_peak[i] =3D 0; + } + + *max_agg_avg =3D 0; + + /* + * Iterate nodes on the interconnect and aggregate bandwidth + * requests for every bucket. + */ + list_for_each_entry(node, &provider->nodes, node_list) { + qn =3D node->data; + for (i =3D 0; i < QCOM_ICC_NUM_BUCKETS; i++) { + agg_avg[i] +=3D qn->sum_avg[i]; + agg_peak[i] =3D max_t(u64, agg_peak[i], qn->max_peak[i]); + } + } + + /* Find maximum values across all buckets */ + for (i =3D 0; i < QCOM_ICC_NUM_BUCKETS; i++) + *max_agg_avg =3D max_t(u64, *max_agg_avg, agg_avg[i]); +} + static int qcom_icc_set(struct icc_node *src, struct icc_node *dst) { struct qcom_icc_provider *qp; struct qcom_icc_node *src_qn =3D NULL, *dst_qn =3D NULL; struct icc_provider *provider; - struct icc_node *n; u64 sum_bw; - u64 max_peak_bw; u64 rate; - u32 agg_avg =3D 0; - u32 agg_peak =3D 0; + u64 agg_avg[QCOM_ICC_NUM_BUCKETS], agg_peak[QCOM_ICC_NUM_BUCKETS]; + u64 max_agg_avg; int ret, i; + int bucket; =20 src_qn =3D src->data; if (dst) @@ -321,12 +360,9 @@ static int qcom_icc_set(struct icc_node *src, struct i= cc_node *dst) provider =3D src->provider; qp =3D to_qcom_provider(provider); =20 - list_for_each_entry(n, &provider->nodes, node_list) - provider->aggregate(n, 0, n->avg_bw, n->peak_bw, - &agg_avg, &agg_peak); + qcom_icc_bus_aggregate(provider, agg_avg, agg_peak, &max_agg_avg); =20 - sum_bw =3D icc_units_to_bps(agg_avg); - max_peak_bw =3D icc_units_to_bps(agg_peak); + sum_bw =3D icc_units_to_bps(max_agg_avg); =20 ret =3D __qcom_icc_set(src, src_qn, sum_bw); if (ret) @@ -337,12 +373,23 @@ static int qcom_icc_set(struct icc_node *src, struct = icc_node *dst) return ret; } =20 - rate =3D max(sum_bw, max_peak_bw); - - do_div(rate, src_qn->buswidth); - rate =3D min_t(u64, rate, LONG_MAX); - for (i =3D 0; i < qp->num_clks; i++) { + /* + * Use WAKE bucket for active clock, otherwise, use SLEEP bucket + * for other clocks. If a platform doesn't set interconnect + * path tags, by default use sleep bucket for all clocks. + * + * Note, AMC bucket is not supported yet. + */ + if (!strcmp(qp->bus_clks[i].id, "bus_a")) + bucket =3D QCOM_ICC_BUCKET_WAKE; + else + bucket =3D QCOM_ICC_BUCKET_SLEEP; + + rate =3D icc_units_to_bps(max(agg_avg[bucket], agg_peak[bucket])); + do_div(rate, src_qn->buswidth); + rate =3D min_t(u64, rate, LONG_MAX); + if (qp->bus_clk_rate[i] =3D=3D rate) continue; =20 --=20 2.25.1