* [PATCH v3 01/12] interconnect: qcom: sdx55: drop IP0 remnants
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:43 ` Konrad Dybcio
2023-01-15 4:15 ` Manivannan Sadhasivam
2023-01-09 0:29 ` [PATCH v3 02/12] interconnect: qcom: sc7180: " Dmitry Baryshkov
` (11 subsequent siblings)
12 siblings, 2 replies; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Drop two defines leftover from the commit 2fb251c26560 ("interconnect:
qcom: sdx55: Drop IP0 interconnects"), which dropped handling of the IP0
resource in favour of handling it in the clk-rpmh driver.
Fixes: 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 interconnects")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/interconnect/qcom/sdx55.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/interconnect/qcom/sdx55.h b/drivers/interconnect/qcom/sdx55.h
index deff8afe0631..46cbabec8aa1 100644
--- a/drivers/interconnect/qcom/sdx55.h
+++ b/drivers/interconnect/qcom/sdx55.h
@@ -6,7 +6,7 @@
#ifndef __DRIVERS_INTERCONNECT_QCOM_SDX55_H
#define __DRIVERS_INTERCONNECT_QCOM_SDX55_H
-#define SDX55_MASTER_IPA_CORE 0
+/* 0 was used by MASTER_IPA_CORE, now represented as RPMh clock */
#define SDX55_MASTER_LLCC 1
#define SDX55_MASTER_TCU_0 2
#define SDX55_MASTER_SNOC_GC_MEM_NOC 3
@@ -28,7 +28,7 @@
#define SDX55_MASTER_QDSS_ETR 19
#define SDX55_MASTER_SDCC_1 20
#define SDX55_MASTER_USB3 21
-#define SDX55_SLAVE_IPA_CORE 22
+/* 22 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
#define SDX55_SLAVE_EBI_CH0 23
#define SDX55_SLAVE_LLCC 24
#define SDX55_SLAVE_MEM_NOC_SNOC 25
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 01/12] interconnect: qcom: sdx55: drop IP0 remnants
2023-01-09 0:29 ` [PATCH v3 01/12] interconnect: qcom: sdx55: drop IP0 remnants Dmitry Baryshkov
@ 2023-01-09 13:43 ` Konrad Dybcio
2023-01-15 4:15 ` Manivannan Sadhasivam
1 sibling, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:43 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
On 9.01.2023 01:29, Dmitry Baryshkov wrote:
> Drop two defines leftover from the commit 2fb251c26560 ("interconnect:
> qcom: sdx55: Drop IP0 interconnects"), which dropped handling of the IP0
> resource in favour of handling it in the clk-rpmh driver.
>
> Fixes: 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 interconnects")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> drivers/interconnect/qcom/sdx55.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/interconnect/qcom/sdx55.h b/drivers/interconnect/qcom/sdx55.h
> index deff8afe0631..46cbabec8aa1 100644
> --- a/drivers/interconnect/qcom/sdx55.h
> +++ b/drivers/interconnect/qcom/sdx55.h
> @@ -6,7 +6,7 @@
> #ifndef __DRIVERS_INTERCONNECT_QCOM_SDX55_H
> #define __DRIVERS_INTERCONNECT_QCOM_SDX55_H
>
> -#define SDX55_MASTER_IPA_CORE 0
> +/* 0 was used by MASTER_IPA_CORE, now represented as RPMh clock */
> #define SDX55_MASTER_LLCC 1
> #define SDX55_MASTER_TCU_0 2
> #define SDX55_MASTER_SNOC_GC_MEM_NOC 3
> @@ -28,7 +28,7 @@
> #define SDX55_MASTER_QDSS_ETR 19
> #define SDX55_MASTER_SDCC_1 20
> #define SDX55_MASTER_USB3 21
> -#define SDX55_SLAVE_IPA_CORE 22
> +/* 22 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SDX55_SLAVE_EBI_CH0 23
> #define SDX55_SLAVE_LLCC 24
> #define SDX55_SLAVE_MEM_NOC_SNOC 25
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v3 01/12] interconnect: qcom: sdx55: drop IP0 remnants
2023-01-09 0:29 ` [PATCH v3 01/12] interconnect: qcom: sdx55: drop IP0 remnants Dmitry Baryshkov
2023-01-09 13:43 ` Konrad Dybcio
@ 2023-01-15 4:15 ` Manivannan Sadhasivam
1 sibling, 0 replies; 25+ messages in thread
From: Manivannan Sadhasivam @ 2023-01-15 4:15 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das,
Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
On Mon, Jan 09, 2023 at 02:29:24AM +0200, Dmitry Baryshkov wrote:
> Drop two defines leftover from the commit 2fb251c26560 ("interconnect:
> qcom: sdx55: Drop IP0 interconnects"), which dropped handling of the IP0
> resource in favour of handling it in the clk-rpmh driver.
>
> Fixes: 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 interconnects")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Thanks,
Mani
> ---
> drivers/interconnect/qcom/sdx55.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/interconnect/qcom/sdx55.h b/drivers/interconnect/qcom/sdx55.h
> index deff8afe0631..46cbabec8aa1 100644
> --- a/drivers/interconnect/qcom/sdx55.h
> +++ b/drivers/interconnect/qcom/sdx55.h
> @@ -6,7 +6,7 @@
> #ifndef __DRIVERS_INTERCONNECT_QCOM_SDX55_H
> #define __DRIVERS_INTERCONNECT_QCOM_SDX55_H
>
> -#define SDX55_MASTER_IPA_CORE 0
> +/* 0 was used by MASTER_IPA_CORE, now represented as RPMh clock */
> #define SDX55_MASTER_LLCC 1
> #define SDX55_MASTER_TCU_0 2
> #define SDX55_MASTER_SNOC_GC_MEM_NOC 3
> @@ -28,7 +28,7 @@
> #define SDX55_MASTER_QDSS_ETR 19
> #define SDX55_MASTER_SDCC_1 20
> #define SDX55_MASTER_USB3 21
> -#define SDX55_SLAVE_IPA_CORE 22
> +/* 22 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SDX55_SLAVE_EBI_CH0 23
> #define SDX55_SLAVE_LLCC 24
> #define SDX55_SLAVE_MEM_NOC_SNOC 25
> --
> 2.39.0
>
--
மணிவண்ணன் சதாசிவம்
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 02/12] interconnect: qcom: sc7180: drop IP0 remnants
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
2023-01-09 0:29 ` [PATCH v3 01/12] interconnect: qcom: sdx55: drop IP0 remnants Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:43 ` Konrad Dybcio
2023-01-09 0:29 ` [PATCH v3 03/12] interconnect: move ignore_list out of of_count_icc_providers() Dmitry Baryshkov
` (10 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Drop two defines leftover from the commit 2f3724930eb4 ("interconnect:
qcom: sc7180: Drop IP0 interconnects"), which dropped handling of the
IP0 resource in favour of handling it in the clk-rpmh driver.
Fixes: 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 interconnects")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/interconnect/qcom/sc7180.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/interconnect/qcom/sc7180.h b/drivers/interconnect/qcom/sc7180.h
index c6212a10c2f6..7a2b3eb00923 100644
--- a/drivers/interconnect/qcom/sc7180.h
+++ b/drivers/interconnect/qcom/sc7180.h
@@ -11,7 +11,7 @@
#define SC7180_MASTER_APPSS_PROC 0
#define SC7180_MASTER_SYS_TCU 1
#define SC7180_MASTER_NPU_SYS 2
-#define SC7180_MASTER_IPA_CORE 3
+/* 3 was used by MASTER_IPA_CORE, now represented as RPMh clock */
#define SC7180_MASTER_LLCC 4
#define SC7180_MASTER_A1NOC_CFG 5
#define SC7180_MASTER_A2NOC_CFG 6
@@ -58,7 +58,7 @@
#define SC7180_MASTER_USB3 47
#define SC7180_MASTER_EMMC 48
#define SC7180_SLAVE_EBI1 49
-#define SC7180_SLAVE_IPA_CORE 50
+/* 50 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
#define SC7180_SLAVE_A1NOC_CFG 51
#define SC7180_SLAVE_A2NOC_CFG 52
#define SC7180_SLAVE_AHB2PHY_SOUTH 53
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 02/12] interconnect: qcom: sc7180: drop IP0 remnants
2023-01-09 0:29 ` [PATCH v3 02/12] interconnect: qcom: sc7180: " Dmitry Baryshkov
@ 2023-01-09 13:43 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:43 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
On 9.01.2023 01:29, Dmitry Baryshkov wrote:
> Drop two defines leftover from the commit 2f3724930eb4 ("interconnect:
> qcom: sc7180: Drop IP0 interconnects"), which dropped handling of the
> IP0 resource in favour of handling it in the clk-rpmh driver.
>
> Fixes: 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 interconnects")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> drivers/interconnect/qcom/sc7180.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/interconnect/qcom/sc7180.h b/drivers/interconnect/qcom/sc7180.h
> index c6212a10c2f6..7a2b3eb00923 100644
> --- a/drivers/interconnect/qcom/sc7180.h
> +++ b/drivers/interconnect/qcom/sc7180.h
> @@ -11,7 +11,7 @@
> #define SC7180_MASTER_APPSS_PROC 0
> #define SC7180_MASTER_SYS_TCU 1
> #define SC7180_MASTER_NPU_SYS 2
> -#define SC7180_MASTER_IPA_CORE 3
> +/* 3 was used by MASTER_IPA_CORE, now represented as RPMh clock */
> #define SC7180_MASTER_LLCC 4
> #define SC7180_MASTER_A1NOC_CFG 5
> #define SC7180_MASTER_A2NOC_CFG 6
> @@ -58,7 +58,7 @@
> #define SC7180_MASTER_USB3 47
> #define SC7180_MASTER_EMMC 48
> #define SC7180_SLAVE_EBI1 49
> -#define SC7180_SLAVE_IPA_CORE 50
> +/* 50 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SC7180_SLAVE_A1NOC_CFG 51
> #define SC7180_SLAVE_A2NOC_CFG 52
> #define SC7180_SLAVE_AHB2PHY_SOUTH 53
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 03/12] interconnect: move ignore_list out of of_count_icc_providers()
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
2023-01-09 0:29 ` [PATCH v3 01/12] interconnect: qcom: sdx55: drop IP0 remnants Dmitry Baryshkov
2023-01-09 0:29 ` [PATCH v3 02/12] interconnect: qcom: sc7180: " Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:44 ` Konrad Dybcio
2023-01-09 0:29 ` [PATCH v3 04/12] interconnect: qcom: sm8150: Drop IP0 interconnects Dmitry Baryshkov
` (9 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree, kernel test robot
Move the const ignore_list definition out of the
of_count_icc_providers() function. This prevents the following stack
frame size warnings if the list is expanded:
drivers/interconnect/core.c:1082:12: warning: stack frame size (1216) exceeds limit (1024) in 'of_count_icc_providers' [-Wframe-larger-than]
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/interconnect/core.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index 25debded65a8..df77d2f6215d 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -1079,15 +1079,16 @@ void icc_provider_del(struct icc_provider *provider)
}
EXPORT_SYMBOL_GPL(icc_provider_del);
+static const struct of_device_id __maybe_unused ignore_list[] = {
+ { .compatible = "qcom,sc7180-ipa-virt" },
+ { .compatible = "qcom,sdx55-ipa-virt" },
+ {}
+};
+
static int of_count_icc_providers(struct device_node *np)
{
struct device_node *child;
int count = 0;
- const struct of_device_id __maybe_unused ignore_list[] = {
- { .compatible = "qcom,sc7180-ipa-virt" },
- { .compatible = "qcom,sdx55-ipa-virt" },
- {}
- };
for_each_available_child_of_node(np, child) {
if (of_property_read_bool(child, "#interconnect-cells") &&
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 03/12] interconnect: move ignore_list out of of_count_icc_providers()
2023-01-09 0:29 ` [PATCH v3 03/12] interconnect: move ignore_list out of of_count_icc_providers() Dmitry Baryshkov
@ 2023-01-09 13:44 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:44 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree, kernel test robot
On 9.01.2023 01:29, Dmitry Baryshkov wrote:
> Move the const ignore_list definition out of the
> of_count_icc_providers() function. This prevents the following stack
> frame size warnings if the list is expanded:
>
> drivers/interconnect/core.c:1082:12: warning: stack frame size (1216) exceeds limit (1024) in 'of_count_icc_providers' [-Wframe-larger-than]
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> drivers/interconnect/core.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
> index 25debded65a8..df77d2f6215d 100644
> --- a/drivers/interconnect/core.c
> +++ b/drivers/interconnect/core.c
> @@ -1079,15 +1079,16 @@ void icc_provider_del(struct icc_provider *provider)
> }
> EXPORT_SYMBOL_GPL(icc_provider_del);
>
> +static const struct of_device_id __maybe_unused ignore_list[] = {
> + { .compatible = "qcom,sc7180-ipa-virt" },
> + { .compatible = "qcom,sdx55-ipa-virt" },
> + {}
> +};
> +
> static int of_count_icc_providers(struct device_node *np)
> {
> struct device_node *child;
> int count = 0;
> - const struct of_device_id __maybe_unused ignore_list[] = {
> - { .compatible = "qcom,sc7180-ipa-virt" },
> - { .compatible = "qcom,sdx55-ipa-virt" },
> - {}
> - };
>
> for_each_available_child_of_node(np, child) {
> if (of_property_read_bool(child, "#interconnect-cells") &&
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 04/12] interconnect: qcom: sm8150: Drop IP0 interconnects
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (2 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 03/12] interconnect: move ignore_list out of of_count_icc_providers() Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:45 ` Konrad Dybcio
2023-01-09 0:29 ` [PATCH v3 05/12] interconnect: qcom: sm8250: " Dmitry Baryshkov
` (8 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and
SLAVE_IPA_CORE interconnects for this platofm. There are no actual users
of this intercoonect. The IP0 resource will be handled by clk-rpmh
driver.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/interconnect/core.c | 1 +
drivers/interconnect/qcom/sm8150.c | 21 ---------------------
drivers/interconnect/qcom/sm8150.h | 4 ++--
3 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index df77d2f6215d..cea54477cfe3 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -1082,6 +1082,7 @@ EXPORT_SYMBOL_GPL(icc_provider_del);
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" },
{}
};
diff --git a/drivers/interconnect/qcom/sm8150.c b/drivers/interconnect/qcom/sm8150.c
index 1d04a4bfea80..c5ab29322164 100644
--- a/drivers/interconnect/qcom/sm8150.c
+++ b/drivers/interconnect/qcom/sm8150.c
@@ -56,7 +56,6 @@ DEFINE_QNODE(qnm_pcie, SM8150_MASTER_GEM_NOC_PCIE_SNOC, 1, 16, SM8150_SLAVE_LLCC
DEFINE_QNODE(qnm_snoc_gc, SM8150_MASTER_SNOC_GC_MEM_NOC, 1, 8, SM8150_SLAVE_LLCC);
DEFINE_QNODE(qnm_snoc_sf, SM8150_MASTER_SNOC_SF_MEM_NOC, 1, 16, SM8150_SLAVE_LLCC);
DEFINE_QNODE(qxm_ecc, SM8150_MASTER_ECC, 2, 32, SM8150_SLAVE_LLCC);
-DEFINE_QNODE(ipa_core_master, SM8150_MASTER_IPA_CORE, 1, 8, SM8150_SLAVE_IPA_CORE);
DEFINE_QNODE(llcc_mc, SM8150_MASTER_LLCC, 4, 4, SM8150_SLAVE_EBI_CH0);
DEFINE_QNODE(qhm_mnoc_cfg, SM8150_MASTER_CNOC_MNOC_CFG, 1, 4, SM8150_SLAVE_SERVICE_MNOC);
DEFINE_QNODE(qxm_camnoc_hf0, SM8150_MASTER_CAMNOC_HF0, 1, 32, SM8150_SLAVE_MNOC_HF_MEM_NOC);
@@ -139,7 +138,6 @@ DEFINE_QNODE(qns_ecc, SM8150_SLAVE_ECC, 1, 32);
DEFINE_QNODE(qns_gem_noc_snoc, SM8150_SLAVE_GEM_NOC_SNOC, 1, 8, SM8150_MASTER_GEM_NOC_SNOC);
DEFINE_QNODE(qns_llcc, SM8150_SLAVE_LLCC, 4, 16, SM8150_MASTER_LLCC);
DEFINE_QNODE(srvc_gemnoc, SM8150_SLAVE_SERVICE_GEM_NOC, 1, 4);
-DEFINE_QNODE(ipa_core_slave, SM8150_SLAVE_IPA_CORE, 1, 8);
DEFINE_QNODE(ebi, SM8150_SLAVE_EBI_CH0, 4, 4);
DEFINE_QNODE(qns2_mem_noc, SM8150_SLAVE_MNOC_SF_MEM_NOC, 1, 32, SM8150_MASTER_MNOC_SF_MEM_NOC);
DEFINE_QNODE(qns_mem_noc_hf, SM8150_SLAVE_MNOC_HF_MEM_NOC, 2, 32, SM8150_MASTER_MNOC_HF_MEM_NOC);
@@ -172,7 +170,6 @@ DEFINE_QBCM(bcm_co0, "CO0", false, &qns_cdsp_mem_noc);
DEFINE_QBCM(bcm_ce0, "CE0", false, &qxm_crypto);
DEFINE_QBCM(bcm_sn1, "SN1", false, &qxs_imem);
DEFINE_QBCM(bcm_co1, "CO1", false, &qnm_npu);
-DEFINE_QBCM(bcm_ip0, "IP0", false, &ipa_core_slave);
DEFINE_QBCM(bcm_cn0, "CN0", true, &qhm_spdm, &qnm_snoc, &qhs_a1_noc_cfg, &qhs_a2_noc_cfg, &qhs_ahb2phy_south, &qhs_aop, &qhs_aoss, &qhs_camera_cfg, &qhs_clk_ctl, &qhs_compute_dsp, &qhs_cpr_cx, &qhs_cpr_mmcx, &qhs_cpr_mx, &qhs_crypto0_cfg, &qhs_ddrss_cfg, &qhs_display_cfg, &qhs_emac_cfg, &qhs_glm, &qhs_gpuss_cfg, &qhs_imem_cfg, &qhs_ipa, &qhs_mnoc_cfg, &qhs_npu_cfg, &qhs_pcie0_cfg, &qhs_pcie1_cfg, &qhs_phy_refgen_north, &qhs_pimem_cfg, &qhs_prng, &qhs_qdss_cfg, &qhs_qspi, &qhs_qupv3_east, &qhs_qupv3_north, &qhs_qupv3_south, &qhs_sdc2, &qhs_sdc4, &qhs_snoc_cfg, &qhs_spdm, &qhs_spss_cfg, &qhs_ssc_cfg, &qhs_tcsr, &qhs_tlmm_east, &qhs_tlmm_north, &qhs_tlmm_south, &qhs_tlmm_west, &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_qup0, &qhm_qup1, &qhm_qup2);
DEFINE_QBCM(bcm_sn2, "SN2", false, &qns_gemnoc_gc);
@@ -398,22 +395,6 @@ static const struct qcom_icc_desc sm8150_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 sm8150_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,
@@ -517,8 +498,6 @@ static const struct of_device_id qnoc_of_match[] = {
.data = &sm8150_dc_noc},
{ .compatible = "qcom,sm8150-gem-noc",
.data = &sm8150_gem_noc},
- { .compatible = "qcom,sm8150-ipa-virt",
- .data = &sm8150_ipa_virt},
{ .compatible = "qcom,sm8150-mc-virt",
.data = &sm8150_mc_virt},
{ .compatible = "qcom,sm8150-mmss-noc",
diff --git a/drivers/interconnect/qcom/sm8150.h b/drivers/interconnect/qcom/sm8150.h
index 97996f64d799..023161681fb8 100644
--- a/drivers/interconnect/qcom/sm8150.h
+++ b/drivers/interconnect/qcom/sm8150.h
@@ -35,7 +35,7 @@
#define SM8150_MASTER_GPU_TCU 24
#define SM8150_MASTER_GRAPHICS_3D 25
#define SM8150_MASTER_IPA 26
-#define SM8150_MASTER_IPA_CORE 27
+/* 27 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
#define SM8150_MASTER_LLCC 28
#define SM8150_MASTER_MDP_PORT0 29
#define SM8150_MASTER_MDP_PORT1 30
@@ -94,7 +94,7 @@
#define SM8150_SLAVE_GRAPHICS_3D_CFG 83
#define SM8150_SLAVE_IMEM_CFG 84
#define SM8150_SLAVE_IPA_CFG 85
-#define SM8150_SLAVE_IPA_CORE 86
+/* 86 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
#define SM8150_SLAVE_LLCC 87
#define SM8150_SLAVE_LLCC_CFG 88
#define SM8150_SLAVE_MNOC_HF_MEM_NOC 89
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 04/12] interconnect: qcom: sm8150: Drop IP0 interconnects
2023-01-09 0:29 ` [PATCH v3 04/12] interconnect: qcom: sm8150: Drop IP0 interconnects Dmitry Baryshkov
@ 2023-01-09 13:45 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:45 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
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@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> drivers/interconnect/core.c | 1 +
> drivers/interconnect/qcom/sm8150.c | 21 ---------------------
> drivers/interconnect/qcom/sm8150.h | 4 ++--
> 3 files changed, 3 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
> index df77d2f6215d..cea54477cfe3 100644
> --- a/drivers/interconnect/core.c
> +++ b/drivers/interconnect/core.c
> @@ -1082,6 +1082,7 @@ EXPORT_SYMBOL_GPL(icc_provider_del);
> 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" },
> {}
> };
>
> diff --git a/drivers/interconnect/qcom/sm8150.c b/drivers/interconnect/qcom/sm8150.c
> index 1d04a4bfea80..c5ab29322164 100644
> --- a/drivers/interconnect/qcom/sm8150.c
> +++ b/drivers/interconnect/qcom/sm8150.c
> @@ -56,7 +56,6 @@ DEFINE_QNODE(qnm_pcie, SM8150_MASTER_GEM_NOC_PCIE_SNOC, 1, 16, SM8150_SLAVE_LLCC
> DEFINE_QNODE(qnm_snoc_gc, SM8150_MASTER_SNOC_GC_MEM_NOC, 1, 8, SM8150_SLAVE_LLCC);
> DEFINE_QNODE(qnm_snoc_sf, SM8150_MASTER_SNOC_SF_MEM_NOC, 1, 16, SM8150_SLAVE_LLCC);
> DEFINE_QNODE(qxm_ecc, SM8150_MASTER_ECC, 2, 32, SM8150_SLAVE_LLCC);
> -DEFINE_QNODE(ipa_core_master, SM8150_MASTER_IPA_CORE, 1, 8, SM8150_SLAVE_IPA_CORE);
> DEFINE_QNODE(llcc_mc, SM8150_MASTER_LLCC, 4, 4, SM8150_SLAVE_EBI_CH0);
> DEFINE_QNODE(qhm_mnoc_cfg, SM8150_MASTER_CNOC_MNOC_CFG, 1, 4, SM8150_SLAVE_SERVICE_MNOC);
> DEFINE_QNODE(qxm_camnoc_hf0, SM8150_MASTER_CAMNOC_HF0, 1, 32, SM8150_SLAVE_MNOC_HF_MEM_NOC);
> @@ -139,7 +138,6 @@ DEFINE_QNODE(qns_ecc, SM8150_SLAVE_ECC, 1, 32);
> DEFINE_QNODE(qns_gem_noc_snoc, SM8150_SLAVE_GEM_NOC_SNOC, 1, 8, SM8150_MASTER_GEM_NOC_SNOC);
> DEFINE_QNODE(qns_llcc, SM8150_SLAVE_LLCC, 4, 16, SM8150_MASTER_LLCC);
> DEFINE_QNODE(srvc_gemnoc, SM8150_SLAVE_SERVICE_GEM_NOC, 1, 4);
> -DEFINE_QNODE(ipa_core_slave, SM8150_SLAVE_IPA_CORE, 1, 8);
> DEFINE_QNODE(ebi, SM8150_SLAVE_EBI_CH0, 4, 4);
> DEFINE_QNODE(qns2_mem_noc, SM8150_SLAVE_MNOC_SF_MEM_NOC, 1, 32, SM8150_MASTER_MNOC_SF_MEM_NOC);
> DEFINE_QNODE(qns_mem_noc_hf, SM8150_SLAVE_MNOC_HF_MEM_NOC, 2, 32, SM8150_MASTER_MNOC_HF_MEM_NOC);
> @@ -172,7 +170,6 @@ DEFINE_QBCM(bcm_co0, "CO0", false, &qns_cdsp_mem_noc);
> DEFINE_QBCM(bcm_ce0, "CE0", false, &qxm_crypto);
> DEFINE_QBCM(bcm_sn1, "SN1", false, &qxs_imem);
> DEFINE_QBCM(bcm_co1, "CO1", false, &qnm_npu);
> -DEFINE_QBCM(bcm_ip0, "IP0", false, &ipa_core_slave);
> DEFINE_QBCM(bcm_cn0, "CN0", true, &qhm_spdm, &qnm_snoc, &qhs_a1_noc_cfg, &qhs_a2_noc_cfg, &qhs_ahb2phy_south, &qhs_aop, &qhs_aoss, &qhs_camera_cfg, &qhs_clk_ctl, &qhs_compute_dsp, &qhs_cpr_cx, &qhs_cpr_mmcx, &qhs_cpr_mx, &qhs_crypto0_cfg, &qhs_ddrss_cfg, &qhs_display_cfg, &qhs_emac_cfg, &qhs_glm, &qhs_gpuss_cfg, &qhs_imem_cfg, &qhs_ipa, &qhs_mnoc_cfg, &qhs_npu_cfg, &qhs_pcie0_cfg, &qhs_pcie1_cfg, &qhs_phy_refgen_north, &qhs_pimem_cfg, &qhs_prng, &qhs_qdss_cfg, &qhs_qspi, &qhs_qupv3_east, &qhs_qupv3_north, &qhs_qupv3_south, &qhs_sdc2, &qhs_sdc4, &qhs_snoc_cfg, &qhs_spdm, &qhs_spss_cfg, &qhs_ssc_cfg, &qhs_tcsr, &qhs_tlmm_east, &qhs_tlmm_north, &qhs_tlmm_south, &qhs_tlmm_west, &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_qup0, &qhm_qup1, &qhm_qup2);
> DEFINE_QBCM(bcm_sn2, "SN2", false, &qns_gemnoc_gc);
> @@ -398,22 +395,6 @@ static const struct qcom_icc_desc sm8150_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 sm8150_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,
> @@ -517,8 +498,6 @@ static const struct of_device_id qnoc_of_match[] = {
> .data = &sm8150_dc_noc},
> { .compatible = "qcom,sm8150-gem-noc",
> .data = &sm8150_gem_noc},
> - { .compatible = "qcom,sm8150-ipa-virt",
> - .data = &sm8150_ipa_virt},
> { .compatible = "qcom,sm8150-mc-virt",
> .data = &sm8150_mc_virt},
> { .compatible = "qcom,sm8150-mmss-noc",
> diff --git a/drivers/interconnect/qcom/sm8150.h b/drivers/interconnect/qcom/sm8150.h
> index 97996f64d799..023161681fb8 100644
> --- a/drivers/interconnect/qcom/sm8150.h
> +++ b/drivers/interconnect/qcom/sm8150.h
> @@ -35,7 +35,7 @@
> #define SM8150_MASTER_GPU_TCU 24
> #define SM8150_MASTER_GRAPHICS_3D 25
> #define SM8150_MASTER_IPA 26
> -#define SM8150_MASTER_IPA_CORE 27
> +/* 27 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SM8150_MASTER_LLCC 28
> #define SM8150_MASTER_MDP_PORT0 29
> #define SM8150_MASTER_MDP_PORT1 30
> @@ -94,7 +94,7 @@
> #define SM8150_SLAVE_GRAPHICS_3D_CFG 83
> #define SM8150_SLAVE_IMEM_CFG 84
> #define SM8150_SLAVE_IPA_CFG 85
> -#define SM8150_SLAVE_IPA_CORE 86
> +/* 86 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SM8150_SLAVE_LLCC 87
> #define SM8150_SLAVE_LLCC_CFG 88
> #define SM8150_SLAVE_MNOC_HF_MEM_NOC 89
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 05/12] interconnect: qcom: sm8250: Drop IP0 interconnects
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (3 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 04/12] interconnect: qcom: sm8150: Drop IP0 interconnects Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:45 ` Konrad Dybcio
2023-01-09 0:29 ` [PATCH v3 06/12] interconnect: qcom: sc8180x: " Dmitry Baryshkov
` (7 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and
SLAVE_IPA_CORE interconnects for this platofm. There are no actual users
of this intercoonect. The IP0 resource will be handled by clk-rpmh
driver.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
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
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 05/12] interconnect: qcom: sm8250: Drop IP0 interconnects
2023-01-09 0:29 ` [PATCH v3 05/12] interconnect: qcom: sm8250: " Dmitry Baryshkov
@ 2023-01-09 13:45 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:45 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
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@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
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
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 06/12] interconnect: qcom: sc8180x: Drop IP0 interconnects
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (4 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 05/12] interconnect: qcom: sm8250: " Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:46 ` Konrad Dybcio
2023-01-09 0:29 ` [PATCH v3 07/12] interconnect: qcom: sc8280xp: " Dmitry Baryshkov
` (6 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and
SLAVE_IPA_CORE interconnects for this platofm. There are no actual users
of this intercoonect. The IP0 resource will be handled by clk-rpmh
driver.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/interconnect/core.c | 1 +
drivers/interconnect/qcom/sc8180x.c | 38 -----------------------------
drivers/interconnect/qcom/sc8180x.h | 4 +--
3 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index 5b5fd436f23f..0f392f59b135 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -1081,6 +1081,7 @@ EXPORT_SYMBOL_GPL(icc_provider_del);
static const struct of_device_id __maybe_unused ignore_list[] = {
{ .compatible = "qcom,sc7180-ipa-virt" },
+ { .compatible = "qcom,sc8180x-ipa-virt" },
{ .compatible = "qcom,sdx55-ipa-virt" },
{ .compatible = "qcom,sm8150-ipa-virt" },
{ .compatible = "qcom,sm8250-ipa-virt" },
diff --git a/drivers/interconnect/qcom/sc8180x.c b/drivers/interconnect/qcom/sc8180x.c
index 0f515bf10bd7..c76e3a6a98cd 100644
--- a/drivers/interconnect/qcom/sc8180x.c
+++ b/drivers/interconnect/qcom/sc8180x.c
@@ -469,15 +469,6 @@ static struct qcom_icc_node mas_qxm_ecc = {
.links = { SC8180X_SLAVE_LLCC }
};
-static struct qcom_icc_node mas_ipa_core_master = {
- .name = "mas_ipa_core_master",
- .id = SC8180X_MASTER_IPA_CORE,
- .channels = 1,
- .buswidth = 8,
- .num_links = 1,
- .links = { SC8180X_SLAVE_IPA_CORE }
-};
-
static struct qcom_icc_node mas_llcc_mc = {
.name = "mas_llcc_mc",
.id = SC8180X_MASTER_LLCC,
@@ -1201,13 +1192,6 @@ static struct qcom_icc_node slv_srvc_gemnoc1 = {
.buswidth = 4
};
-static struct qcom_icc_node slv_ipa_core_slave = {
- .name = "slv_ipa_core_slave",
- .id = SC8180X_SLAVE_IPA_CORE,
- .channels = 1,
- .buswidth = 8
-};
-
static struct qcom_icc_node slv_ebi = {
.name = "slv_ebi",
.id = SC8180X_SLAVE_EBI_CH0,
@@ -1524,11 +1508,6 @@ static struct qcom_icc_bcm bcm_co2 = {
.nodes = { &mas_qnm_npu }
};
-static struct qcom_icc_bcm bcm_ip0 = {
- .name = "IP0",
- .nodes = { &slv_ipa_core_slave }
-};
-
static struct qcom_icc_bcm bcm_sn3 = {
.name = "SN3",
.keepalive = true,
@@ -1604,10 +1583,6 @@ static struct qcom_icc_bcm * const gem_noc_bcms[] = {
&bcm_sh3,
};
-static struct qcom_icc_bcm * const ipa_virt_bcms[] = {
- &bcm_ip0,
-};
-
static struct qcom_icc_bcm * const mc_virt_bcms[] = {
&bcm_mc0,
&bcm_acv,
@@ -1766,11 +1741,6 @@ static struct qcom_icc_node * const gem_noc_nodes[] = {
[SLAVE_SERVICE_GEM_NOC_1] = &slv_srvc_gemnoc1,
};
-static struct qcom_icc_node * const ipa_virt_nodes[] = {
- [MASTER_IPA_CORE] = &mas_ipa_core_master,
- [SLAVE_IPA_CORE] = &slv_ipa_core_slave,
-};
-
static struct qcom_icc_node * const mc_virt_nodes[] = {
[MASTER_LLCC] = &mas_llcc_mc,
[SLAVE_EBI_CH0] = &slv_ebi,
@@ -1857,13 +1827,6 @@ static const struct qcom_icc_desc sc8180x_gem_noc = {
.num_bcms = ARRAY_SIZE(gem_noc_bcms),
};
-static const struct qcom_icc_desc sc8180x_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 const struct qcom_icc_desc sc8180x_mc_virt = {
.nodes = mc_virt_nodes,
.num_nodes = ARRAY_SIZE(mc_virt_nodes),
@@ -1913,7 +1876,6 @@ static const struct of_device_id qnoc_of_match[] = {
{ .compatible = "qcom,sc8180x-config-noc", .data = &sc8180x_config_noc },
{ .compatible = "qcom,sc8180x-dc-noc", .data = &sc8180x_dc_noc },
{ .compatible = "qcom,sc8180x-gem-noc", .data = &sc8180x_gem_noc },
- { .compatible = "qcom,sc8180x-ipa-virt", .data = &sc8180x_ipa_virt },
{ .compatible = "qcom,sc8180x-mc-virt", .data = &sc8180x_mc_virt },
{ .compatible = "qcom,sc8180x-mmss-noc", .data = &sc8180x_mmss_noc },
{ .compatible = "qcom,sc8180x-qup-virt", .data = &sc8180x_qup_virt },
diff --git a/drivers/interconnect/qcom/sc8180x.h b/drivers/interconnect/qcom/sc8180x.h
index 2eafd35543c7..c138dcd350f1 100644
--- a/drivers/interconnect/qcom/sc8180x.h
+++ b/drivers/interconnect/qcom/sc8180x.h
@@ -51,7 +51,7 @@
#define SC8180X_MASTER_SNOC_GC_MEM_NOC 41
#define SC8180X_MASTER_SNOC_SF_MEM_NOC 42
#define SC8180X_MASTER_ECC 43
-#define SC8180X_MASTER_IPA_CORE 44
+/* 44 was used by MASTER_IPA_CORE, now represented as RPMh clock */
#define SC8180X_MASTER_LLCC 45
#define SC8180X_MASTER_CNOC_MNOC_CFG 46
#define SC8180X_MASTER_CAMNOC_HF0 47
@@ -146,7 +146,7 @@
#define SC8180X_SLAVE_LLCC 136
#define SC8180X_SLAVE_SERVICE_GEM_NOC 137
#define SC8180X_SLAVE_SERVICE_GEM_NOC_1 138
-#define SC8180X_SLAVE_IPA_CORE 139
+/* 139 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
#define SC8180X_SLAVE_EBI_CH0 140
#define SC8180X_SLAVE_MNOC_SF_MEM_NOC 141
#define SC8180X_SLAVE_MNOC_HF_MEM_NOC 142
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 06/12] interconnect: qcom: sc8180x: Drop IP0 interconnects
2023-01-09 0:29 ` [PATCH v3 06/12] interconnect: qcom: sc8180x: " Dmitry Baryshkov
@ 2023-01-09 13:46 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:46 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
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@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> drivers/interconnect/core.c | 1 +
> drivers/interconnect/qcom/sc8180x.c | 38 -----------------------------
> drivers/interconnect/qcom/sc8180x.h | 4 +--
> 3 files changed, 3 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
> index 5b5fd436f23f..0f392f59b135 100644
> --- a/drivers/interconnect/core.c
> +++ b/drivers/interconnect/core.c
> @@ -1081,6 +1081,7 @@ EXPORT_SYMBOL_GPL(icc_provider_del);
>
> static const struct of_device_id __maybe_unused ignore_list[] = {
> { .compatible = "qcom,sc7180-ipa-virt" },
> + { .compatible = "qcom,sc8180x-ipa-virt" },
> { .compatible = "qcom,sdx55-ipa-virt" },
> { .compatible = "qcom,sm8150-ipa-virt" },
> { .compatible = "qcom,sm8250-ipa-virt" },
> diff --git a/drivers/interconnect/qcom/sc8180x.c b/drivers/interconnect/qcom/sc8180x.c
> index 0f515bf10bd7..c76e3a6a98cd 100644
> --- a/drivers/interconnect/qcom/sc8180x.c
> +++ b/drivers/interconnect/qcom/sc8180x.c
> @@ -469,15 +469,6 @@ static struct qcom_icc_node mas_qxm_ecc = {
> .links = { SC8180X_SLAVE_LLCC }
> };
>
> -static struct qcom_icc_node mas_ipa_core_master = {
> - .name = "mas_ipa_core_master",
> - .id = SC8180X_MASTER_IPA_CORE,
> - .channels = 1,
> - .buswidth = 8,
> - .num_links = 1,
> - .links = { SC8180X_SLAVE_IPA_CORE }
> -};
> -
> static struct qcom_icc_node mas_llcc_mc = {
> .name = "mas_llcc_mc",
> .id = SC8180X_MASTER_LLCC,
> @@ -1201,13 +1192,6 @@ static struct qcom_icc_node slv_srvc_gemnoc1 = {
> .buswidth = 4
> };
>
> -static struct qcom_icc_node slv_ipa_core_slave = {
> - .name = "slv_ipa_core_slave",
> - .id = SC8180X_SLAVE_IPA_CORE,
> - .channels = 1,
> - .buswidth = 8
> -};
> -
> static struct qcom_icc_node slv_ebi = {
> .name = "slv_ebi",
> .id = SC8180X_SLAVE_EBI_CH0,
> @@ -1524,11 +1508,6 @@ static struct qcom_icc_bcm bcm_co2 = {
> .nodes = { &mas_qnm_npu }
> };
>
> -static struct qcom_icc_bcm bcm_ip0 = {
> - .name = "IP0",
> - .nodes = { &slv_ipa_core_slave }
> -};
> -
> static struct qcom_icc_bcm bcm_sn3 = {
> .name = "SN3",
> .keepalive = true,
> @@ -1604,10 +1583,6 @@ static struct qcom_icc_bcm * const gem_noc_bcms[] = {
> &bcm_sh3,
> };
>
> -static struct qcom_icc_bcm * const ipa_virt_bcms[] = {
> - &bcm_ip0,
> -};
> -
> static struct qcom_icc_bcm * const mc_virt_bcms[] = {
> &bcm_mc0,
> &bcm_acv,
> @@ -1766,11 +1741,6 @@ static struct qcom_icc_node * const gem_noc_nodes[] = {
> [SLAVE_SERVICE_GEM_NOC_1] = &slv_srvc_gemnoc1,
> };
>
> -static struct qcom_icc_node * const ipa_virt_nodes[] = {
> - [MASTER_IPA_CORE] = &mas_ipa_core_master,
> - [SLAVE_IPA_CORE] = &slv_ipa_core_slave,
> -};
> -
> static struct qcom_icc_node * const mc_virt_nodes[] = {
> [MASTER_LLCC] = &mas_llcc_mc,
> [SLAVE_EBI_CH0] = &slv_ebi,
> @@ -1857,13 +1827,6 @@ static const struct qcom_icc_desc sc8180x_gem_noc = {
> .num_bcms = ARRAY_SIZE(gem_noc_bcms),
> };
>
> -static const struct qcom_icc_desc sc8180x_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 const struct qcom_icc_desc sc8180x_mc_virt = {
> .nodes = mc_virt_nodes,
> .num_nodes = ARRAY_SIZE(mc_virt_nodes),
> @@ -1913,7 +1876,6 @@ static const struct of_device_id qnoc_of_match[] = {
> { .compatible = "qcom,sc8180x-config-noc", .data = &sc8180x_config_noc },
> { .compatible = "qcom,sc8180x-dc-noc", .data = &sc8180x_dc_noc },
> { .compatible = "qcom,sc8180x-gem-noc", .data = &sc8180x_gem_noc },
> - { .compatible = "qcom,sc8180x-ipa-virt", .data = &sc8180x_ipa_virt },
> { .compatible = "qcom,sc8180x-mc-virt", .data = &sc8180x_mc_virt },
> { .compatible = "qcom,sc8180x-mmss-noc", .data = &sc8180x_mmss_noc },
> { .compatible = "qcom,sc8180x-qup-virt", .data = &sc8180x_qup_virt },
> diff --git a/drivers/interconnect/qcom/sc8180x.h b/drivers/interconnect/qcom/sc8180x.h
> index 2eafd35543c7..c138dcd350f1 100644
> --- a/drivers/interconnect/qcom/sc8180x.h
> +++ b/drivers/interconnect/qcom/sc8180x.h
> @@ -51,7 +51,7 @@
> #define SC8180X_MASTER_SNOC_GC_MEM_NOC 41
> #define SC8180X_MASTER_SNOC_SF_MEM_NOC 42
> #define SC8180X_MASTER_ECC 43
> -#define SC8180X_MASTER_IPA_CORE 44
> +/* 44 was used by MASTER_IPA_CORE, now represented as RPMh clock */
> #define SC8180X_MASTER_LLCC 45
> #define SC8180X_MASTER_CNOC_MNOC_CFG 46
> #define SC8180X_MASTER_CAMNOC_HF0 47
> @@ -146,7 +146,7 @@
> #define SC8180X_SLAVE_LLCC 136
> #define SC8180X_SLAVE_SERVICE_GEM_NOC 137
> #define SC8180X_SLAVE_SERVICE_GEM_NOC_1 138
> -#define SC8180X_SLAVE_IPA_CORE 139
> +/* 139 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SC8180X_SLAVE_EBI_CH0 140
> #define SC8180X_SLAVE_MNOC_SF_MEM_NOC 141
> #define SC8180X_SLAVE_MNOC_HF_MEM_NOC 142
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 07/12] interconnect: qcom: sc8280xp: Drop IP0 interconnects
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (5 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 06/12] interconnect: qcom: sc8180x: " Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:48 ` Konrad Dybcio
2023-01-09 0:29 ` [PATCH v3 08/12] dt-bindings: interconnect: qcom: Remove ipa-virt compatibles Dmitry Baryshkov
` (5 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and
SLAVE_IPA_CORE interconnects for this platofm. There are no actual users
of this intercoonect. The IP0 resource will be handled by clk-rpmh
driver.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/interconnect/qcom/sc8280xp.c | 25 -------------------------
drivers/interconnect/qcom/sc8280xp.h | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/drivers/interconnect/qcom/sc8280xp.c b/drivers/interconnect/qcom/sc8280xp.c
index 507fe5f89791..e56df893ec3e 100644
--- a/drivers/interconnect/qcom/sc8280xp.c
+++ b/drivers/interconnect/qcom/sc8280xp.c
@@ -284,15 +284,6 @@ static struct qcom_icc_node xm_ufs_card = {
.links = { SC8280XP_SLAVE_A2NOC_SNOC },
};
-static struct qcom_icc_node ipa_core_master = {
- .name = "ipa_core_master",
- .id = SC8280XP_MASTER_IPA_CORE,
- .channels = 1,
- .buswidth = 8,
- .num_links = 1,
- .links = { SC8280XP_SLAVE_IPA_CORE },
-};
-
static struct qcom_icc_node qup0_core_master = {
.name = "qup0_core_master",
.id = SC8280XP_MASTER_QUP_CORE_0,
@@ -882,13 +873,6 @@ static struct qcom_icc_node srvc_aggre2_noc = {
.buswidth = 4,
};
-static struct qcom_icc_node ipa_core_slave = {
- .name = "ipa_core_slave",
- .id = SC8280XP_SLAVE_IPA_CORE,
- .channels = 1,
- .buswidth = 8,
-};
-
static struct qcom_icc_node qup0_core_slave = {
.name = "qup0_core_slave",
.id = SC8280XP_SLAVE_QUP_CORE_0,
@@ -1845,12 +1829,6 @@ static struct qcom_icc_bcm bcm_cn3 = {
},
};
-static struct qcom_icc_bcm bcm_ip0 = {
- .name = "IP0",
- .num_nodes = 1,
- .nodes = { &ipa_core_slave },
-};
-
static struct qcom_icc_bcm bcm_mc0 = {
.name = "MC0",
.keepalive = true,
@@ -2077,18 +2055,15 @@ static const struct qcom_icc_desc sc8280xp_aggre2_noc = {
};
static struct qcom_icc_bcm * const clk_virt_bcms[] = {
- &bcm_ip0,
&bcm_qup0,
&bcm_qup1,
&bcm_qup2,
};
static struct qcom_icc_node * const clk_virt_nodes[] = {
- [MASTER_IPA_CORE] = &ipa_core_master,
[MASTER_QUP_CORE_0] = &qup0_core_master,
[MASTER_QUP_CORE_1] = &qup1_core_master,
[MASTER_QUP_CORE_2] = &qup2_core_master,
- [SLAVE_IPA_CORE] = &ipa_core_slave,
[SLAVE_QUP_CORE_0] = &qup0_core_slave,
[SLAVE_QUP_CORE_1] = &qup1_core_slave,
[SLAVE_QUP_CORE_2] = &qup2_core_slave,
diff --git a/drivers/interconnect/qcom/sc8280xp.h b/drivers/interconnect/qcom/sc8280xp.h
index 74d8fa412d65..c5c410fd5ec3 100644
--- a/drivers/interconnect/qcom/sc8280xp.h
+++ b/drivers/interconnect/qcom/sc8280xp.h
@@ -10,7 +10,7 @@
#define SC8280XP_MASTER_PCIE_TCU 1
#define SC8280XP_MASTER_SYS_TCU 2
#define SC8280XP_MASTER_APPSS_PROC 3
-#define SC8280XP_MASTER_IPA_CORE 4
+/* 4 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
#define SC8280XP_MASTER_LLCC 5
#define SC8280XP_MASTER_CNOC_LPASS_AG_NOC 6
#define SC8280XP_MASTER_CDSP_NOC_CFG 7
@@ -84,7 +84,7 @@
#define SC8280XP_MASTER_USB4_0 75
#define SC8280XP_MASTER_USB4_1 76
#define SC8280XP_SLAVE_EBI1 512
-#define SC8280XP_SLAVE_IPA_CORE 513
+/* 513 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
#define SC8280XP_SLAVE_AHB2PHY_0 514
#define SC8280XP_SLAVE_AHB2PHY_1 515
#define SC8280XP_SLAVE_AHB2PHY_2 516
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 07/12] interconnect: qcom: sc8280xp: Drop IP0 interconnects
2023-01-09 0:29 ` [PATCH v3 07/12] interconnect: qcom: sc8280xp: " Dmitry Baryshkov
@ 2023-01-09 13:48 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:48 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
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. There are no actual users
> of this intercoonect. The IP0 resource will be handled by clk-rpmh
> driver.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> drivers/interconnect/qcom/sc8280xp.c | 25 -------------------------
> drivers/interconnect/qcom/sc8280xp.h | 4 ++--
> 2 files changed, 2 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/interconnect/qcom/sc8280xp.c b/drivers/interconnect/qcom/sc8280xp.c
> index 507fe5f89791..e56df893ec3e 100644
> --- a/drivers/interconnect/qcom/sc8280xp.c
> +++ b/drivers/interconnect/qcom/sc8280xp.c
> @@ -284,15 +284,6 @@ static struct qcom_icc_node xm_ufs_card = {
> .links = { SC8280XP_SLAVE_A2NOC_SNOC },
> };
>
> -static struct qcom_icc_node ipa_core_master = {
> - .name = "ipa_core_master",
> - .id = SC8280XP_MASTER_IPA_CORE,
> - .channels = 1,
> - .buswidth = 8,
> - .num_links = 1,
> - .links = { SC8280XP_SLAVE_IPA_CORE },
> -};
> -
> static struct qcom_icc_node qup0_core_master = {
> .name = "qup0_core_master",
> .id = SC8280XP_MASTER_QUP_CORE_0,
> @@ -882,13 +873,6 @@ static struct qcom_icc_node srvc_aggre2_noc = {
> .buswidth = 4,
> };
>
> -static struct qcom_icc_node ipa_core_slave = {
> - .name = "ipa_core_slave",
> - .id = SC8280XP_SLAVE_IPA_CORE,
> - .channels = 1,
> - .buswidth = 8,
> -};
> -
> static struct qcom_icc_node qup0_core_slave = {
> .name = "qup0_core_slave",
> .id = SC8280XP_SLAVE_QUP_CORE_0,
> @@ -1845,12 +1829,6 @@ static struct qcom_icc_bcm bcm_cn3 = {
> },
> };
>
> -static struct qcom_icc_bcm bcm_ip0 = {
> - .name = "IP0",
> - .num_nodes = 1,
> - .nodes = { &ipa_core_slave },
> -};
> -
> static struct qcom_icc_bcm bcm_mc0 = {
> .name = "MC0",
> .keepalive = true,
> @@ -2077,18 +2055,15 @@ static const struct qcom_icc_desc sc8280xp_aggre2_noc = {
> };
>
> static struct qcom_icc_bcm * const clk_virt_bcms[] = {
> - &bcm_ip0,
> &bcm_qup0,
> &bcm_qup1,
> &bcm_qup2,
> };
>
> static struct qcom_icc_node * const clk_virt_nodes[] = {
> - [MASTER_IPA_CORE] = &ipa_core_master,
Will the icc framework take a null entry gracefully?
Konrad
> [MASTER_QUP_CORE_0] = &qup0_core_master,
> [MASTER_QUP_CORE_1] = &qup1_core_master,
> [MASTER_QUP_CORE_2] = &qup2_core_master,
> - [SLAVE_IPA_CORE] = &ipa_core_slave,
> [SLAVE_QUP_CORE_0] = &qup0_core_slave,
> [SLAVE_QUP_CORE_1] = &qup1_core_slave,
> [SLAVE_QUP_CORE_2] = &qup2_core_slave,
> diff --git a/drivers/interconnect/qcom/sc8280xp.h b/drivers/interconnect/qcom/sc8280xp.h
> index 74d8fa412d65..c5c410fd5ec3 100644
> --- a/drivers/interconnect/qcom/sc8280xp.h
> +++ b/drivers/interconnect/qcom/sc8280xp.h
> @@ -10,7 +10,7 @@
> #define SC8280XP_MASTER_PCIE_TCU 1
> #define SC8280XP_MASTER_SYS_TCU 2
> #define SC8280XP_MASTER_APPSS_PROC 3
> -#define SC8280XP_MASTER_IPA_CORE 4
> +/* 4 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SC8280XP_MASTER_LLCC 5
> #define SC8280XP_MASTER_CNOC_LPASS_AG_NOC 6
> #define SC8280XP_MASTER_CDSP_NOC_CFG 7
> @@ -84,7 +84,7 @@
> #define SC8280XP_MASTER_USB4_0 75
> #define SC8280XP_MASTER_USB4_1 76
> #define SC8280XP_SLAVE_EBI1 512
> -#define SC8280XP_SLAVE_IPA_CORE 513
> +/* 513 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
> #define SC8280XP_SLAVE_AHB2PHY_0 514
> #define SC8280XP_SLAVE_AHB2PHY_1 515
> #define SC8280XP_SLAVE_AHB2PHY_2 516
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 08/12] dt-bindings: interconnect: qcom: Remove ipa-virt compatibles
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (6 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 07/12] interconnect: qcom: sc8280xp: " Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 0:29 ` [PATCH v3 09/12] dt-bindings: interconnect: qcom: drop IPA_CORE related defines Dmitry Baryshkov
` (4 subsequent siblings)
12 siblings, 0 replies; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree, Krzysztof Kozlowski
These interconnects are going to be modeled as clockks, not
interconnects. There are no other interconnects left on the virtual
SoC-ipa-virt NoCs, therefore remove the compatibles from the binding as
they're unused.
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml
index a429a1ed1006..4e8d950c2832 100644
--- a/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml
+++ b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml
@@ -58,7 +58,6 @@ properties:
- qcom,sc8180x-config-noc
- qcom,sc8180x-dc-noc
- qcom,sc8180x-gem-noc
- - qcom,sc8180x-ipa-virt
- qcom,sc8180x-mc-virt
- qcom,sc8180x-mmss-noc
- qcom,sc8180x-qup-virt
@@ -96,7 +95,6 @@ properties:
- qcom,sm8150-config-noc
- qcom,sm8150-dc-noc
- qcom,sm8150-gem-noc
- - qcom,sm8150-ipa-virt
- qcom,sm8150-mc-virt
- qcom,sm8150-mmss-noc
- qcom,sm8150-system-noc
@@ -106,7 +104,6 @@ properties:
- qcom,sm8250-config-noc
- qcom,sm8250-dc-noc
- qcom,sm8250-gem-noc
- - qcom,sm8250-ipa-virt
- qcom,sm8250-mc-virt
- qcom,sm8250-mmss-noc
- qcom,sm8250-npu-noc
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v3 09/12] dt-bindings: interconnect: qcom: drop IPA_CORE related defines
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (7 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 08/12] dt-bindings: interconnect: qcom: Remove ipa-virt compatibles Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 0:29 ` [PATCH v3 10/12] clk: qcom: rpmh: define IPA clocks where required Dmitry Baryshkov
` (3 subsequent siblings)
12 siblings, 0 replies; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree, Krzysztof Kozlowski
These interconnects are modeled as clks, not interconnects, therefore
remove corresponding defines from the binding as they're unused.
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
include/dt-bindings/interconnect/qcom,sc7180.h | 3 ---
include/dt-bindings/interconnect/qcom,sc8180x.h | 3 ---
include/dt-bindings/interconnect/qcom,sc8280xp.h | 4 ++--
include/dt-bindings/interconnect/qcom,sdx55.h | 2 --
include/dt-bindings/interconnect/qcom,sm8150.h | 3 ---
include/dt-bindings/interconnect/qcom,sm8250.h | 3 ---
6 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/include/dt-bindings/interconnect/qcom,sc7180.h b/include/dt-bindings/interconnect/qcom,sc7180.h
index f9970f6032eb..de5d5867bd67 100644
--- a/include/dt-bindings/interconnect/qcom,sc7180.h
+++ b/include/dt-bindings/interconnect/qcom,sc7180.h
@@ -108,9 +108,6 @@
#define SLAVE_LLCC 11
#define SLAVE_SERVICE_GEM_NOC 12
-#define MASTER_IPA_CORE 0
-#define SLAVE_IPA_CORE 1
-
#define MASTER_LLCC 0
#define SLAVE_EBI1 1
diff --git a/include/dt-bindings/interconnect/qcom,sc8180x.h b/include/dt-bindings/interconnect/qcom,sc8180x.h
index e84cfec5afdd..0bdc8d6cb401 100644
--- a/include/dt-bindings/interconnect/qcom,sc8180x.h
+++ b/include/dt-bindings/interconnect/qcom,sc8180x.h
@@ -129,9 +129,6 @@
#define SLAVE_SERVICE_GEM_NOC 16
#define SLAVE_SERVICE_GEM_NOC_1 17
-#define MASTER_IPA_CORE 0
-#define SLAVE_IPA_CORE 1
-
#define MASTER_LLCC 0
#define SLAVE_EBI_CH0 1
diff --git a/include/dt-bindings/interconnect/qcom,sc8280xp.h b/include/dt-bindings/interconnect/qcom,sc8280xp.h
index a3e5fda7c127..f89f47e99c6d 100644
--- a/include/dt-bindings/interconnect/qcom,sc8280xp.h
+++ b/include/dt-bindings/interconnect/qcom,sc8280xp.h
@@ -48,11 +48,11 @@
#define SLAVE_SERVICE_A2NOC 19
/* clk_virt */
-#define MASTER_IPA_CORE 0
+/* 0 was used by MASTER_IPA_CORE, now represented as RPMh clock */
#define MASTER_QUP_CORE_0 1
#define MASTER_QUP_CORE_1 2
#define MASTER_QUP_CORE_2 3
-#define SLAVE_IPA_CORE 4
+/* 4 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
#define SLAVE_QUP_CORE_0 5
#define SLAVE_QUP_CORE_1 6
#define SLAVE_QUP_CORE_2 7
diff --git a/include/dt-bindings/interconnect/qcom,sdx55.h b/include/dt-bindings/interconnect/qcom,sdx55.h
index bfb6524a2d90..1925f0784ab2 100644
--- a/include/dt-bindings/interconnect/qcom,sdx55.h
+++ b/include/dt-bindings/interconnect/qcom,sdx55.h
@@ -70,7 +70,5 @@
#define SLAVE_QDSS_STM 48
#define SLAVE_TCU 49
-#define MASTER_IPA_CORE 0
-#define SLAVE_IPA_CORE 1
#endif
diff --git a/include/dt-bindings/interconnect/qcom,sm8150.h b/include/dt-bindings/interconnect/qcom,sm8150.h
index a25684680c42..ef292791f52e 100644
--- a/include/dt-bindings/interconnect/qcom,sm8150.h
+++ b/include/dt-bindings/interconnect/qcom,sm8150.h
@@ -121,9 +121,6 @@
#define SLAVE_LLCC 15
#define SLAVE_SERVICE_GEM_NOC 16
-#define MASTER_IPA_CORE 0
-#define SLAVE_IPA_CORE 1
-
#define MASTER_LLCC 0
#define SLAVE_EBI_CH0 1
diff --git a/include/dt-bindings/interconnect/qcom,sm8250.h b/include/dt-bindings/interconnect/qcom,sm8250.h
index 1b4d9fbe888d..a4af5cc19271 100644
--- a/include/dt-bindings/interconnect/qcom,sm8250.h
+++ b/include/dt-bindings/interconnect/qcom,sm8250.h
@@ -115,9 +115,6 @@
#define SLAVE_SERVICE_GEM_NOC_2 15
#define SLAVE_SERVICE_GEM_NOC 16
-#define MASTER_IPA_CORE 0
-#define SLAVE_IPA_CORE 1
-
#define MASTER_LLCC 0
#define SLAVE_EBI_CH0 1
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v3 10/12] clk: qcom: rpmh: define IPA clocks where required
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (8 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 09/12] dt-bindings: interconnect: qcom: drop IPA_CORE related defines Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:48 ` Konrad Dybcio
2023-01-09 0:29 ` [PATCH v3 11/12] arm64: dts: qcom: sm8150: drop the virtual ipa-virt device Dmitry Baryshkov
` (2 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Follow the example of sc7180 and sdx55 and implement IP0 resource as
clocks rather than interconnects.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/clk/qcom/clk-rpmh.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
index 7db5a53d73f0..05940e51b261 100644
--- a/drivers/clk/qcom/clk-rpmh.c
+++ b/drivers/clk/qcom/clk-rpmh.c
@@ -455,6 +455,7 @@ static struct clk_hw *sm8150_rpmh_clocks[] = {
[RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw,
[RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw,
[RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw,
+ [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
};
static const struct clk_rpmh_desc clk_rpmh_sm8150 = {
@@ -494,6 +495,7 @@ static struct clk_hw *sc8180x_rpmh_clocks[] = {
[RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_d_ao.hw,
[RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_d.hw,
[RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_d_ao.hw,
+ [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
};
static const struct clk_rpmh_desc clk_rpmh_sc8180x = {
@@ -514,6 +516,7 @@ static struct clk_hw *sm8250_rpmh_clocks[] = {
[RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw,
[RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw,
[RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw,
+ [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
};
static const struct clk_rpmh_desc clk_rpmh_sm8250 = {
@@ -556,6 +559,7 @@ static struct clk_hw *sc8280xp_rpmh_clocks[] = {
[RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
[RPMH_PKA_CLK] = &clk_rpmh_pka.hw,
[RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw,
+ [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
};
static const struct clk_rpmh_desc clk_rpmh_sc8280xp = {
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 10/12] clk: qcom: rpmh: define IPA clocks where required
2023-01-09 0:29 ` [PATCH v3 10/12] clk: qcom: rpmh: define IPA clocks where required Dmitry Baryshkov
@ 2023-01-09 13:48 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:48 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
On 9.01.2023 01:29, Dmitry Baryshkov wrote:
> Follow the example of sc7180 and sdx55 and implement IP0 resource as
> clocks rather than interconnects.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> drivers/clk/qcom/clk-rpmh.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
> index 7db5a53d73f0..05940e51b261 100644
> --- a/drivers/clk/qcom/clk-rpmh.c
> +++ b/drivers/clk/qcom/clk-rpmh.c
> @@ -455,6 +455,7 @@ static struct clk_hw *sm8150_rpmh_clocks[] = {
> [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw,
> [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw,
> [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sm8150 = {
> @@ -494,6 +495,7 @@ static struct clk_hw *sc8180x_rpmh_clocks[] = {
> [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_d_ao.hw,
> [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_d.hw,
> [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_d_ao.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sc8180x = {
> @@ -514,6 +516,7 @@ static struct clk_hw *sm8250_rpmh_clocks[] = {
> [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw,
> [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw,
> [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sm8250 = {
> @@ -556,6 +559,7 @@ static struct clk_hw *sc8280xp_rpmh_clocks[] = {
> [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> [RPMH_PKA_CLK] = &clk_rpmh_pka.hw,
> [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sc8280xp = {
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 11/12] arm64: dts: qcom: sm8150: drop the virtual ipa-virt device
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (9 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 10/12] clk: qcom: rpmh: define IPA clocks where required Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:49 ` Konrad Dybcio
2023-01-09 0:29 ` [PATCH v3 12/12] arm64: dts: qcom: sm8250: " Dmitry Baryshkov
2023-01-12 16:12 ` (subset) [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Bjorn Andersson
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Drop the virtual ipa-virt device. The interconnects it provided are
going to be represented as <&rpmhcc RPMH_IPA_CLK> clock.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8150.dtsi | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 99750987c9d6..0759bc22d0c2 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -2057,13 +2057,6 @@ ufs_mem_phy_lanes: phy@1d87400 {
};
};
- ipa_virt: interconnect@1e00000 {
- compatible = "qcom,sm8150-ipa-virt";
- reg = <0 0x01e00000 0 0x1000>;
- #interconnect-cells = <1>;
- qcom,bcm-voters = <&apps_bcm_voter>;
- };
-
tcsr_mutex: hwlock@1f40000 {
compatible = "qcom,tcsr-mutex";
reg = <0x0 0x01f40000 0x0 0x20000>;
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 11/12] arm64: dts: qcom: sm8150: drop the virtual ipa-virt device
2023-01-09 0:29 ` [PATCH v3 11/12] arm64: dts: qcom: sm8150: drop the virtual ipa-virt device Dmitry Baryshkov
@ 2023-01-09 13:49 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:49 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
On 9.01.2023 01:29, Dmitry Baryshkov wrote:
> Drop the virtual ipa-virt device. The interconnects it provided are
> going to be represented as <&rpmhcc RPMH_IPA_CLK> clock.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/sm8150.dtsi | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
> index 99750987c9d6..0759bc22d0c2 100644
> --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
> @@ -2057,13 +2057,6 @@ ufs_mem_phy_lanes: phy@1d87400 {
> };
> };
>
> - ipa_virt: interconnect@1e00000 {
> - compatible = "qcom,sm8150-ipa-virt";
> - reg = <0 0x01e00000 0 0x1000>;
> - #interconnect-cells = <1>;
> - qcom,bcm-voters = <&apps_bcm_voter>;
> - };
> -
> tcsr_mutex: hwlock@1f40000 {
> compatible = "qcom,tcsr-mutex";
> reg = <0x0 0x01f40000 0x0 0x20000>;
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3 12/12] arm64: dts: qcom: sm8250: drop the virtual ipa-virt device
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (10 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 11/12] arm64: dts: qcom: sm8150: drop the virtual ipa-virt device Dmitry Baryshkov
@ 2023-01-09 0:29 ` Dmitry Baryshkov
2023-01-09 13:49 ` Konrad Dybcio
2023-01-12 16:12 ` (subset) [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Bjorn Andersson
12 siblings, 1 reply; 25+ messages in thread
From: Dmitry Baryshkov @ 2023-01-09 0:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
Drop the virtual ipa-virt device. The interconnects it provided are
going to be represented as <&rpmhcc RPMH_IPA_CLK> clock.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index b3ab2896a6cc..af298dec0568 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2215,13 +2215,6 @@ ufs_mem_phy_lanes: phy@1d87400 {
};
};
- ipa_virt: interconnect@1e00000 {
- compatible = "qcom,sm8250-ipa-virt";
- reg = <0 0x01e00000 0 0x1000>;
- #interconnect-cells = <1>;
- qcom,bcm-voters = <&apps_bcm_voter>;
- };
-
tcsr_mutex: hwlock@1f40000 {
compatible = "qcom,tcsr-mutex";
reg = <0x0 0x01f40000 0x0 0x40000>;
--
2.39.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v3 12/12] arm64: dts: qcom: sm8250: drop the virtual ipa-virt device
2023-01-09 0:29 ` [PATCH v3 12/12] arm64: dts: qcom: sm8250: " Dmitry Baryshkov
@ 2023-01-09 13:49 ` Konrad Dybcio
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Dybcio @ 2023-01-09 13:49 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Stephen Boyd,
Michael Turquette, Rob Herring, Krzysztof Kozlowski, Taniya Das
Cc: Georgi Djakov, Alex Elder, Johan Hovold, linux-arm-msm, linux-clk,
linux-pm, devicetree
On 9.01.2023 01:29, Dmitry Baryshkov wrote:
> Drop the virtual ipa-virt device. The interconnects it provided are
> going to be represented as <&rpmhcc RPMH_IPA_CLK> clock.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> index b3ab2896a6cc..af298dec0568 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> @@ -2215,13 +2215,6 @@ ufs_mem_phy_lanes: phy@1d87400 {
> };
> };
>
> - ipa_virt: interconnect@1e00000 {
> - compatible = "qcom,sm8250-ipa-virt";
> - reg = <0 0x01e00000 0 0x1000>;
> - #interconnect-cells = <1>;
> - qcom,bcm-voters = <&apps_bcm_voter>;
> - };
> -
> tcsr_mutex: hwlock@1f40000 {
> compatible = "qcom,tcsr-mutex";
> reg = <0x0 0x01f40000 0x0 0x40000>;
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: (subset) [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks
2023-01-09 0:29 [PATCH v3 00/12] clk/interconnect: qcom: finish migration of IP0 to clocks Dmitry Baryshkov
` (11 preceding siblings ...)
2023-01-09 0:29 ` [PATCH v3 12/12] arm64: dts: qcom: sm8250: " Dmitry Baryshkov
@ 2023-01-12 16:12 ` Bjorn Andersson
12 siblings, 0 replies; 25+ messages in thread
From: Bjorn Andersson @ 2023-01-12 16:12 UTC (permalink / raw)
To: konrad.dybcio, mturquette, dmitry.baryshkov, quic_tdas, robh+dt,
krzysztof.kozlowski+dt, agross, sboyd
Cc: djakov, elder, johan, linux-pm, devicetree, linux-clk,
linux-arm-msm
On Mon, 9 Jan 2023 02:29:23 +0200, Dmitry Baryshkov wrote:
> Commits 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0
> interconnects") and 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0
> interconnects") removed IP0 interconnects (and ipa-virt devices support)
> in favour of the RPMH clocks. Follow this example for other platforms
> defining IP0 RPMH resource. While we are at it, remove several leftover
> from the mentioned patches.
>
> [...]
Applied, thanks!
[11/12] arm64: dts: qcom: sm8150: drop the virtual ipa-virt device
commit: 88efcc060edbb277bf80768de8c2f63651d74b90
[12/12] arm64: dts: qcom: sm8250: drop the virtual ipa-virt device
commit: 6af6827fb0c412581f89d5c0c865892ddf984fab
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 25+ messages in thread