Skip to content

Commit 0dc82bd

Browse files
superna9999Georgi Djakov
authored andcommitted
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.c Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20230619-topic-sm8550-upstream-interconnect-mask-vote-v2-3-709474b151cc@linaro.org Fixes: e6f0d6a ("interconnect: qcom: Add SM8550 interconnect provider driver") Signed-off-by: Georgi Djakov <djakov@kernel.org>
1 parent be02db2 commit 0dc82bd

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

drivers/interconnect/qcom/sm8550.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,6 +1473,7 @@ static struct qcom_icc_node qns_mem_noc_sf_cam_ife_2 = {
14731473

14741474
static struct qcom_icc_bcm bcm_acv = {
14751475
.name = "ACV",
1476+
.enable_mask = 0x8,
14761477
.num_nodes = 1,
14771478
.nodes = { &ebi },
14781479
};
@@ -1485,6 +1486,7 @@ static struct qcom_icc_bcm bcm_ce0 = {
14851486

14861487
static struct qcom_icc_bcm bcm_cn0 = {
14871488
.name = "CN0",
1489+
.enable_mask = 0x1,
14881490
.keepalive = true,
14891491
.num_nodes = 54,
14901492
.nodes = { &qsm_cfg, &qhs_ahb2phy0,
@@ -1524,6 +1526,7 @@ static struct qcom_icc_bcm bcm_cn1 = {
15241526

15251527
static struct qcom_icc_bcm bcm_co0 = {
15261528
.name = "CO0",
1529+
.enable_mask = 0x1,
15271530
.num_nodes = 2,
15281531
.nodes = { &qxm_nsp, &qns_nsp_gemnoc },
15291532
};
@@ -1549,6 +1552,7 @@ static struct qcom_icc_bcm bcm_mm0 = {
15491552

15501553
static struct qcom_icc_bcm bcm_mm1 = {
15511554
.name = "MM1",
1555+
.enable_mask = 0x1,
15521556
.num_nodes = 8,
15531557
.nodes = { &qnm_camnoc_hf, &qnm_camnoc_icp,
15541558
&qnm_camnoc_sf, &qnm_vapss_hcp,
@@ -1589,6 +1593,7 @@ static struct qcom_icc_bcm bcm_sh0 = {
15891593

15901594
static struct qcom_icc_bcm bcm_sh1 = {
15911595
.name = "SH1",
1596+
.enable_mask = 0x1,
15921597
.num_nodes = 13,
15931598
.nodes = { &alm_gpu_tcu, &alm_sys_tcu,
15941599
&chm_apps, &qnm_gpu,
@@ -1608,6 +1613,7 @@ static struct qcom_icc_bcm bcm_sn0 = {
16081613

16091614
static struct qcom_icc_bcm bcm_sn1 = {
16101615
.name = "SN1",
1616+
.enable_mask = 0x1,
16111617
.num_nodes = 3,
16121618
.nodes = { &qhm_gic, &xm_gic,
16131619
&qns_gemnoc_gc },
@@ -1633,6 +1639,7 @@ static struct qcom_icc_bcm bcm_sn7 = {
16331639

16341640
static struct qcom_icc_bcm bcm_acv_disp = {
16351641
.name = "ACV",
1642+
.enable_mask = 0x1,
16361643
.num_nodes = 1,
16371644
.nodes = { &ebi_disp },
16381645
};
@@ -1657,12 +1664,14 @@ static struct qcom_icc_bcm bcm_sh0_disp = {
16571664

16581665
static struct qcom_icc_bcm bcm_sh1_disp = {
16591666
.name = "SH1",
1667+
.enable_mask = 0x1,
16601668
.num_nodes = 2,
16611669
.nodes = { &qnm_mnoc_hf_disp, &qnm_pcie_disp },
16621670
};
16631671

16641672
static struct qcom_icc_bcm bcm_acv_cam_ife_0 = {
16651673
.name = "ACV",
1674+
.enable_mask = 0x0,
16661675
.num_nodes = 1,
16671676
.nodes = { &ebi_cam_ife_0 },
16681677
};
@@ -1681,6 +1690,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_0 = {
16811690

16821691
static struct qcom_icc_bcm bcm_mm1_cam_ife_0 = {
16831692
.name = "MM1",
1693+
.enable_mask = 0x1,
16841694
.num_nodes = 4,
16851695
.nodes = { &qnm_camnoc_hf_cam_ife_0, &qnm_camnoc_icp_cam_ife_0,
16861696
&qnm_camnoc_sf_cam_ife_0, &qns_mem_noc_sf_cam_ife_0 },
@@ -1694,13 +1704,15 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_0 = {
16941704

16951705
static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = {
16961706
.name = "SH1",
1707+
.enable_mask = 0x1,
16971708
.num_nodes = 3,
16981709
.nodes = { &qnm_mnoc_hf_cam_ife_0, &qnm_mnoc_sf_cam_ife_0,
16991710
&qnm_pcie_cam_ife_0 },
17001711
};
17011712

17021713
static struct qcom_icc_bcm bcm_acv_cam_ife_1 = {
17031714
.name = "ACV",
1715+
.enable_mask = 0x0,
17041716
.num_nodes = 1,
17051717
.nodes = { &ebi_cam_ife_1 },
17061718
};
@@ -1719,6 +1731,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_1 = {
17191731

17201732
static struct qcom_icc_bcm bcm_mm1_cam_ife_1 = {
17211733
.name = "MM1",
1734+
.enable_mask = 0x1,
17221735
.num_nodes = 4,
17231736
.nodes = { &qnm_camnoc_hf_cam_ife_1, &qnm_camnoc_icp_cam_ife_1,
17241737
&qnm_camnoc_sf_cam_ife_1, &qns_mem_noc_sf_cam_ife_1 },
@@ -1732,13 +1745,15 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_1 = {
17321745

17331746
static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = {
17341747
.name = "SH1",
1748+
.enable_mask = 0x1,
17351749
.num_nodes = 3,
17361750
.nodes = { &qnm_mnoc_hf_cam_ife_1, &qnm_mnoc_sf_cam_ife_1,
17371751
&qnm_pcie_cam_ife_1 },
17381752
};
17391753

17401754
static struct qcom_icc_bcm bcm_acv_cam_ife_2 = {
17411755
.name = "ACV",
1756+
.enable_mask = 0x0,
17421757
.num_nodes = 1,
17431758
.nodes = { &ebi_cam_ife_2 },
17441759
};
@@ -1757,6 +1772,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_2 = {
17571772

17581773
static struct qcom_icc_bcm bcm_mm1_cam_ife_2 = {
17591774
.name = "MM1",
1775+
.enable_mask = 0x1,
17601776
.num_nodes = 4,
17611777
.nodes = { &qnm_camnoc_hf_cam_ife_2, &qnm_camnoc_icp_cam_ife_2,
17621778
&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 = {
17701786

17711787
static struct qcom_icc_bcm bcm_sh1_cam_ife_2 = {
17721788
.name = "SH1",
1789+
.enable_mask = 0x1,
17731790
.num_nodes = 3,
17741791
.nodes = { &qnm_mnoc_hf_cam_ife_2, &qnm_mnoc_sf_cam_ife_2,
17751792
&qnm_pcie_cam_ife_2 },

0 commit comments

Comments
 (0)