mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 23:23:03 +00:00
interconnect: qcom: sdm845: Retire DEFINE_QBCM
The struct definition macros are hard to read and compare, expand them. Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Reviewed-by: Bjorn Andersson <quic_bjorande@quicinc.com> Link: https://lore.kernel.org/r/20230811-topic-icc_retire_macrosd-v1-13-c03aaeffc769@linaro.org Signed-off-by: Georgi Djakov <djakov@kernel.org>
This commit is contained in:
Konrad Dybcio
Georgi Djakov
parent
46cd2018c5
commit
35f490c5e4
@ -1263,34 +1263,255 @@ static struct qcom_icc_node xs_sys_tcu_cfg = {
|
||||
.buswidth = 8,
|
||||
};
|
||||
|
||||
DEFINE_QBCM(bcm_acv, "ACV", false, &ebi);
|
||||
DEFINE_QBCM(bcm_mc0, "MC0", true, &ebi);
|
||||
DEFINE_QBCM(bcm_sh0, "SH0", true, &qns_llcc);
|
||||
DEFINE_QBCM(bcm_mm0, "MM0", false, &qns_mem_noc_hf);
|
||||
DEFINE_QBCM(bcm_sh1, "SH1", false, &qns_apps_io);
|
||||
DEFINE_QBCM(bcm_mm1, "MM1", true, &qxm_camnoc_hf0_uncomp, &qxm_camnoc_hf1_uncomp, &qxm_camnoc_sf_uncomp, &qxm_camnoc_hf0, &qxm_camnoc_hf1, &qxm_mdp0, &qxm_mdp1);
|
||||
DEFINE_QBCM(bcm_sh2, "SH2", false, &qns_memnoc_snoc);
|
||||
DEFINE_QBCM(bcm_mm2, "MM2", false, &qns2_mem_noc);
|
||||
DEFINE_QBCM(bcm_sh3, "SH3", false, &acm_tcu);
|
||||
DEFINE_QBCM(bcm_mm3, "MM3", false, &qxm_camnoc_sf, &qxm_rot, &qxm_venus0, &qxm_venus1, &qxm_venus_arm9);
|
||||
DEFINE_QBCM(bcm_sh5, "SH5", false, &qnm_apps);
|
||||
DEFINE_QBCM(bcm_sn0, "SN0", true, &qns_memnoc_sf);
|
||||
DEFINE_QBCM(bcm_ce0, "CE0", false, &qxm_crypto);
|
||||
DEFINE_QBCM(bcm_cn0, "CN0", false, &qhm_spdm, &qhm_tic, &qnm_snoc, &xm_qdss_dap, &qhs_a1_noc_cfg, &qhs_a2_noc_cfg, &qhs_aop, &qhs_aoss, &qhs_camera_cfg, &qhs_clk_ctl, &qhs_compute_dsp_cfg, &qhs_cpr_cx, &qhs_crypto0_cfg, &qhs_dcc_cfg, &qhs_ddrss_cfg, &qhs_display_cfg, &qhs_glm, &qhs_gpuss_cfg, &qhs_imem_cfg, &qhs_ipa, &qhs_mnoc_cfg, &qhs_pcie0_cfg, &qhs_pcie_gen3_cfg, &qhs_pdm, &qhs_phy_refgen_south, &qhs_pimem_cfg, &qhs_prng, &qhs_qdss_cfg, &qhs_qupv3_north, &qhs_qupv3_south, &qhs_sdc2, &qhs_sdc4, &qhs_snoc_cfg, &qhs_spdm, &qhs_spss_cfg, &qhs_tcsr, &qhs_tlmm_north, &qhs_tlmm_south, &qhs_tsif, &qhs_ufs_card_cfg, &qhs_ufs_mem_cfg, &qhs_usb3_0, &qhs_usb3_1, &qhs_venus_cfg, &qhs_vsense_ctrl_cfg, &qns_cnoc_a2noc, &srvc_cnoc);
|
||||
DEFINE_QBCM(bcm_qup0, "QUP0", false, &qhm_qup1, &qhm_qup2);
|
||||
DEFINE_QBCM(bcm_sn1, "SN1", false, &qxs_imem);
|
||||
DEFINE_QBCM(bcm_sn2, "SN2", false, &qns_memnoc_gc);
|
||||
DEFINE_QBCM(bcm_sn3, "SN3", false, &qns_cnoc);
|
||||
DEFINE_QBCM(bcm_sn4, "SN4", false, &qxm_pimem);
|
||||
DEFINE_QBCM(bcm_sn5, "SN5", false, &xs_qdss_stm);
|
||||
DEFINE_QBCM(bcm_sn6, "SN6", false, &qhs_apss, &srvc_snoc, &xs_sys_tcu_cfg);
|
||||
DEFINE_QBCM(bcm_sn7, "SN7", false, &qxs_pcie);
|
||||
DEFINE_QBCM(bcm_sn8, "SN8", false, &qxs_pcie_gen3);
|
||||
DEFINE_QBCM(bcm_sn9, "SN9", false, &srvc_aggre1_noc, &qnm_aggre1_noc);
|
||||
DEFINE_QBCM(bcm_sn11, "SN11", false, &srvc_aggre2_noc, &qnm_aggre2_noc);
|
||||
DEFINE_QBCM(bcm_sn12, "SN12", false, &qnm_gladiator_sodv, &xm_gic);
|
||||
DEFINE_QBCM(bcm_sn14, "SN14", false, &qnm_pcie_anoc);
|
||||
DEFINE_QBCM(bcm_sn15, "SN15", false, &qnm_memnoc);
|
||||
static struct qcom_icc_bcm bcm_acv = {
|
||||
.name = "ACV",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &ebi },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_mc0 = {
|
||||
.name = "MC0",
|
||||
.keepalive = true,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &ebi },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sh0 = {
|
||||
.name = "SH0",
|
||||
.keepalive = true,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qns_llcc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_mm0 = {
|
||||
.name = "MM0",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qns_mem_noc_hf },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sh1 = {
|
||||
.name = "SH1",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qns_apps_io },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_mm1 = {
|
||||
.name = "MM1",
|
||||
.keepalive = true,
|
||||
.num_nodes = 7,
|
||||
.nodes = { &qxm_camnoc_hf0_uncomp,
|
||||
&qxm_camnoc_hf1_uncomp,
|
||||
&qxm_camnoc_sf_uncomp,
|
||||
&qxm_camnoc_hf0,
|
||||
&qxm_camnoc_hf1,
|
||||
&qxm_mdp0,
|
||||
&qxm_mdp1
|
||||
},
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sh2 = {
|
||||
.name = "SH2",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qns_memnoc_snoc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_mm2 = {
|
||||
.name = "MM2",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qns2_mem_noc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sh3 = {
|
||||
.name = "SH3",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &acm_tcu },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_mm3 = {
|
||||
.name = "MM3",
|
||||
.keepalive = false,
|
||||
.num_nodes = 5,
|
||||
.nodes = { &qxm_camnoc_sf, &qxm_rot, &qxm_venus0, &qxm_venus1, &qxm_venus_arm9 },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sh5 = {
|
||||
.name = "SH5",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qnm_apps },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn0 = {
|
||||
.name = "SN0",
|
||||
.keepalive = true,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qns_memnoc_sf },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_ce0 = {
|
||||
.name = "CE0",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qxm_crypto },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_cn0 = {
|
||||
.name = "CN0",
|
||||
.keepalive = false,
|
||||
.num_nodes = 47,
|
||||
.nodes = { &qhm_spdm,
|
||||
&qhm_tic,
|
||||
&qnm_snoc,
|
||||
&xm_qdss_dap,
|
||||
&qhs_a1_noc_cfg,
|
||||
&qhs_a2_noc_cfg,
|
||||
&qhs_aop,
|
||||
&qhs_aoss,
|
||||
&qhs_camera_cfg,
|
||||
&qhs_clk_ctl,
|
||||
&qhs_compute_dsp_cfg,
|
||||
&qhs_cpr_cx,
|
||||
&qhs_crypto0_cfg,
|
||||
&qhs_dcc_cfg,
|
||||
&qhs_ddrss_cfg,
|
||||
&qhs_display_cfg,
|
||||
&qhs_glm,
|
||||
&qhs_gpuss_cfg,
|
||||
&qhs_imem_cfg,
|
||||
&qhs_ipa,
|
||||
&qhs_mnoc_cfg,
|
||||
&qhs_pcie0_cfg,
|
||||
&qhs_pcie_gen3_cfg,
|
||||
&qhs_pdm,
|
||||
&qhs_phy_refgen_south,
|
||||
&qhs_pimem_cfg,
|
||||
&qhs_prng,
|
||||
&qhs_qdss_cfg,
|
||||
&qhs_qupv3_north,
|
||||
&qhs_qupv3_south,
|
||||
&qhs_sdc2,
|
||||
&qhs_sdc4,
|
||||
&qhs_snoc_cfg,
|
||||
&qhs_spdm,
|
||||
&qhs_spss_cfg,
|
||||
&qhs_tcsr,
|
||||
&qhs_tlmm_north,
|
||||
&qhs_tlmm_south,
|
||||
&qhs_tsif,
|
||||
&qhs_ufs_card_cfg,
|
||||
&qhs_ufs_mem_cfg,
|
||||
&qhs_usb3_0,
|
||||
&qhs_usb3_1,
|
||||
&qhs_venus_cfg,
|
||||
&qhs_vsense_ctrl_cfg,
|
||||
&qns_cnoc_a2noc,
|
||||
&srvc_cnoc
|
||||
},
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_qup0 = {
|
||||
.name = "QUP0",
|
||||
.keepalive = false,
|
||||
.num_nodes = 2,
|
||||
.nodes = { &qhm_qup1, &qhm_qup2 },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn1 = {
|
||||
.name = "SN1",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qxs_imem },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn2 = {
|
||||
.name = "SN2",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qns_memnoc_gc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn3 = {
|
||||
.name = "SN3",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qns_cnoc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn4 = {
|
||||
.name = "SN4",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qxm_pimem },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn5 = {
|
||||
.name = "SN5",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &xs_qdss_stm },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn6 = {
|
||||
.name = "SN6",
|
||||
.keepalive = false,
|
||||
.num_nodes = 3,
|
||||
.nodes = { &qhs_apss, &srvc_snoc, &xs_sys_tcu_cfg },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn7 = {
|
||||
.name = "SN7",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qxs_pcie },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn8 = {
|
||||
.name = "SN8",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qxs_pcie_gen3 },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn9 = {
|
||||
.name = "SN9",
|
||||
.keepalive = false,
|
||||
.num_nodes = 2,
|
||||
.nodes = { &srvc_aggre1_noc, &qnm_aggre1_noc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn11 = {
|
||||
.name = "SN11",
|
||||
.keepalive = false,
|
||||
.num_nodes = 2,
|
||||
.nodes = { &srvc_aggre2_noc, &qnm_aggre2_noc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn12 = {
|
||||
.name = "SN12",
|
||||
.keepalive = false,
|
||||
.num_nodes = 2,
|
||||
.nodes = { &qnm_gladiator_sodv, &xm_gic },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn14 = {
|
||||
.name = "SN14",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qnm_pcie_anoc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm bcm_sn15 = {
|
||||
.name = "SN15",
|
||||
.keepalive = false,
|
||||
.num_nodes = 1,
|
||||
.nodes = { &qnm_memnoc },
|
||||
};
|
||||
|
||||
static struct qcom_icc_bcm * const aggre1_noc_bcms[] = {
|
||||
&bcm_sn9,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user