Commit 0dc82bd9 authored by Neil Armstrong's avatar Neil Armstrong Committed by Georgi Djakov

interconnect: qcom: sm8550: add enable_mask for bcm nodes

Set the proper enable_mask to nodes requiring such value
to be used instead of a bandwidth when voting.

The masks were copied from the downstream implementation at [1].

[1] https://git.codelinaro.org/clo/la/kernel/msm-5.15/-/blob/kernel.lnx.5.15.r1-rel/drivers/interconnect/qcom/kalama.cReviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230619-topic-sm8550-upstream-interconnect-mask-vote-v2-3-709474b151cc@linaro.org
Fixes: e6f0d6a3 ("interconnect: qcom: Add SM8550 interconnect provider driver")
Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parent be02db24
...@@ -1473,6 +1473,7 @@ static struct qcom_icc_node qns_mem_noc_sf_cam_ife_2 = { ...@@ -1473,6 +1473,7 @@ static struct qcom_icc_node qns_mem_noc_sf_cam_ife_2 = {
static struct qcom_icc_bcm bcm_acv = { static struct qcom_icc_bcm bcm_acv = {
.name = "ACV", .name = "ACV",
.enable_mask = 0x8,
.num_nodes = 1, .num_nodes = 1,
.nodes = { &ebi }, .nodes = { &ebi },
}; };
...@@ -1485,6 +1486,7 @@ static struct qcom_icc_bcm bcm_ce0 = { ...@@ -1485,6 +1486,7 @@ static struct qcom_icc_bcm bcm_ce0 = {
static struct qcom_icc_bcm bcm_cn0 = { static struct qcom_icc_bcm bcm_cn0 = {
.name = "CN0", .name = "CN0",
.enable_mask = 0x1,
.keepalive = true, .keepalive = true,
.num_nodes = 54, .num_nodes = 54,
.nodes = { &qsm_cfg, &qhs_ahb2phy0, .nodes = { &qsm_cfg, &qhs_ahb2phy0,
...@@ -1524,6 +1526,7 @@ static struct qcom_icc_bcm bcm_cn1 = { ...@@ -1524,6 +1526,7 @@ static struct qcom_icc_bcm bcm_cn1 = {
static struct qcom_icc_bcm bcm_co0 = { static struct qcom_icc_bcm bcm_co0 = {
.name = "CO0", .name = "CO0",
.enable_mask = 0x1,
.num_nodes = 2, .num_nodes = 2,
.nodes = { &qxm_nsp, &qns_nsp_gemnoc }, .nodes = { &qxm_nsp, &qns_nsp_gemnoc },
}; };
...@@ -1549,6 +1552,7 @@ static struct qcom_icc_bcm bcm_mm0 = { ...@@ -1549,6 +1552,7 @@ static struct qcom_icc_bcm bcm_mm0 = {
static struct qcom_icc_bcm bcm_mm1 = { static struct qcom_icc_bcm bcm_mm1 = {
.name = "MM1", .name = "MM1",
.enable_mask = 0x1,
.num_nodes = 8, .num_nodes = 8,
.nodes = { &qnm_camnoc_hf, &qnm_camnoc_icp, .nodes = { &qnm_camnoc_hf, &qnm_camnoc_icp,
&qnm_camnoc_sf, &qnm_vapss_hcp, &qnm_camnoc_sf, &qnm_vapss_hcp,
...@@ -1589,6 +1593,7 @@ static struct qcom_icc_bcm bcm_sh0 = { ...@@ -1589,6 +1593,7 @@ static struct qcom_icc_bcm bcm_sh0 = {
static struct qcom_icc_bcm bcm_sh1 = { static struct qcom_icc_bcm bcm_sh1 = {
.name = "SH1", .name = "SH1",
.enable_mask = 0x1,
.num_nodes = 13, .num_nodes = 13,
.nodes = { &alm_gpu_tcu, &alm_sys_tcu, .nodes = { &alm_gpu_tcu, &alm_sys_tcu,
&chm_apps, &qnm_gpu, &chm_apps, &qnm_gpu,
...@@ -1608,6 +1613,7 @@ static struct qcom_icc_bcm bcm_sn0 = { ...@@ -1608,6 +1613,7 @@ static struct qcom_icc_bcm bcm_sn0 = {
static struct qcom_icc_bcm bcm_sn1 = { static struct qcom_icc_bcm bcm_sn1 = {
.name = "SN1", .name = "SN1",
.enable_mask = 0x1,
.num_nodes = 3, .num_nodes = 3,
.nodes = { &qhm_gic, &xm_gic, .nodes = { &qhm_gic, &xm_gic,
&qns_gemnoc_gc }, &qns_gemnoc_gc },
...@@ -1633,6 +1639,7 @@ static struct qcom_icc_bcm bcm_sn7 = { ...@@ -1633,6 +1639,7 @@ static struct qcom_icc_bcm bcm_sn7 = {
static struct qcom_icc_bcm bcm_acv_disp = { static struct qcom_icc_bcm bcm_acv_disp = {
.name = "ACV", .name = "ACV",
.enable_mask = 0x1,
.num_nodes = 1, .num_nodes = 1,
.nodes = { &ebi_disp }, .nodes = { &ebi_disp },
}; };
...@@ -1657,12 +1664,14 @@ static struct qcom_icc_bcm bcm_sh0_disp = { ...@@ -1657,12 +1664,14 @@ static struct qcom_icc_bcm bcm_sh0_disp = {
static struct qcom_icc_bcm bcm_sh1_disp = { static struct qcom_icc_bcm bcm_sh1_disp = {
.name = "SH1", .name = "SH1",
.enable_mask = 0x1,
.num_nodes = 2, .num_nodes = 2,
.nodes = { &qnm_mnoc_hf_disp, &qnm_pcie_disp }, .nodes = { &qnm_mnoc_hf_disp, &qnm_pcie_disp },
}; };
static struct qcom_icc_bcm bcm_acv_cam_ife_0 = { static struct qcom_icc_bcm bcm_acv_cam_ife_0 = {
.name = "ACV", .name = "ACV",
.enable_mask = 0x0,
.num_nodes = 1, .num_nodes = 1,
.nodes = { &ebi_cam_ife_0 }, .nodes = { &ebi_cam_ife_0 },
}; };
...@@ -1681,6 +1690,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_0 = { ...@@ -1681,6 +1690,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_0 = {
static struct qcom_icc_bcm bcm_mm1_cam_ife_0 = { static struct qcom_icc_bcm bcm_mm1_cam_ife_0 = {
.name = "MM1", .name = "MM1",
.enable_mask = 0x1,
.num_nodes = 4, .num_nodes = 4,
.nodes = { &qnm_camnoc_hf_cam_ife_0, &qnm_camnoc_icp_cam_ife_0, .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 }, &qnm_camnoc_sf_cam_ife_0, &qns_mem_noc_sf_cam_ife_0 },
...@@ -1694,6 +1704,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_0 = { ...@@ -1694,6 +1704,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_0 = {
static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = { static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = {
.name = "SH1", .name = "SH1",
.enable_mask = 0x1,
.num_nodes = 3, .num_nodes = 3,
.nodes = { &qnm_mnoc_hf_cam_ife_0, &qnm_mnoc_sf_cam_ife_0, .nodes = { &qnm_mnoc_hf_cam_ife_0, &qnm_mnoc_sf_cam_ife_0,
&qnm_pcie_cam_ife_0 }, &qnm_pcie_cam_ife_0 },
...@@ -1701,6 +1712,7 @@ static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = { ...@@ -1701,6 +1712,7 @@ static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = {
static struct qcom_icc_bcm bcm_acv_cam_ife_1 = { static struct qcom_icc_bcm bcm_acv_cam_ife_1 = {
.name = "ACV", .name = "ACV",
.enable_mask = 0x0,
.num_nodes = 1, .num_nodes = 1,
.nodes = { &ebi_cam_ife_1 }, .nodes = { &ebi_cam_ife_1 },
}; };
...@@ -1719,6 +1731,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_1 = { ...@@ -1719,6 +1731,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_1 = {
static struct qcom_icc_bcm bcm_mm1_cam_ife_1 = { static struct qcom_icc_bcm bcm_mm1_cam_ife_1 = {
.name = "MM1", .name = "MM1",
.enable_mask = 0x1,
.num_nodes = 4, .num_nodes = 4,
.nodes = { &qnm_camnoc_hf_cam_ife_1, &qnm_camnoc_icp_cam_ife_1, .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 }, &qnm_camnoc_sf_cam_ife_1, &qns_mem_noc_sf_cam_ife_1 },
...@@ -1732,6 +1745,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_1 = { ...@@ -1732,6 +1745,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_1 = {
static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = { static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = {
.name = "SH1", .name = "SH1",
.enable_mask = 0x1,
.num_nodes = 3, .num_nodes = 3,
.nodes = { &qnm_mnoc_hf_cam_ife_1, &qnm_mnoc_sf_cam_ife_1, .nodes = { &qnm_mnoc_hf_cam_ife_1, &qnm_mnoc_sf_cam_ife_1,
&qnm_pcie_cam_ife_1 }, &qnm_pcie_cam_ife_1 },
...@@ -1739,6 +1753,7 @@ static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = { ...@@ -1739,6 +1753,7 @@ static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = {
static struct qcom_icc_bcm bcm_acv_cam_ife_2 = { static struct qcom_icc_bcm bcm_acv_cam_ife_2 = {
.name = "ACV", .name = "ACV",
.enable_mask = 0x0,
.num_nodes = 1, .num_nodes = 1,
.nodes = { &ebi_cam_ife_2 }, .nodes = { &ebi_cam_ife_2 },
}; };
...@@ -1757,6 +1772,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_2 = { ...@@ -1757,6 +1772,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_2 = {
static struct qcom_icc_bcm bcm_mm1_cam_ife_2 = { static struct qcom_icc_bcm bcm_mm1_cam_ife_2 = {
.name = "MM1", .name = "MM1",
.enable_mask = 0x1,
.num_nodes = 4, .num_nodes = 4,
.nodes = { &qnm_camnoc_hf_cam_ife_2, &qnm_camnoc_icp_cam_ife_2, .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 }, &qnm_camnoc_sf_cam_ife_2, &qns_mem_noc_sf_cam_ife_2 },
...@@ -1770,6 +1786,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_2 = { ...@@ -1770,6 +1786,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_2 = {
static struct qcom_icc_bcm bcm_sh1_cam_ife_2 = { static struct qcom_icc_bcm bcm_sh1_cam_ife_2 = {
.name = "SH1", .name = "SH1",
.enable_mask = 0x1,
.num_nodes = 3, .num_nodes = 3,
.nodes = { &qnm_mnoc_hf_cam_ife_2, &qnm_mnoc_sf_cam_ife_2, .nodes = { &qnm_mnoc_hf_cam_ife_2, &qnm_mnoc_sf_cam_ife_2,
&qnm_pcie_cam_ife_2 }, &qnm_pcie_cam_ife_2 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment