On 9.01.2023 01:29, Dmitry Baryshkov wrote:
> Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and
> SLAVE_IPA_CORE interconnects for this platofm.
platform
There are no actual users
> of this intercoonect.
interconnect
The IP0 resource will be handled by clk-rpmh
> driver.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> drivers/interconnect/core.c | 1 +
> drivers/interconnect/qcom/sm8250.c | 21 ---------------------
> drivers/interconnect/qcom/sm8250.h | 4 ++--
> 3 files changed, 3 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
> index cea54477cfe3..5b5fd436f23f 100644
> --- a/drivers/interconnect/core.c
> +++ b/drivers/interconnect/core.c
> @@ -1083,6 +1083,7 @@ static const struct of_device_id __maybe_unused ignore_list[] = {
> { .compatible = "qcom,sc7180-ipa-virt" },
> { .compatible = "qcom,sdx55-ipa-virt" },
> { .compatible = "qcom,sm8150-ipa-virt" },
> + { .compatible = "qcom,sm8250-ipa-virt" },
> {}
> };
>
> diff --git a/drivers/interconnect/qcom/sm8250.c b/drivers/interconnect/qcom/sm8250.c
> index 5cdb058fa095..e3bb008cb219 100644
> --- a/drivers/interconnect/qcom/sm8250.c
> +++ b/drivers/interconnect/qcom/sm8250.c
> @@ -51,7 +51,6 @@ DEFINE_QNODE(qnm_mnoc_sf, SM8250_MASTER_MNOC_SF_MEM_NOC, 2, 32, SM8250_SLAVE_LLC
> DEFINE_QNODE(qnm_pcie, SM8250_MASTER_ANOC_PCIE_GEM_NOC, 1, 16, SM8250_SLAVE_LLCC, SM8250_SLAVE_GEM_NOC_SNOC);
> DEFINE_QNODE(qnm_snoc_gc, SM8250_MASTER_SNOC_GC_MEM_NOC, 1, 8, SM8250_SLAVE_LLCC);
> DEFINE_QNODE(qnm_snoc_sf, SM8250_MASTER_SNOC_SF_MEM_NOC, 1, 16, SM8250_SLAVE_LLCC, SM8250_SLAVE_GEM_NOC_SNOC, SM8250_SLAVE_MEM_NOC_PCIE_SNOC);
> -DEFINE_QNODE(ipa_core_master, SM8250_MASTER_IPA_CORE, 1, 8, SM8250_SLAVE_IPA_CORE);
> DEFINE_QNODE(llcc_mc, SM8250_MASTER_LLCC, 4, 4, SM8250_SLAVE_EBI_CH0);
> DEFINE_QNODE(qhm_mnoc_cfg, SM8250_MASTER_CNOC_MNOC_CFG, 1, 4, SM8250_SLAVE_SERVICE_MNOC);
> DEFINE_QNODE(qnm_camnoc_hf, SM8250_MASTER_CAMNOC_HF, 2, 32, SM8250_SLAVE_MNOC_HF_MEM_NOC);
> @@ -138,7 +137,6 @@ DEFINE_QNODE(qns_sys_pcie, SM8250_SLAVE_MEM_NOC_PCIE_SNOC, 1, 8, SM8250_MASTER_G
> DEFINE_QNODE(srvc_even_gemnoc, SM8250_SLAVE_SERVICE_GEM_NOC_1, 1, 4);
> DEFINE_QNODE(srvc_odd_gemnoc, SM8250_SLAVE_SERVICE_GEM_NOC_2, 1, 4);
> DEFINE_QNODE(srvc_sys_gemnoc, SM8250_SLAVE_SERVICE_GEM_NOC, 1, 4);
> -DEFINE_QNODE(ipa_core_slave, SM8250_SLAVE_IPA_CORE, 1, 8);
> DEFINE_QNODE(ebi, SM8250_SLAVE_EBI_CH0, 4, 4);
> DEFINE_QNODE(qns_mem_noc_hf, SM8250_SLAVE_MNOC_HF_MEM_NOC, 2, 32, SM8250_MASTER_MNOC_HF_MEM_NOC);
> DEFINE_QNODE(qns_mem_noc_sf, SM8250_SLAVE_MNOC_SF_MEM_NOC, 2, 32, SM8250_MASTER_MNOC_SF_MEM_NOC);
> @@ -171,7 +169,6 @@ DEFINE_QBCM(bcm_mc0, "MC0", true, &ebi);
> DEFINE_QBCM(bcm_sh0, "SH0", true, &qns_llcc);
> DEFINE_QBCM(bcm_mm0, "MM0", true, &qns_mem_noc_hf);
> DEFINE_QBCM(bcm_ce0, "CE0", false, &qxm_crypto);
> -DEFINE_QBCM(bcm_ip0, "IP0", false, &ipa_core_slave);
> DEFINE_QBCM(bcm_mm1, "MM1", false, &qnm_camnoc_hf, &qxm_mdp0, &qxm_mdp1);
> DEFINE_QBCM(bcm_sh2, "SH2", false, &alm_gpu_tcu, &alm_sys_tcu);
> DEFINE_QBCM(bcm_mm2, "MM2", false, &qns_mem_noc_sf);
> @@ -386,22 +383,6 @@ static const struct qcom_icc_desc sm8250_gem_noc = {
> .num_bcms = ARRAY_SIZE(gem_noc_bcms),
> };
>
> -static struct qcom_icc_bcm * const ipa_virt_bcms[] = {
> - &bcm_ip0,
> -};
> -
> -static struct qcom_icc_node * const ipa_virt_nodes[] = {
> - [MASTER_IPA_CORE] = &ipa_core_master,
> - [SLAVE_IPA_CORE] = &ipa_core_slave,
> -};
> -
> -static const struct qcom_icc_desc sm8250_ipa_virt = {
> - .nodes = ipa_virt_nodes,
> - .num_nodes = ARRAY_SIZE(ipa_virt_nodes),
> - .bcms = ipa_virt_bcms,
> - .num_bcms = ARRAY_SIZE(ipa_virt_bcms),
> -};
> -
> static struct qcom_icc_bcm * const mc_virt_bcms[] = {
> &bcm_acv,
> &bcm_mc0,
> @@ -531,8 +512,6 @@ static const struct of_device_id qnoc_of_match[] = {
> .data = &sm8250_dc_noc},
> { .compatible = "qcom,sm8250-gem-noc",
> .data = &sm8250_gem_noc},
> - { .compatible = "qcom,sm8250-ipa-virt",
> - .data = &sm8250_ipa_virt},
> { .compatible = "qcom,sm8250-mc-virt",
> .data = &sm8250_mc_virt},
> { .compatible = "qcom,sm8250-mmss-noc",
> diff --git a/drivers/interconnect/qcom/sm8250.h b/drivers/interconnect/qcom/sm8250.h
> index b31fb431a20f..e3fc56bc7ca0 100644
> --- a/drivers/interconnect/qcom/sm8250.h
> +++ b/drivers/interconnect/qcom/sm8250.h
> @@ -31,7 +31,7 @@
> #define SM8250_MASTER_GPU_TCU 20
> #define SM8250_MASTER_GRAPHICS_3D 21
> #define SM8250_MASTER_IPA 22
> -#define SM8250_MASTER_IPA_CORE 23
> +/* 23 was used by MASTER_IPA_CORE, now represented as RPMh clock */
> #define SM8250_MASTER_LLCC 24
> #define SM8250_MASTER_MDP_PORT0 25
> #define SM8250_MASTER_MDP_PORT1 26
> @@ -92,7 +92,7 @@
> #define SM8250_SLAVE_GRAPHICS_3D_CFG 81
> #define SM8250_SLAVE_IMEM_CFG 82
> #define SM8250_SLAVE_IPA_CFG 83
> -#define SM8250_SLAVE_IPA_CORE 84
> +/* 84 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SM8250_SLAVE_IPC_ROUTER_CFG 85
> #define SM8250_SLAVE_ISENSE_CFG 86
> #define SM8250_SLAVE_LLCC 87
