| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 11 Jul 2023 14:18:29 +0200
From: Konrad Dybcio <konrad.dybcio@...aro.org>
To: Andy Gross <agross@...nel.org>,
Bjorn Andersson <andersson@...nel.org>,
Georgi Djakov <djakov@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Conor Dooley <conor+dt@...nel.org>,
cros-qcom-dts-watchers@...omium.org
Cc: Marijn Suijten <marijn.suijten@...ainline.org>,
linux-arm-msm@...r.kernel.org, linux-pm@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Konrad Dybcio <konrad.dybcio@...aro.org>
Subject: [PATCH 30/53] interconnect: qcom: sc8280xp: Explicitly assign
voter_idx
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 <konrad.dybcio@...aro.org>
---
drivers/interconnect/qcom/sc8280xp.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/drivers/interconnect/qcom/sc8280xp.c b/drivers/interconnect/qcom/sc8280xp.c
index e56df893ec3e..2f595b78e2bc 100644
--- a/drivers/interconnect/qcom/sc8280xp.c
+++ b/drivers/interconnect/qcom/sc8280xp.c
@@ -1711,12 +1711,14 @@ static struct qcom_icc_node srvc_snoc = {
static struct qcom_icc_bcm bcm_acv = {
.name = "ACV",
+ .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 },
};
@@ -1724,6 +1726,7 @@ static struct qcom_icc_bcm bcm_ce0 = {
static struct qcom_icc_bcm bcm_cn0 = {
.name = "CN0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 9,
.nodes = { &qnm_gemnoc_cnoc,
&qnm_gemnoc_pcie,
@@ -1739,6 +1742,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 = 67,
.nodes = { &qhs_ahb2phy0,
&qhs_ahb2phy1,
@@ -1812,6 +1816,7 @@ static struct qcom_icc_bcm bcm_cn1 = {
static struct qcom_icc_bcm bcm_cn2 = {
.name = "CN2",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 4,
.nodes = { &qhs_qspi,
&qhs_qup0,
@@ -1822,6 +1827,7 @@ static struct qcom_icc_bcm bcm_cn2 = {
static struct qcom_icc_bcm bcm_cn3 = {
.name = "CN3",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 3,
.nodes = { &qxs_imem,
&xs_smss,
@@ -1832,6 +1838,7 @@ static struct qcom_icc_bcm bcm_cn3 = {
static struct qcom_icc_bcm bcm_mc0 = {
.name = "MC0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi },
};
@@ -1839,6 +1846,7 @@ static struct qcom_icc_bcm bcm_mc0 = {
static struct qcom_icc_bcm bcm_mm0 = {
.name = "MM0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 5,
.nodes = { &qnm_camnoc_hf,
&qnm_mdp0_0,
@@ -1850,6 +1858,7 @@ static struct qcom_icc_bcm bcm_mm0 = {
static struct qcom_icc_bcm bcm_mm1 = {
.name = "MM1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 8,
.nodes = { &qnm_rot_0,
&qnm_rot_1,
@@ -1864,6 +1873,7 @@ static struct qcom_icc_bcm bcm_mm1 = {
static struct qcom_icc_bcm bcm_nsa0 = {
.name = "NSA0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_nsp_gemnoc,
&qxs_nsp_xfr
@@ -1872,12 +1882,14 @@ static struct qcom_icc_bcm bcm_nsa0 = {
static struct qcom_icc_bcm bcm_nsa1 = {
.name = "NSA1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxm_nsp },
};
static struct qcom_icc_bcm bcm_nsb0 = {
.name = "NSB0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_nspb_gemnoc,
&qxs_nspb_xfr
@@ -1886,12 +1898,14 @@ static struct qcom_icc_bcm bcm_nsb0 = {
static struct qcom_icc_bcm bcm_nsb1 = {
.name = "NSB1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxm_nspb },
};
static struct qcom_icc_bcm bcm_pci0 = {
.name = "PCI0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_pcie_gem_noc },
};
@@ -1899,6 +1913,7 @@ static struct qcom_icc_bcm bcm_pci0 = {
static struct qcom_icc_bcm bcm_qup0 = {
.name = "QUP0",
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qup0_core_slave },
};
@@ -1906,6 +1921,7 @@ static struct qcom_icc_bcm bcm_qup0 = {
static struct qcom_icc_bcm bcm_qup1 = {
.name = "QUP1",
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qup1_core_slave },
};
@@ -1913,6 +1929,7 @@ static struct qcom_icc_bcm bcm_qup1 = {
static struct qcom_icc_bcm bcm_qup2 = {
.name = "QUP2",
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qup2_core_slave },
};
@@ -1920,12 +1937,14 @@ 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 },
};
static struct qcom_icc_bcm bcm_sh2 = {
.name = "SH2",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &chm_apps },
};
@@ -1933,24 +1952,28 @@ static struct qcom_icc_bcm bcm_sh2 = {
static struct qcom_icc_bcm bcm_sn0 = {
.name = "SN0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_gemnoc_sf },
};
static struct qcom_icc_bcm bcm_sn1 = {
.name = "SN1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_gemnoc_gc },
};
static struct qcom_icc_bcm bcm_sn2 = {
.name = "SN2",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxs_pimem },
};
static struct qcom_icc_bcm bcm_sn3 = {
.name = "SN3",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_a1noc_snoc,
&qnm_aggre1_noc
@@ -1959,6 +1982,7 @@ static struct qcom_icc_bcm bcm_sn3 = {
static struct qcom_icc_bcm bcm_sn4 = {
.name = "SN4",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_a2noc_snoc,
&qnm_aggre2_noc
@@ -1967,6 +1991,7 @@ static struct qcom_icc_bcm bcm_sn4 = {
static struct qcom_icc_bcm bcm_sn5 = {
.name = "SN5",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_aggre_usb_snoc,
&qnm_aggre_usb_noc
@@ -1975,6 +2000,7 @@ static struct qcom_icc_bcm bcm_sn5 = {
static struct qcom_icc_bcm bcm_sn9 = {
.name = "SN9",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_sysnoc,
&qnm_lpass_noc
@@ -1983,6 +2009,7 @@ static struct qcom_icc_bcm bcm_sn9 = {
static struct qcom_icc_bcm bcm_sn10 = {
.name = "SN10",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &xs_qdss_stm },
};
--
2.41.0
Powered by blists - more mailing lists