[PATCH V3 0/4] arm64: dts: qcom: x1e80100: Enable bwmon support

[PATCH V3 0/4] arm64: dts: qcom: x1e80100: Enable bwmon support

[Sibi Sankar]

This patch series enables bwmon support on X1E80100 SoCs.

V3:
* Pickup Rb's and Tb's from the list.
* Drop OPP table from the required property list. [Konrad/Krzysztof]
* Update commit message describing the race condition. [Bjorn]
* Update comment in the bwmon driver. [Dmitry]
* Add a comment describing which cluster each bwmon instance belongs to. [Konrad]

V2:
* Allow for opp-tables to be optional on X1E cpu-bwmon instances. [Konrad]
* Drop Rb from Krzysztof due to more bindings changes.
* Use explicit request/free irq and add comments regarding the race
  introduced when adding the IRQF_SHARED flag. [Krzysztof/Dmitry]
* Use consistent numbering of the opps across instances. [Shiv]
* Use ICC_TAG_ACTIVE_ONLY instead of magic numbers. [Konrad]
* Drop fastrpc enablement patch. [Bjorn]

tag: next-20240621
base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7

Sibi Sankar (4):
  dt-bindings: interconnect: qcom,msm8998-bwmon: Remove opp-table from
    the required list
  dt-bindings: interconnect: qcom,msm8998-bwmon: Add X1E80100 BWMON
    instances
  soc: qcom: icc-bwmon: Allow for interrupts to be shared across
    instances
  arm64: dts: qcom: x1e80100: Add BWMONs

 .../interconnect/qcom,msm8998-bwmon.yaml      |   3 +-
 arch/arm64/boot/dts/qcom/x1e80100.dtsi        | 123 ++++++++++++++++++
 drivers/soc/qcom/icc-bwmon.c                  |  12 +-
 3 files changed, 134 insertions(+), 4 deletions(-)

-- 
2.34.1

[PATCH V3 1/4] dt-bindings: interconnect: qcom,msm8998-bwmon: Remove opp-table from the required list

[Sibi Sankar]

Remove opp-table from the required list as the bindings shouldn't care
where the OPP tables (referenced by the operating-points-v2 property)
comes from.

Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
---

v3:
* Drop OPP table from the required property list. [Konrad/Krzysztof]

 .../devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
index 05067e197abe..9c248e1eabe2 100644
--- a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
+++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
@@ -72,7 +72,6 @@ required:
   - interconnects
   - interrupts
   - operating-points-v2
-  - opp-table
   - reg
 
 additionalProperties: false
-- 
2.34.1

[PATCH V3 2/4] dt-bindings: interconnect: qcom,msm8998-bwmon: Add X1E80100 BWMON instances

[Sibi Sankar]

Document X1E80100 BWMONs, which has multiple (one per cluster) BWMONv4
instances for the CPU->LLCC path and one BWMONv5 instance for LLCC->DDR
path.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
---

v3:
* Pickup Rb's and Tb's from the list.

 .../devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
index 9c248e1eabe2..2cd1f5590fd9 100644
--- a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
+++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
@@ -35,6 +35,7 @@ properties:
               - qcom,sm8250-cpu-bwmon
               - qcom,sm8550-cpu-bwmon
               - qcom,sm8650-cpu-bwmon
+              - qcom,x1e80100-cpu-bwmon
           - const: qcom,sdm845-bwmon    # BWMON v4, unified register space
       - items:
           - enum:
@@ -44,6 +45,7 @@ properties:
               - qcom,sm8250-llcc-bwmon
               - qcom,sm8550-llcc-bwmon
               - qcom,sm8650-llcc-bwmon
+              - qcom,x1e80100-llcc-bwmon
           - const: qcom,sc7280-llcc-bwmon
       - const: qcom,sc7280-llcc-bwmon   # BWMON v5
       - const: qcom,sdm845-llcc-bwmon   # BWMON v5
-- 
2.34.1

[PATCH V3 3/4] soc: qcom: icc-bwmon: Allow for interrupts to be shared across instances

[Sibi Sankar]

The multiple BWMONv4 instances available on the X1E80100 SoC use the
same interrupt number. Mark them are shared to allow for re-use across
instances.

Using IRQF_SHARED coupled with devm_request_threaded_irq implies that
the irq can still trigger during/after bwmon_remove due to other active
bwmon instances. Handle this race by relying on bwmon_disable to disable
the interrupt and coupled with explicit request/free irqs.

Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
---

v3:
* Update commit message describing the race condition. [Bjorn]
* Update comment in the bwmon driver. [Dmitry]

 drivers/soc/qcom/icc-bwmon.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/qcom/icc-bwmon.c b/drivers/soc/qcom/icc-bwmon.c
index ecddb60bd665..e7851974084b 100644
--- a/drivers/soc/qcom/icc-bwmon.c
+++ b/drivers/soc/qcom/icc-bwmon.c
@@ -783,9 +783,14 @@ static int bwmon_probe(struct platform_device *pdev)
 	bwmon->dev = dev;
 
 	bwmon_disable(bwmon);
-	ret = devm_request_threaded_irq(dev, bwmon->irq, bwmon_intr,
-					bwmon_intr_thread,
-					IRQF_ONESHOT, dev_name(dev), bwmon);
+
+	/*
+	 * SoCs with multiple cpu-bwmon instances can end up using a shared interrupt
+	 * line. Using the devm_ variant might result in the IRQ handler being executed
+	 * after bwmon_disable in bwmon_remove()
+	 */
+	ret = request_threaded_irq(bwmon->irq, bwmon_intr, bwmon_intr_thread,
+				   IRQF_ONESHOT | IRQF_SHARED, dev_name(dev), bwmon);
 	if (ret)
 		return dev_err_probe(dev, ret, "failed to request IRQ\n");
 
@@ -800,6 +805,7 @@ static void bwmon_remove(struct platform_device *pdev)
 	struct icc_bwmon *bwmon = platform_get_drvdata(pdev);
 
 	bwmon_disable(bwmon);
+	free_irq(bwmon->irq, bwmon);
 }
 
 static const struct icc_bwmon_data msm8998_bwmon_data = {
-- 
2.34.1

[PATCH V3 4/4] arm64: dts: qcom: x1e80100: Add BWMONs

[Sibi Sankar]

Add the CPU and LLCC BWMONs on X1E80100 SoCs.

Tested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
---

v3:
* Pickup Rb's and Tb's from the list.
* Add a comment describing which cluster each bwmon instance belongs to. [Konrad]

 arch/arm64/boot/dts/qcom/x1e80100.dtsi | 123 +++++++++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
index 9944c654851e..f9355f616bf5 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
@@ -5299,6 +5299,129 @@ frame@1780d000 {
 			};
 		};
 
+		pmu@24091000 {
+			compatible = "qcom,x1e80100-llcc-bwmon", "qcom,sc7280-llcc-bwmon";
+			reg = <0 0x24091000 0 0x1000>;
+
+			interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+
+			interconnects = <&mc_virt MASTER_LLCC QCOM_ICC_TAG_ACTIVE_ONLY
+					 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>;
+
+			operating-points-v2 = <&llcc_bwmon_opp_table>;
+
+			llcc_bwmon_opp_table: opp-table {
+				compatible = "operating-points-v2";
+
+				opp-0 {
+					opp-peak-kBps = <800000>;
+				};
+
+				opp-1 {
+					opp-peak-kBps = <2188000>;
+				};
+
+				opp-2 {
+					opp-peak-kBps = <3072000>;
+				};
+
+				opp-3 {
+					opp-peak-kBps = <6220800>;
+				};
+
+				opp-4 {
+					opp-peak-kBps = <6835200>;
+				};
+
+				opp-5 {
+					opp-peak-kBps = <8371200>;
+				};
+
+				opp-6 {
+					opp-peak-kBps = <10944000>;
+				};
+
+				opp-7 {
+					opp-peak-kBps = <12748800>;
+				};
+
+				opp-8 {
+					opp-peak-kBps = <14745600>;
+				};
+
+				opp-9 {
+					opp-peak-kBps = <16896000>;
+				};
+			};
+		};
+
+		/* cluster0 */
+		pmu@240b3400 {
+			compatible = "qcom,x1e80100-cpu-bwmon", "qcom,sdm845-bwmon";
+			reg = <0 0x240b3400 0 0x600>;
+
+			interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>;
+
+			interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+					 &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ACTIVE_ONLY>;
+
+			operating-points-v2 = <&cpu_bwmon_opp_table>;
+
+			cpu_bwmon_opp_table: opp-table {
+				compatible = "operating-points-v2";
+
+				opp-0 {
+					opp-peak-kBps = <4800000>;
+				};
+
+				opp-1 {
+					opp-peak-kBps = <7464000>;
+				};
+
+				opp-2 {
+					opp-peak-kBps = <9600000>;
+				};
+
+				opp-3 {
+					opp-peak-kBps = <12896000>;
+				};
+
+				opp-4 {
+					opp-peak-kBps = <14928000>;
+				};
+
+				opp-5 {
+					opp-peak-kBps = <17064000>;
+				};
+			};
+		};
+
+		/* cluster2 */
+		pmu@240b5400 {
+			compatible = "qcom,x1e80100-cpu-bwmon", "qcom,sdm845-bwmon";
+			reg = <0 0x240b5400 0 0x600>;
+
+			interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>;
+
+			interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+					 &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ACTIVE_ONLY>;
+
+			operating-points-v2 = <&cpu_bwmon_opp_table>;
+		};
+
+		/* cluster1 */
+		pmu@240b6400 {
+			compatible = "qcom,x1e80100-cpu-bwmon", "qcom,sdm845-bwmon";
+			reg = <0 0x240b6400 0 0x600>;
+
+			interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>;
+
+			interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+					 &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ACTIVE_ONLY>;
+
+			operating-points-v2 = <&cpu_bwmon_opp_table>;
+		};
+
 		system-cache-controller@25000000 {
 			compatible = "qcom,x1e80100-llcc";
 			reg = <0 0x25000000 0 0x200000>,
-- 
2.34.1

Re: [PATCH V3 3/4] soc: qcom: icc-bwmon: Allow for interrupts to be shared across instances

[Dmitry Baryshkov]

On Mon, Jun 24, 2024 at 02:52:13PM GMT, Sibi Sankar wrote:
> The multiple BWMONv4 instances available on the X1E80100 SoC use the
> same interrupt number. Mark them are shared to allow for re-use across
> instances.
> 
> Using IRQF_SHARED coupled with devm_request_threaded_irq implies that
> the irq can still trigger during/after bwmon_remove due to other active
> bwmon instances. Handle this race by relying on bwmon_disable to disable
> the interrupt and coupled with explicit request/free irqs.
> 
> Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
> ---
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>


-- 
With best wishes
Dmitry

Re: [PATCH V3 1/4] dt-bindings: interconnect: qcom,msm8998-bwmon: Remove opp-table from the required list

[Krzysztof Kozlowski]

On 24/06/2024 11:22, Sibi Sankar wrote:
> Remove opp-table from the required list as the bindings shouldn't care
> where the OPP tables (referenced by the operating-points-v2 property)
> comes from.
> 
> Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
> ---

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH V3 1/4] dt-bindings: interconnect: qcom,msm8998-bwmon: Remove opp-table from the required list

[Georgi Djakov]

On 24.06.24 12:22, Sibi Sankar wrote:
> Remove opp-table from the required list as the bindings shouldn't care
> where the OPP tables (referenced by the operating-points-v2 property)
> comes from.
> 
> Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>

Acked-by: Georgi Djakov <djakov@kernel.org>

> ---
> 
> v3:
> * Drop OPP table from the required property list. [Konrad/Krzysztof]
> 
>   .../devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml     | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
> index 05067e197abe..9c248e1eabe2 100644
> --- a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
> +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
> @@ -72,7 +72,6 @@ required:
>     - interconnects
>     - interrupts
>     - operating-points-v2
> -  - opp-table
>     - reg
>   
>   additionalProperties: false

Re: [PATCH V3 2/4] dt-bindings: interconnect: qcom,msm8998-bwmon: Add X1E80100 BWMON instances

[Georgi Djakov]

On 24.06.24 12:22, Sibi Sankar wrote:
> Document X1E80100 BWMONs, which has multiple (one per cluster) BWMONv4
> instances for the CPU->LLCC path and one BWMONv5 instance for LLCC->DDR
> path.
> 
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>

Acked-by: Georgi Djakov <djakov@kernel.org>

> ---
> 
> v3:
> * Pickup Rb's and Tb's from the list.
> 
>   .../devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml    | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
> index 9c248e1eabe2..2cd1f5590fd9 100644
> --- a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
> +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
> @@ -35,6 +35,7 @@ properties:
>                 - qcom,sm8250-cpu-bwmon
>                 - qcom,sm8550-cpu-bwmon
>                 - qcom,sm8650-cpu-bwmon
> +              - qcom,x1e80100-cpu-bwmon
>             - const: qcom,sdm845-bwmon    # BWMON v4, unified register space
>         - items:
>             - enum:
> @@ -44,6 +45,7 @@ properties:
>                 - qcom,sm8250-llcc-bwmon
>                 - qcom,sm8550-llcc-bwmon
>                 - qcom,sm8650-llcc-bwmon
> +              - qcom,x1e80100-llcc-bwmon
>             - const: qcom,sc7280-llcc-bwmon
>         - const: qcom,sc7280-llcc-bwmon   # BWMON v5
>         - const: qcom,sdm845-llcc-bwmon   # BWMON v5

Re: (subset) [PATCH V3 0/4] arm64: dts: qcom: x1e80100: Enable bwmon support

[Bjorn Andersson]

On Mon, 24 Jun 2024 14:52:10 +0530, Sibi Sankar wrote:
> This patch series enables bwmon support on X1E80100 SoCs.
> 
> V3:
> * Pickup Rb's and Tb's from the list.
> * Drop OPP table from the required property list. [Konrad/Krzysztof]
> * Update commit message describing the race condition. [Bjorn]
> * Update comment in the bwmon driver. [Dmitry]
> * Add a comment describing which cluster each bwmon instance belongs to. [Konrad]
> 
> [...]

Applied, thanks!

[4/4] arm64: dts: qcom: x1e80100: Add BWMONs
      commit: 740bc66960527754d4980e649953fb8ccecf67e5

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>