From patchwork Tue Jul 11 12:18:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 701736 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 8807CC00528 for ; Tue, 11 Jul 2023 12:21:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232101AbjGKMVS (ORCPT ); Tue, 11 Jul 2023 08:21:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232228AbjGKMUs (ORCPT ); Tue, 11 Jul 2023 08:20:48 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EB7726B0 for ; Tue, 11 Jul 2023 05:19:50 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2b701e1c80fso85715591fa.2 for ; Tue, 11 Jul 2023 05:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689077949; x=1691669949; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uwCiFQE87TTwRETpLPJinpuQSg1WBNBUbY3NCQlw0Ws=; b=h3civnjWtodAB7xdjVfde+X1QgcHconDVkxGJAVd+5ORsbzA0Gdx30xqe9QIXgl9Cj sNgPkjrndPjUT2mAcN/8pzibEcgCJd61f6uUzLuywsxDrBPF6b8I86zqxJnUayuEJKdE rH0bo1MC1oBKvKDWsSzz+WRHpY0upWSMQgnXOkngkJP7yhziApFUUmtcJ0Jbbrz8lx4k 5ooEVL+g/r96BzMsFYfJ3EMWuV5r2j5VxZqdPmH7DElo3pLuOTbfNQlPrMwA7yEVQDVM 0RlKDNI3jeLJ9o+RwZXeb6ZCo0pMDyzRQSl5Ru08Nw9cNXgUUfLBDpPgzrLbYE46GvYn 11GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689077949; x=1691669949; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uwCiFQE87TTwRETpLPJinpuQSg1WBNBUbY3NCQlw0Ws=; b=BmVRqvho5LF9hVPhtjR2PIr+3qqqqQKAED0mI5E5GAx86suDxvaMq7Hut/rU7ljzLM r3TjuTCoFCH9zJjEo34rwsj1SrhnLAFGvXa9te/7gQ5rQUS2wrQK6gDmdgIPgQjVmEwr 4jyfadDxRerMjQYMTJoDvlq3GPZWHfkLz9RFG1k40DYrTtPs3TrT3jfP+Z2/tQvpeVVR oYhcaEiDcEpohQcoh6lNBGzjo2tz8CO7R2MLq2YTWGZMhtUqJrzg7iov2WLAYllVg0+K azoll2DeNar9nRlVHe2EpRgL8XqCD8QXPXtXLSqW6O5MEDD0Iw/3gQlG7Z5bbTiPUkjJ 78nw== X-Gm-Message-State: ABy/qLby1jIl7e9ZSpNT1BIQY1wQcQbG9zn0tzSZGsVgxeeaLb7V+j4M meWoEJhyqFjrTvylxvKUFHXWmQ== X-Google-Smtp-Source: APBJJlH1hraq6Y8p7FNUSRTQlhrLqJXee2WV8G2NSyS5kgTnX4hVcqmTQDBCgBWuHHUQ4dZaMH1wXw== X-Received: by 2002:a2e:88d5:0:b0:2b6:e0d3:45b7 with SMTP id a21-20020a2e88d5000000b002b6e0d345b7mr12992268ljk.14.1689077949351; Tue, 11 Jul 2023 05:19:09 -0700 (PDT) Received: from [192.168.1.101] (abyl96.neoplus.adsl.tpnet.pl. [83.9.31.96]) by smtp.gmail.com with ESMTPSA id d18-20020a2e96d2000000b002b708450951sm435563ljj.88.2023.07.11.05.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 05:19:09 -0700 (PDT) From: Konrad Dybcio Date: Tue, 11 Jul 2023 14:18:31 +0200 Subject: [PATCH 32/53] interconnect: qcom: sm8550: Explicitly assign voter_idx MIME-Version: 1.0 Message-Id: <20230708-topic-rpmh_icc_rsc-v1-32-b223bd2ac8dd@linaro.org> References: <20230708-topic-rpmh_icc_rsc-v1-0-b223bd2ac8dd@linaro.org> In-Reply-To: <20230708-topic-rpmh_icc_rsc-v1-0-b223bd2ac8dd@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1689077904; l=10160; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=R7Ecrvuc6qvo53FMgbNdmnfTrkm2nzBuT8JYA7NSeZg=; b=7JcPwfgfhW2pBVGCghP4NdB7PkYfC0k2m2pMPnzv11dSYaWGj0cVZJdQGSwPcJDvlV21poK3s 7cAfSr0Sh7zBiFLhY9Hx0cToOoP5VqlOZlfwm995wuMmRQ9SbjC+T4q X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org To avoid confusion, explicitly assign the BCM voter index. Note the assignment may be incorrect, but this commit brings no functional change. Signed-off-by: Konrad Dybcio --- drivers/interconnect/qcom/sm8550.c | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/interconnect/qcom/sm8550.c b/drivers/interconnect/qcom/sm8550.c index 0864ed285375..40740cf5e41d 100644 --- a/drivers/interconnect/qcom/sm8550.c +++ b/drivers/interconnect/qcom/sm8550.c @@ -1474,12 +1474,14 @@ static struct qcom_icc_node qns_mem_noc_sf_cam_ife_2 = { static struct qcom_icc_bcm bcm_acv = { .name = "ACV", .enable_mask = 0x8, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi }, }; static struct qcom_icc_bcm bcm_ce0 = { .name = "CE0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qxm_crypto }, }; @@ -1488,6 +1490,7 @@ static struct qcom_icc_bcm bcm_cn0 = { .name = "CN0", .enable_mask = 0x1, .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 54, .nodes = { &qsm_cfg, &qhs_ahb2phy0, &qhs_ahb2phy1, &qhs_apss, @@ -1520,6 +1523,7 @@ static struct qcom_icc_bcm bcm_cn0 = { static struct qcom_icc_bcm bcm_cn1 = { .name = "CN1", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qhs_display_cfg }, }; @@ -1527,12 +1531,14 @@ static struct qcom_icc_bcm bcm_cn1 = { static struct qcom_icc_bcm bcm_co0 = { .name = "CO0", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 2, .nodes = { &qxm_nsp, &qns_nsp_gemnoc }, }; static struct qcom_icc_bcm bcm_lp0 = { .name = "LP0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 2, .nodes = { &qnm_lpass_lpinoc, &qns_lpass_aggnoc }, }; @@ -1540,12 +1546,14 @@ static struct qcom_icc_bcm bcm_lp0 = { static struct qcom_icc_bcm bcm_mc0 = { .name = "MC0", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi }, }; static struct qcom_icc_bcm bcm_mm0 = { .name = "MM0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_mem_noc_hf }, }; @@ -1553,6 +1561,7 @@ static struct qcom_icc_bcm bcm_mm0 = { static struct qcom_icc_bcm bcm_mm1 = { .name = "MM1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 8, .nodes = { &qnm_camnoc_hf, &qnm_camnoc_icp, &qnm_camnoc_sf, &qnm_vapss_hcp, @@ -1564,6 +1573,7 @@ static struct qcom_icc_bcm bcm_qup0 = { .name = "QUP0", .keepalive = true, .vote_scale = 1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qup0_core_slave }, }; @@ -1572,6 +1582,7 @@ static struct qcom_icc_bcm bcm_qup1 = { .name = "QUP1", .keepalive = true, .vote_scale = 1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qup1_core_slave }, }; @@ -1580,6 +1591,7 @@ static struct qcom_icc_bcm bcm_qup2 = { .name = "QUP2", .keepalive = true, .vote_scale = 1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qup2_core_slave }, }; @@ -1587,6 +1599,7 @@ static struct qcom_icc_bcm bcm_qup2 = { static struct qcom_icc_bcm bcm_sh0 = { .name = "SH0", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_llcc }, }; @@ -1594,6 +1607,7 @@ static struct qcom_icc_bcm bcm_sh0 = { static struct qcom_icc_bcm bcm_sh1 = { .name = "SH1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 13, .nodes = { &alm_gpu_tcu, &alm_sys_tcu, &chm_apps, &qnm_gpu, @@ -1607,6 +1621,7 @@ static struct qcom_icc_bcm bcm_sh1 = { static struct qcom_icc_bcm bcm_sn0 = { .name = "SN0", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_gemnoc_sf }, }; @@ -1614,6 +1629,7 @@ static struct qcom_icc_bcm bcm_sn0 = { static struct qcom_icc_bcm bcm_sn1 = { .name = "SN1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 3, .nodes = { &qhm_gic, &xm_gic, &qns_gemnoc_gc }, @@ -1621,18 +1637,21 @@ static struct qcom_icc_bcm bcm_sn1 = { static struct qcom_icc_bcm bcm_sn2 = { .name = "SN2", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qnm_aggre1_noc }, }; static struct qcom_icc_bcm bcm_sn3 = { .name = "SN3", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qnm_aggre2_noc }, }; static struct qcom_icc_bcm bcm_sn7 = { .name = "SN7", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_pcie_mem_noc }, }; @@ -1640,24 +1659,28 @@ static struct qcom_icc_bcm bcm_sn7 = { static struct qcom_icc_bcm bcm_acv_disp = { .name = "ACV", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi_disp }, }; static struct qcom_icc_bcm bcm_mc0_disp = { .name = "MC0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi_disp }, }; static struct qcom_icc_bcm bcm_mm0_disp = { .name = "MM0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_mem_noc_hf_disp }, }; static struct qcom_icc_bcm bcm_sh0_disp = { .name = "SH0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_llcc_disp }, }; @@ -1665,6 +1688,7 @@ static struct qcom_icc_bcm bcm_sh0_disp = { static struct qcom_icc_bcm bcm_sh1_disp = { .name = "SH1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 2, .nodes = { &qnm_mnoc_hf_disp, &qnm_pcie_disp }, }; @@ -1672,18 +1696,21 @@ static struct qcom_icc_bcm bcm_sh1_disp = { static struct qcom_icc_bcm bcm_acv_cam_ife_0 = { .name = "ACV", .enable_mask = 0x0, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi_cam_ife_0 }, }; static struct qcom_icc_bcm bcm_mc0_cam_ife_0 = { .name = "MC0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi_cam_ife_0 }, }; static struct qcom_icc_bcm bcm_mm0_cam_ife_0 = { .name = "MM0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_mem_noc_hf_cam_ife_0 }, }; @@ -1691,6 +1718,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_0 = { static struct qcom_icc_bcm bcm_mm1_cam_ife_0 = { .name = "MM1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 4, .nodes = { &qnm_camnoc_hf_cam_ife_0, &qnm_camnoc_icp_cam_ife_0, &qnm_camnoc_sf_cam_ife_0, &qns_mem_noc_sf_cam_ife_0 }, @@ -1698,6 +1726,7 @@ static struct qcom_icc_bcm bcm_mm1_cam_ife_0 = { static struct qcom_icc_bcm bcm_sh0_cam_ife_0 = { .name = "SH0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_llcc_cam_ife_0 }, }; @@ -1705,6 +1734,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_0 = { static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = { .name = "SH1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 3, .nodes = { &qnm_mnoc_hf_cam_ife_0, &qnm_mnoc_sf_cam_ife_0, &qnm_pcie_cam_ife_0 }, @@ -1713,18 +1743,21 @@ static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = { static struct qcom_icc_bcm bcm_acv_cam_ife_1 = { .name = "ACV", .enable_mask = 0x0, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi_cam_ife_1 }, }; static struct qcom_icc_bcm bcm_mc0_cam_ife_1 = { .name = "MC0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi_cam_ife_1 }, }; static struct qcom_icc_bcm bcm_mm0_cam_ife_1 = { .name = "MM0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_mem_noc_hf_cam_ife_1 }, }; @@ -1732,6 +1765,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_1 = { static struct qcom_icc_bcm bcm_mm1_cam_ife_1 = { .name = "MM1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 4, .nodes = { &qnm_camnoc_hf_cam_ife_1, &qnm_camnoc_icp_cam_ife_1, &qnm_camnoc_sf_cam_ife_1, &qns_mem_noc_sf_cam_ife_1 }, @@ -1739,6 +1773,7 @@ static struct qcom_icc_bcm bcm_mm1_cam_ife_1 = { static struct qcom_icc_bcm bcm_sh0_cam_ife_1 = { .name = "SH0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_llcc_cam_ife_1 }, }; @@ -1746,6 +1781,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_1 = { static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = { .name = "SH1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 3, .nodes = { &qnm_mnoc_hf_cam_ife_1, &qnm_mnoc_sf_cam_ife_1, &qnm_pcie_cam_ife_1 }, @@ -1754,18 +1790,21 @@ static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = { static struct qcom_icc_bcm bcm_acv_cam_ife_2 = { .name = "ACV", .enable_mask = 0x0, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi_cam_ife_2 }, }; static struct qcom_icc_bcm bcm_mc0_cam_ife_2 = { .name = "MC0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &ebi_cam_ife_2 }, }; static struct qcom_icc_bcm bcm_mm0_cam_ife_2 = { .name = "MM0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_mem_noc_hf_cam_ife_2 }, }; @@ -1773,6 +1812,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_2 = { static struct qcom_icc_bcm bcm_mm1_cam_ife_2 = { .name = "MM1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 4, .nodes = { &qnm_camnoc_hf_cam_ife_2, &qnm_camnoc_icp_cam_ife_2, &qnm_camnoc_sf_cam_ife_2, &qns_mem_noc_sf_cam_ife_2 }, @@ -1780,6 +1820,7 @@ static struct qcom_icc_bcm bcm_mm1_cam_ife_2 = { static struct qcom_icc_bcm bcm_sh0_cam_ife_2 = { .name = "SH0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &qns_llcc_cam_ife_2 }, }; @@ -1787,6 +1828,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_2 = { static struct qcom_icc_bcm bcm_sh1_cam_ife_2 = { .name = "SH1", .enable_mask = 0x1, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 3, .nodes = { &qnm_mnoc_hf_cam_ife_2, &qnm_mnoc_sf_cam_ife_2, &qnm_pcie_cam_ife_2 },