[PATCH v2 0/3] Add support for qcrypto in kaanapali

[PATCH v2 0/3] Add support for qcrypto in kaanapali

[Kuldeep Singh]

Add qcrypto and cryptobam DT nodes for enabling qcrypto on kaanapali.
Validations:
- make ARCH=arm64 DT_CHECKER_FLAGS=-m DT_SCHEMA_FILES=Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml dt_binding_check
- make ARCH=arm64 qcom/kaanapali-mtp.dtb CHECK_DTBS=1 DT_SCHEMA_FILES=Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
- cryptobam and crypto driver probe
- kcapi test

Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
---
Changes in v2:
- Update commit message for patch 1/3 as suggested by Krzysztof.
- Collect reviewed-by tags.
- Rebase to latest linux-next/master.
- Link to v1: https://lore.kernel.org/linux-arm-msm/20260424-knp_qce-v1-0-813e18f8f355@oss.qualcomm.com

---
Kuldeep Singh (3):
      dt-bindings: dma: qcom,bam-dma: Document BAM v2.0.0 compatible
      dmaengine: qcom: bam_dma: Add support for BAM v2.0.0
      arm64: dts: qcom: kaanapali: Add qcrypto node support

 .../devicetree/bindings/dma/qcom,bam-dma.yaml      | 21 +++++++++++++++
 arch/arm64/boot/dts/qcom/kaanapali.dtsi            | 25 ++++++++++++++++++
 drivers/dma/qcom/bam_dma.c                         | 30 ++++++++++++++++++++++
 3 files changed, 76 insertions(+)
---
base-commit: 4c406406070d57dbefeaad149181785330c23f92
change-id: 20260424-knp_qce-00f9df3e2039

Best regards,
--  
Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>

[PATCH v2 1/3] dt-bindings: dma: qcom,bam-dma: Document BAM v2.0.0 compatible

[Kuldeep Singh]

Document compatible string for bam v2.0.0 version found on kaanapali.
BAM v2.0.0 differs from the earlier v1.7.X revision in terms of register
layout and offsets, requiring a distinct compatible for correct hardware
description.

Also add a new example for BAM v2.0.0 to illustrate a more complete
configuration than the existing v1.4 example. The new example covers
64-bit address and size cells, IOMMU bindings and execution
environment–related properties required on newer platforms.

Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
---
 .../devicetree/bindings/dma/qcom,bam-dma.yaml       | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml b/Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
index 6493a6968bb4..0923fb189ada 100644
--- a/Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
+++ b/Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
@@ -23,6 +23,8 @@ properties:
           - qcom,bam-v1.4.0
           # MSM8916, SDM630
           - qcom,bam-v1.7.0
+          # Kaanapali
+          - qcom,bam-v2.0.0
       - items:
           - enum:
               # SDM845, SM6115, SM8150, SM8250 and QCM2290
@@ -118,4 +120,23 @@ examples:
         #dma-cells = <1>;
         qcom,ee = <0>;
     };
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    soc {
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        dma-controller@1dc4000 {
+            compatible = "qcom,bam-v2.0.0";
+            reg = <0x0 0x01dc4000 0x0 0x22000>;
+            interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+            #dma-cells = <1>;
+            iommus = <&apps_smmu 0xc0 0>, <&apps_smmu 0xc1 0>;
+            qcom,ee = <0>;
+            qcom,num-ees = <4>;
+            num-channels = <20>;
+            qcom,controlled-remotely;
+        };
+    };
 ...

-- 
2.34.1

Re: [PATCH v2 1/3] dt-bindings: dma: qcom,bam-dma: Document BAM v2.0.0 compatible

[Krzysztof Kozlowski]

On Thu, May 14, 2026 at 12:22:20AM +0530, Kuldeep Singh wrote:
> Document compatible string for bam v2.0.0 version found on kaanapali.
> BAM v2.0.0 differs from the earlier v1.7.X revision in terms of register
> layout and offsets, requiring a distinct compatible for correct hardware
> description.
> 
> Also add a new example for BAM v2.0.0 to illustrate a more complete
> configuration than the existing v1.4 example. The new example covers
> 64-bit address and size cells, IOMMU bindings and execution
> environment–related properties required on newer platforms.
> 
> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>

I am not going to repeat my comments.

Best regards,
Krzysztof

Re: [PATCH v2 1/3] dt-bindings: dma: qcom,bam-dma: Document BAM v2.0.0 compatible

[Kuldeep Singh]

On 15-05-2026 12:23, Krzysztof Kozlowski wrote:
> On Thu, May 14, 2026 at 12:22:20AM +0530, Kuldeep Singh wrote:
>> Document compatible string for bam v2.0.0 version found on kaanapali.
>> BAM v2.0.0 differs from the earlier v1.7.X revision in terms of register
>> layout and offsets, requiring a distinct compatible for correct hardware
>> description.
>>
>> Also add a new example for BAM v2.0.0 to illustrate a more complete
>> configuration than the existing v1.4 example. The new example covers
>> 64-bit address and size cells, IOMMU bindings and execution
>> environment–related properties required on newer platforms.
>>
>> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
> 
> I am not going to repeat my comments.

Hi Krzysztof,
As per last discussion,
https://lore.kernel.org/linux-arm-msm/2d79d1b6-be1f-45ad-b673-c8b3b57f1e15@kernel.org/

Intention was to improve commit message on showcasing v2.0.0 diff with
existing v1.7.X versions and also what extra the new example is
covering. I hope i mentioned it clearly in v2 commit message.

May i know what extra information you are looking?
This helps in aligning ourself and incorporate all relevant feedback.
-- 
Regards
Kuldeep

Re: [PATCH v2 1/3] dt-bindings: dma: qcom,bam-dma: Document BAM v2.0.0 compatible

[Krzysztof Kozlowski]

On 18/05/2026 08:26, Kuldeep Singh wrote:
> On 15-05-2026 12:23, Krzysztof Kozlowski wrote:
>> On Thu, May 14, 2026 at 12:22:20AM +0530, Kuldeep Singh wrote:
>>> Document compatible string for bam v2.0.0 version found on kaanapali.
>>> BAM v2.0.0 differs from the earlier v1.7.X revision in terms of register
>>> layout and offsets, requiring a distinct compatible for correct hardware
>>> description.
>>>
>>> Also add a new example for BAM v2.0.0 to illustrate a more complete
>>> configuration than the existing v1.4 example. The new example covers
>>> 64-bit address and size cells, IOMMU bindings and execution
>>> environment–related properties required on newer platforms.
>>>
>>> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
>>
>> I am not going to repeat my comments.
> 
> Hi Krzysztof,
> As per last discussion,
> https://lore.kernel.org/linux-arm-msm/2d79d1b6-be1f-45ad-b673-c8b3b57f1e15@kernel.org/
> 
> Intention was to improve commit message on showcasing v2.0.0 diff with
> existing v1.7.X versions and also what extra the new example is
> covering. I hope i mentioned it clearly in v2 commit message.
> 
> May i know what extra information you are looking?
> This helps in aligning ourself and incorporate all relevant feedback.

Hm, I missed that part of discussion. Let me re-review again.


Best regards,
Krzysztof

Re: [PATCH v2 1/3] dt-bindings: dma: qcom,bam-dma: Document BAM v2.0.0 compatible

[Krzysztof Kozlowski]

On 13/05/2026 20:52, Kuldeep Singh wrote:
> Document compatible string for bam v2.0.0 version found on kaanapali.
> BAM v2.0.0 differs from the earlier v1.7.X revision in terms of register
> layout and offsets, requiring a distinct compatible for correct hardware
> description.
> 
> Also add a new example for BAM v2.0.0 to illustrate a more complete
> configuration than the existing v1.4 example. The new example covers
> 64-bit address and size cells, IOMMU bindings and execution
> environment–related properties required on newer platforms.
> 
> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

[PATCH v2 2/3] dmaengine: qcom: bam_dma: Add support for BAM v2.0.0

[Kuldeep Singh]

Add register offset table entry for bam v2.0.0 version found on
kaanapali.

Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
---
 drivers/dma/qcom/bam_dma.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c
index 19116295f832..1bb26af0405f 100644
--- a/drivers/dma/qcom/bam_dma.c
+++ b/drivers/dma/qcom/bam_dma.c
@@ -199,6 +199,35 @@ static const struct reg_offset_data bam_v1_7_reg_info[] = {
 	[BAM_P_FIFO_SIZES]	= { 0x13820, 0x00, 0x1000, 0x00 },
 };
 
+static const struct reg_offset_data bam_v2_0_reg_info[] = {
+	[BAM_CTRL]		= { 0x0000, 0x00, 0x00, 0x00 },
+	[BAM_REVISION]		= { 0x1000, 0x00, 0x00, 0x00 },
+	[BAM_NUM_PIPES]		= { 0x1008, 0x00, 0x00, 0x00 },
+	[BAM_DESC_CNT_TRSHLD]	= { 0x0008, 0x00, 0x00, 0x00 },
+	[BAM_IRQ_SRCS]		= { 0x3010, 0x00, 0x00, 0x00 },
+	[BAM_IRQ_SRCS_MSK]	= { 0x3014, 0x00, 0x00, 0x00 },
+	[BAM_IRQ_SRCS_UNMASKED]	= { 0x3018, 0x00, 0x00, 0x00 },
+	[BAM_IRQ_STTS]		= { 0x0014, 0x00, 0x00, 0x00 },
+	[BAM_IRQ_CLR]		= { 0x0018, 0x00, 0x00, 0x00 },
+	[BAM_IRQ_EN]		= { 0x001C, 0x00, 0x00, 0x00 },
+	[BAM_CNFG_BITS]		= { 0x007C, 0x00, 0x00, 0x00 },
+	[BAM_IRQ_SRCS_EE]	= { 0x3000, 0x00, 0x00, 0x1000 },
+	[BAM_IRQ_SRCS_MSK_EE]	= { 0x3004, 0x00, 0x00, 0x1000 },
+	[BAM_P_CTRL]		= { 0xC000, 0x1000, 0x00, 0x00 },
+	[BAM_P_RST]		= { 0xC004, 0x1000, 0x00, 0x00 },
+	[BAM_P_HALT]		= { 0xC008, 0x1000, 0x00, 0x00 },
+	[BAM_P_IRQ_STTS]	= { 0xC010, 0x1000, 0x00, 0x00 },
+	[BAM_P_IRQ_CLR]		= { 0xC014, 0x1000, 0x00, 0x00 },
+	[BAM_P_IRQ_EN]		= { 0xC018, 0x1000, 0x00, 0x00 },
+	[BAM_P_EVNT_DEST_ADDR]	= { 0xC82C, 0x00, 0x1000, 0x00 },
+	[BAM_P_EVNT_REG]	= { 0xC818, 0x00, 0x1000, 0x00 },
+	[BAM_P_SW_OFSTS]	= { 0xC800, 0x00, 0x1000, 0x00 },
+	[BAM_P_DATA_FIFO_ADDR]	= { 0xC824, 0x00, 0x1000, 0x00 },
+	[BAM_P_DESC_FIFO_ADDR]	= { 0xC81C, 0x00, 0x1000, 0x00 },
+	[BAM_P_EVNT_GEN_TRSHLD]	= { 0xC828, 0x00, 0x1000, 0x00 },
+	[BAM_P_FIFO_SIZES]	= { 0xC820, 0x00, 0x1000, 0x00 },
+};
+
 /* BAM CTRL */
 #define BAM_SW_RST			BIT(0)
 #define BAM_EN				BIT(1)
@@ -1208,6 +1237,7 @@ static const struct of_device_id bam_of_match[] = {
 	{ .compatible = "qcom,bam-v1.3.0", .data = &bam_v1_3_reg_info },
 	{ .compatible = "qcom,bam-v1.4.0", .data = &bam_v1_4_reg_info },
 	{ .compatible = "qcom,bam-v1.7.0", .data = &bam_v1_7_reg_info },
+	{ .compatible = "qcom,bam-v2.0.0", .data = &bam_v2_0_reg_info },
 	{}
 };
 

-- 
2.34.1

Re: [PATCH v2 2/3] dmaengine: qcom: bam_dma: Add support for BAM v2.0.0

[Konrad Dybcio]

On 5/13/26 8:52 PM, Kuldeep Singh wrote:
> Add register offset table entry for bam v2.0.0 version found on
> kaanapali.
> 
> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>


Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

[PATCH v2 3/3] arm64: dts: qcom: kaanapali: Add qcrypto node support

[Kuldeep Singh]

Add qcrypto and cryptobam support for kaanapali target.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/kaanapali.dtsi | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/kaanapali.dtsi b/arch/arm64/boot/dts/qcom/kaanapali.dtsi
index 7cc326aa1a1a..941c9b131a4e 100644
--- a/arch/arm64/boot/dts/qcom/kaanapali.dtsi
+++ b/arch/arm64/boot/dts/qcom/kaanapali.dtsi
@@ -2541,6 +2541,31 @@ ice: crypto@1d88000 {
 			clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
 		};
 
+		cryptobam: dma-controller@1dc4000 {
+			compatible = "qcom,bam-v2.0.0";
+			reg = <0x0 0x01dc4000 0x0 0x22000>;
+			interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+			#dma-cells = <1>;
+			iommus = <&apps_smmu 0xc0 0x0>,
+				 <&apps_smmu 0xc1 0x0>;
+			qcom,ee = <0>;
+			qcom,num-ees = <4>;
+			num-channels = <20>;
+			qcom,controlled-remotely;
+		};
+
+		crypto: crypto@1dfa000 {
+			compatible = "qcom,kaanapali-qce", "qcom,sm8150-qce", "qcom,qce";
+			reg = <0x0 0x01dfa000 0x0 0x6000>;
+			interconnects = <&aggre_noc MASTER_CRYPTO QCOM_ICC_TAG_ALWAYS
+					 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+			interconnect-names = "memory";
+			dmas = <&cryptobam 4>, <&cryptobam 5>;
+			dma-names = "rx", "tx";
+			iommus = <&apps_smmu 0xc0 0x0>,
+				 <&apps_smmu 0xc1 0x0>;
+		};
+
 		tcsr_mutex: hwlock@1f40000 {
 			compatible = "qcom,tcsr-mutex";
 			reg = <0x0 0x01f40000 0x0 0x20000>;

-- 
2.34.1

Re: (subset) [PATCH v2 0/3] Add support for qcrypto in kaanapali

[Vinod Koul]

On Thu, 14 May 2026 00:22:19 +0530, Kuldeep Singh wrote:
> Add qcrypto and cryptobam DT nodes for enabling qcrypto on kaanapali.
> Validations:
> - make ARCH=arm64 DT_CHECKER_FLAGS=-m DT_SCHEMA_FILES=Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml dt_binding_check
> - make ARCH=arm64 qcom/kaanapali-mtp.dtb CHECK_DTBS=1 DT_SCHEMA_FILES=Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
> - cryptobam and crypto driver probe
> - kcapi test
> 
> [...]

Applied, thanks!

[1/3] dt-bindings: dma: qcom,bam-dma: Document BAM v2.0.0 compatible
      commit: dfd9538e78f57705e6c656d3ff5660ae7137789c
[2/3] dmaengine: qcom: bam_dma: Add support for BAM v2.0.0
      commit: 3331fc194b129582fa21cb3a7e5cc68aaac1081f

Best regards,
-- 
~Vinod

Re: (subset) [PATCH v2 0/3] Add support for qcrypto in kaanapali

[Bjorn Andersson]

On Thu, 14 May 2026 00:22:19 +0530, Kuldeep Singh wrote:
> Add qcrypto and cryptobam DT nodes for enabling qcrypto on kaanapali.
> Validations:
> - make ARCH=arm64 DT_CHECKER_FLAGS=-m DT_SCHEMA_FILES=Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml dt_binding_check
> - make ARCH=arm64 qcom/kaanapali-mtp.dtb CHECK_DTBS=1 DT_SCHEMA_FILES=Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
> - cryptobam and crypto driver probe
> - kcapi test
> 
> [...]

Applied, thanks!

[3/3] arm64: dts: qcom: kaanapali: Add qcrypto node support
      commit: 0a4015962f8115bdca3c0c4d0420f2ff85409194

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