linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA
@ 2022-12-22 19:45 Marijn Suijten
  2022-12-22 19:45 ` [PATCH v3 1/2] dt-bindings: dma: gpi: Document SM6125 compatible Marijn Suijten
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Marijn Suijten @ 2022-12-22 19:45 UTC (permalink / raw)
  To: phone-devel, Andy Gross, Bjorn Andersson, Vinod Koul, Rob Herring,
	Krzysztof Kozlowski
  Cc: ~postmarketos/upstreaming, AngeloGioacchino Del Regno,
	Konrad Dybcio, Martin Botka, Jami Kettunen, Marijn Suijten,
	Lux Aliaga, Konrad Dybcio, Richard Acayan, Luca Weiss,
	Bhupesh Sharma, Douglas Anderson, linux-arm-msm, dmaengine,
	devicetree, linux-kernel

Enable GPI DMA on SM6125 by using the new sdm845 compatible with
ee_offset 0.

Changes since v2:
- Remove leading zero from iommu stream ID.

v2: https://lore.kernel.org/linux-arm-msm/20221216231528.1268447-1-marijn.suijten@somainline.org/T/#u

Changes since v1:
- Drop driver patch in favour of using generic qcom,sdm845-gpi-dma
  compatible [1];
- Replace status = "okay" with "disabled";
- Use 3 instead of 5 dma cells;
- Reorder properties;
- Explicitly depend on APPS SMMU series to have apps_smmu label available.

v1: https://lore.kernel.org/all/20221001185526.494095-1-martin.botka@somainline.org/T/#u

Depends on:
- SM6125 APPS SMMU: https://lore.kernel.org/linux-arm-msm/20221222193254.126925-1-marijn.suijten@somainline.org/T/#u

[1]: https://lore.kernel.org/all/20220927014846.32892-2-mailingradian@gmail.com/

Martin Botka (2):
  dt-bindings: dma: gpi: Document SM6125 compatible
  arm64: dts: qcom: sm6125: Add GPI DMA nodes

 .../devicetree/bindings/dma/qcom,gpi.yaml     |  1 +
 arch/arm64/boot/dts/qcom/sm6125.dtsi          | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+)

--
2.39.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v3 1/2] dt-bindings: dma: gpi: Document SM6125 compatible
  2022-12-22 19:45 [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA Marijn Suijten
@ 2022-12-22 19:45 ` Marijn Suijten
  2022-12-28  6:20   ` Vinod Koul
  2022-12-22 19:46 ` [PATCH v3 2/2] arm64: dts: qcom: sm6125: Add GPI DMA nodes Marijn Suijten
  2022-12-29 17:23 ` (subset) [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA Bjorn Andersson
  2 siblings, 1 reply; 6+ messages in thread
From: Marijn Suijten @ 2022-12-22 19:45 UTC (permalink / raw)
  To: phone-devel, Andy Gross, Bjorn Andersson, Vinod Koul, Rob Herring,
	Krzysztof Kozlowski
  Cc: ~postmarketos/upstreaming, AngeloGioacchino Del Regno,
	Konrad Dybcio, Martin Botka, Jami Kettunen, Marijn Suijten,
	Lux Aliaga, Konrad Dybcio, Richard Acayan, Luca Weiss,
	Bhupesh Sharma, Douglas Anderson, linux-arm-msm, dmaengine,
	devicetree, linux-kernel, Krzysztof Kozlowski

From: Martin Botka <martin.botka@somainline.org>

Document compatibility for this GPI DMA controller on SM6125.

Signed-off-by: Martin Botka <martin.botka@somainline.org>
[Marijn: Move compatible to the list with qcom,sdm845-gpi-dma]
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/dma/qcom,gpi.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
index e7ba1c47a88e..6132f4661a29 100644
--- a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
+++ b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
@@ -33,6 +33,7 @@ properties:
       - items:
           - enum:
               - qcom,sdm670-gpi-dma
+              - qcom,sm6125-gpi-dma
               - qcom,sm8150-gpi-dma
               - qcom,sm8250-gpi-dma
           - const: qcom,sdm845-gpi-dma
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v3 2/2] arm64: dts: qcom: sm6125: Add GPI DMA nodes
  2022-12-22 19:45 [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA Marijn Suijten
  2022-12-22 19:45 ` [PATCH v3 1/2] dt-bindings: dma: gpi: Document SM6125 compatible Marijn Suijten
@ 2022-12-22 19:46 ` Marijn Suijten
  2022-12-22 19:47   ` Konrad Dybcio
  2022-12-29 17:23 ` (subset) [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA Bjorn Andersson
  2 siblings, 1 reply; 6+ messages in thread
From: Marijn Suijten @ 2022-12-22 19:46 UTC (permalink / raw)
  To: phone-devel, Andy Gross, Bjorn Andersson, Vinod Koul, Rob Herring,
	Krzysztof Kozlowski
  Cc: ~postmarketos/upstreaming, AngeloGioacchino Del Regno,
	Konrad Dybcio, Martin Botka, Jami Kettunen, Marijn Suijten,
	Lux Aliaga, Konrad Dybcio, Richard Acayan, Luca Weiss,
	Bhupesh Sharma, Douglas Anderson, linux-arm-msm, dmaengine,
	devicetree, linux-kernel

From: Martin Botka <martin.botka@somainline.org>

Add nodes for GPI DMA hosts on SM6125.

Signed-off-by: Martin Botka <martin.botka@somainline.org>
[Marijn: reorder properties, use sdm845 fallback compatible, disable by
 default, use 3 instead of 5 dma cells]
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
---
 arch/arm64/boot/dts/qcom/sm6125.dtsi | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index 7c326368e30d..6f9b56a937c6 100644
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/clock/qcom,gcc-sm6125.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
+#include <dt-bindings/dma/qcom-gpi.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
@@ -510,6 +511,42 @@ sdhc_2: mmc@4784000 {
 			status = "disabled";
 		};
 
+		gpi_dma0: dma-controller@4a00000 {
+			compatible = "qcom,sm6125-gpi-dma", "qcom,sdm845-gpi-dma";
+			reg = <0x04a00000 0x60000>;
+			interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;
+			dma-channels = <8>;
+			dma-channel-mask = <0x1f>;
+			iommus = <&apps_smmu 0x136 0x0>;
+			#dma-cells = <3>;
+			status = "disabled";
+		};
+
+		gpi_dma1: dma-controller@4c00000 {
+			compatible = "qcom,sm6125-gpi-dma", "qcom,sdm845-gpi-dma";
+			reg = <0x04c00000 0x60000>;
+			interrupts = <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>;
+			dma-channels = <8>;
+			dma-channel-mask = <0x0f>;
+			iommus = <&apps_smmu 0x156 0x0>;
+			#dma-cells = <3>;
+			status = "disabled";
+		};
+
 		usb3: usb@4ef8800 {
 			compatible = "qcom,sm6125-dwc3", "qcom,dwc3";
 			reg = <0x04ef8800 0x400>;
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 2/2] arm64: dts: qcom: sm6125: Add GPI DMA nodes
  2022-12-22 19:46 ` [PATCH v3 2/2] arm64: dts: qcom: sm6125: Add GPI DMA nodes Marijn Suijten
@ 2022-12-22 19:47   ` Konrad Dybcio
  0 siblings, 0 replies; 6+ messages in thread
From: Konrad Dybcio @ 2022-12-22 19:47 UTC (permalink / raw)
  To: Marijn Suijten, phone-devel, Andy Gross, Bjorn Andersson,
	Vinod Koul, Rob Herring, Krzysztof Kozlowski
  Cc: ~postmarketos/upstreaming, AngeloGioacchino Del Regno,
	Konrad Dybcio, Martin Botka, Jami Kettunen, Lux Aliaga,
	Richard Acayan, Luca Weiss, Bhupesh Sharma, Douglas Anderson,
	linux-arm-msm, dmaengine, devicetree, linux-kernel



On 22.12.2022 20:46, Marijn Suijten wrote:
> From: Martin Botka <martin.botka@somainline.org>
> 
> Add nodes for GPI DMA hosts on SM6125.
> 
> Signed-off-by: Martin Botka <martin.botka@somainline.org>
> [Marijn: reorder properties, use sdm845 fallback compatible, disable by
>  default, use 3 instead of 5 dma cells]
> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/sm6125.dtsi | 37 ++++++++++++++++++++++++++++
>  1 file changed, 37 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
> index 7c326368e30d..6f9b56a937c6 100644
> --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
> @@ -5,6 +5,7 @@
>  
>  #include <dt-bindings/clock/qcom,gcc-sm6125.h>
>  #include <dt-bindings/clock/qcom,rpmcc.h>
> +#include <dt-bindings/dma/qcom-gpi.h>
>  #include <dt-bindings/gpio/gpio.h>
>  #include <dt-bindings/interrupt-controller/arm-gic.h>
>  #include <dt-bindings/power/qcom-rpmpd.h>
> @@ -510,6 +511,42 @@ sdhc_2: mmc@4784000 {
>  			status = "disabled";
>  		};
>  
> +		gpi_dma0: dma-controller@4a00000 {
> +			compatible = "qcom,sm6125-gpi-dma", "qcom,sdm845-gpi-dma";
> +			reg = <0x04a00000 0x60000>;
> +			interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;
> +			dma-channels = <8>;
> +			dma-channel-mask = <0x1f>;
> +			iommus = <&apps_smmu 0x136 0x0>;
> +			#dma-cells = <3>;
> +			status = "disabled";
> +		};
> +
> +		gpi_dma1: dma-controller@4c00000 {
> +			compatible = "qcom,sm6125-gpi-dma", "qcom,sdm845-gpi-dma";
> +			reg = <0x04c00000 0x60000>;
> +			interrupts = <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>;
> +			dma-channels = <8>;
> +			dma-channel-mask = <0x0f>;
> +			iommus = <&apps_smmu 0x156 0x0>;
> +			#dma-cells = <3>;
> +			status = "disabled";
> +		};
> +
>  		usb3: usb@4ef8800 {
>  			compatible = "qcom,sm6125-dwc3", "qcom,dwc3";
>  			reg = <0x04ef8800 0x400>;

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 1/2] dt-bindings: dma: gpi: Document SM6125 compatible
  2022-12-22 19:45 ` [PATCH v3 1/2] dt-bindings: dma: gpi: Document SM6125 compatible Marijn Suijten
@ 2022-12-28  6:20   ` Vinod Koul
  0 siblings, 0 replies; 6+ messages in thread
From: Vinod Koul @ 2022-12-28  6:20 UTC (permalink / raw)
  To: Marijn Suijten
  Cc: phone-devel, Andy Gross, Bjorn Andersson, Rob Herring,
	Krzysztof Kozlowski, ~postmarketos/upstreaming,
	AngeloGioacchino Del Regno, Konrad Dybcio, Martin Botka,
	Jami Kettunen, Lux Aliaga, Konrad Dybcio, Richard Acayan,
	Luca Weiss, Bhupesh Sharma, Douglas Anderson, linux-arm-msm,
	dmaengine, devicetree, linux-kernel, Krzysztof Kozlowski

On 22-12-22, 20:45, Marijn Suijten wrote:
> From: Martin Botka <martin.botka@somainline.org>
> 
> Document compatibility for this GPI DMA controller on SM6125.

Applied, thanks

-- 
~Vinod

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: (subset) [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA
  2022-12-22 19:45 [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA Marijn Suijten
  2022-12-22 19:45 ` [PATCH v3 1/2] dt-bindings: dma: gpi: Document SM6125 compatible Marijn Suijten
  2022-12-22 19:46 ` [PATCH v3 2/2] arm64: dts: qcom: sm6125: Add GPI DMA nodes Marijn Suijten
@ 2022-12-29 17:23 ` Bjorn Andersson
  2 siblings, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2022-12-29 17:23 UTC (permalink / raw)
  To: agross, phone-devel, vkoul, Marijn Suijten, robh+dt,
	krzysztof.kozlowski+dt
  Cc: bhupesh.sharma, mailingradian, linux-arm-msm, martin.botka,
	jami.kettunen, they, konrad.dybcio, luca.weiss, dmaengine,
	Douglas Anderson, ~postmarketos/upstreaming, linux-kernel,
	angelogioacchino.delregno, konrad.dybcio, devicetree

On Thu, 22 Dec 2022 20:45:58 +0100, Marijn Suijten wrote:
> Enable GPI DMA on SM6125 by using the new sdm845 compatible with
> ee_offset 0.
> 
> Changes since v2:
> - Remove leading zero from iommu stream ID.
> 
> v2: https://lore.kernel.org/linux-arm-msm/20221216231528.1268447-1-marijn.suijten@somainline.org/T/#u
> 
> [...]

Applied, thanks!

[2/2] arm64: dts: qcom: sm6125: Add GPI DMA nodes
      commit: 581734f754d2cb3bd748687dedb3c4ba298d7d80

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-12-29 17:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-22 19:45 [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA Marijn Suijten
2022-12-22 19:45 ` [PATCH v3 1/2] dt-bindings: dma: gpi: Document SM6125 compatible Marijn Suijten
2022-12-28  6:20   ` Vinod Koul
2022-12-22 19:46 ` [PATCH v3 2/2] arm64: dts: qcom: sm6125: Add GPI DMA nodes Marijn Suijten
2022-12-22 19:47   ` Konrad Dybcio
2022-12-29 17:23 ` (subset) [PATCH v3 0/2] arm64: dts: qcom: sm6125: Enable GPI DMA Bjorn Andersson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).