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

[PATCH 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>
---
Kuldeep Singh (3):
      dt-bindings: dma: qcom: bam-dma: Add support for kaanapali BAM v2.0.0
      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 1/3] dt-bindings: dma: qcom: bam-dma: Add support for kaanapali BAM v2.0.0

[Kuldeep Singh]

Kaanapali support newer BAM v2.0.0 version.
Document the compatible string and update example along with it.

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 1/3] dt-bindings: dma: qcom: bam-dma: Add support for kaanapali BAM v2.0.0

[Krzysztof Kozlowski]

On Fri, Apr 24, 2026 at 05:04:15PM +0530, Kuldeep Singh wrote:
> Kaanapali support newer BAM v2.0.0 version.
> Document the compatible string and update example along with it.

And why v2.0.0 is not compatible with v1.7.0? Or what is not compatible?

> 
> 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>
> +

Drop the example, no need for difference in compatible.

Best regards,
Krzysztof

Re: [PATCH 1/3] dt-bindings: dma: qcom: bam-dma: Add support for kaanapali BAM v2.0.0

[Krzysztof Kozlowski]

On 25/04/2026 12:23, Krzysztof Kozlowski wrote:
> On Fri, Apr 24, 2026 at 05:04:15PM +0530, Kuldeep Singh wrote:
>> Kaanapali support newer BAM v2.0.0 version.
>> Document the compatible string and update example along with it.
> 
> And why v2.0.0 is not compatible with v1.7.0? Or what is not compatible?
> 
>>


Ah, and drop redundant "support for". Write concise subjects and binding
cannot "support" something.

Best regards,
Krzysztof

Re: [PATCH 1/3] dt-bindings: dma: qcom: bam-dma: Add support for kaanapali BAM v2.0.0

[Kuldeep Singh]

On 25-04-2026 15:54, Krzysztof Kozlowski wrote:
> On 25/04/2026 12:23, Krzysztof Kozlowski wrote:
>> On Fri, Apr 24, 2026 at 05:04:15PM +0530, Kuldeep Singh wrote:
>>> Kaanapali support newer BAM v2.0.0 version.
>>> Document the compatible string and update example along with it.
>>
>> And why v2.0.0 is not compatible with v1.7.0? Or what is not compatible?
>>
>>>
> 
> 
> Ah, and drop redundant "support for". Write concise subjects and binding
> cannot "support" something.
Sure, will reword and keep something simple like below.
"Document compatible string for bam v2.0.0 version found on kaanapali."

-- 
Regards
Kuldeep

Re: [PATCH 1/3] dt-bindings: dma: qcom: bam-dma: Add support for kaanapali BAM v2.0.0

[Kuldeep Singh]

On 25-04-2026 15:53, Krzysztof Kozlowski wrote:
> On Fri, Apr 24, 2026 at 05:04:15PM +0530, Kuldeep Singh wrote:
>> Kaanapali support newer BAM v2.0.0 version.
>> Document the compatible string and update example along with it.
> 
> And why v2.0.0 is not compatible with v1.7.0? Or what is not compatible?

Kindly check patch 2/3 of series to understand register level 
differences in v1.7.0 to v2.0.0.

> 
>>
>> 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>
>> +
> 
> Drop the example, no need for difference in compatible.
The current example captures an old instance and doesn't give complete 
picture.
Example, doesn't specify iommus, qcom,controlled-remotely etc. whereas 
recent ones don't specify clocks and reg address/size cells are 2 not 1.

I believe current example doesn't give enough info and hence want to 
extend and highlight latest usage for either v1.7.4 or v2.0.0

Do you want me to have separate patch for this change if looks ok?

-- 
Regards
Kuldeep

Re: [PATCH 1/3] dt-bindings: dma: qcom: bam-dma: Add support for kaanapali BAM v2.0.0

[Krzysztof Kozlowski]

On 27/04/2026 10:34, Kuldeep Singh wrote:
> On 25-04-2026 15:53, Krzysztof Kozlowski wrote:
>> On Fri, Apr 24, 2026 at 05:04:15PM +0530, Kuldeep Singh wrote:
>>> Kaanapali support newer BAM v2.0.0 version.
>>> Document the compatible string and update example along with it.
>>
>> And why v2.0.0 is not compatible with v1.7.0? Or what is not compatible?
> 
> Kindly check patch 2/3 of series to understand register level 
> differences in v1.7.0 to v2.0.0.

This patch commit should explain WHY you are doing this patch.


> 
>>
>>>
>>> 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>
>>> +
>>
>> Drop the example, no need for difference in compatible.
> The current example captures an old instance and doesn't give complete 
> picture.
> Example, doesn't specify iommus, qcom,controlled-remotely etc. whereas 
> recent ones don't specify clocks and reg address/size cells are 2 not 1.

That's fine then and should be mentioned in the commit msg.

Best regards,
Krzysztof

Re: [PATCH 1/3] dt-bindings: dma: qcom: bam-dma: Add support for kaanapali BAM v2.0.0

[Kuldeep Singh]

>>> Drop the example, no need for difference in compatible.
>> The current example captures an old instance and doesn't give complete 
>> picture.
>> Example, doesn't specify iommus, qcom,controlled-remotely etc. whereas 
>> recent ones don't specify clocks and reg address/size cells are 2 not 1.
> 
> That's fine then and should be mentioned in the commit msg.
Sure, thanks for both feedbacks.
Will improve commit message and repost again.

-- 
Regards
Kuldeep

[PATCH 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

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

[Kuldeep Singh]

Add qcrypto and cryptobam support for kaanapali target.

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: [PATCH 3/3] arm64: dts: qcom: kaanapali: Add qcrypto node support

[Konrad Dybcio]

On 4/24/26 1:34 PM, Kuldeep Singh wrote:
> Add qcrypto and cryptobam support for kaanapali target.
> 
> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
> ---

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

Konrad