[PATCH v6 0/2] Shikra: Support for QCE

[PATCH v6 0/2] Shikra: Support for QCE

[Kuldeep Singh]

This patch series enable QCE support on Shikra.
Shikra is derived from agatti target and QCE was using different
compatible configuration.
Also, one more reason to update QCE is, clk-smd-rpm was doing proxy
voting and crypto was consuming it. With proxy vote removal, qce need to
vote for it's own clocks explicitly which is already being done for
agatti target. Adapt same mechanism to Shikra QCE too.
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/arch/arm64/boot/dts/qcom/agatti.dtsi#n889

The current qce configuration will still work but this one is more
appropriately describing the hardware.

Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
---
Changes in v6:
- Update QCE bindings and fallback compatible
- Define clocks for crypto and cryptobam. 
- Link to v5: https://patch.msgid.link/20260820-b4-shikra_crypto_changse-v5-1-70eb4040fb25@oss.qualcomm.com

Changes in v5:
- Rebase onto latest linux-next; patches 1-5 of v4 are merged.
- Update sdhc_ice power domain to match sdhc_1 PD.(Sashiko review).
- Link to v4: https://patch.msgid.link/20260714-b4-shikra_crypto_changse-v4-0-06a4ea97c209@oss.qualcomm.com

Changes in v4:
- Update Patch 1/6 commit message to accustom hawi special case.
- Collects tags(Krzysztof)
- Link to v3: https://patch.msgid.link/20260706-b4-shikra_crypto_changse-v3-0-23b4c2054227@oss.qualcomm.com

Changes in v3:
- Fix commit messages.
- Collect Ack and Reviewed-by tags.
- Link to v2: https://patch.msgid.link/20260702-b4-shikra_crypto_changse-v2-0-66173f2f28b3@qti.qualcomm.com

Changes in v2:
- Add fix in ice bindings to specify 2 clocks defauly for non-legacy Soc
  compatibles.
- Update commit messages.
- Link to v1: https://patch.msgid.link/20260521-shikra_crypto_changse-v1-0-0154cc9cc0de@oss.qualcomm.com/

To: Bartosz Golaszewski <brgl@kernel.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
To: "David S. Miller" <davem@davemloft.net>
To: Rob Herring <robh@kernel.org>
To: Krzysztof Kozlowski <krzk+dt@kernel.org>
To: Conor Dooley <conor+dt@kernel.org>
To: Bjorn Andersson <andersson@kernel.org>
To: Konrad Dybcio <konradybcio@kernel.org>
To: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Cc: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-crypto@vger.kernel.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org

---
Kuldeep Singh (2):
      dt-bindings: crypto: Adjust Shikra compatible hierarchy
      arm64: dts: qcom: shikra: Correct QCE node configuration

 Documentation/devicetree/bindings/crypto/qcom-qce.yaml | 3 ++-
 arch/arm64/boot/dts/qcom/shikra.dtsi                   | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)
---
base-commit: af5f12805e5cefa4fe68d6127c7e1fb78cd5535c
change-id: 20260701-b4-shikra_crypto_changse-f2d6d5bf04b5

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

[PATCH v6 1/2] dt-bindings: crypto: Adjust Shikra compatible hierarchy

[Kuldeep Singh]

Shikra reuses the same QCE integration as Agatti and should follow the
corresponding binding requirements too.

Move the Shikra compatible to the appropriate binding hierarchy
(matching qcom,qcm2290-qce) to reflect the underlying hardware
description.

Fixes: 45834ff95a6f ("dt-bindings: crypto: qcom-qce: Document the Shikra crypto engine")
Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
---
 Documentation/devicetree/bindings/crypto/qcom-qce.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
index 5a653757ee75..fcf725bfa36b 100644
--- a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
+++ b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
@@ -39,6 +39,7 @@ properties:
               - qcom,msm8996-qce
               - qcom,qcm2290-qce
               - qcom,sdm845-qce
+              - qcom,shikra-qce
               - qcom,sm6115-qce
           - const: qcom,ipq4019-qce
           - const: qcom,qce
@@ -54,7 +55,6 @@ properties:
               - qcom,qcs8300-qce
               - qcom,sa8775p-qce
               - qcom,sc7280-qce
-              - qcom,shikra-qce
               - qcom,sm6350-qce
               - qcom,sm8250-qce
               - qcom,sm8350-qce
@@ -133,6 +133,7 @@ allOf:
           contains:
             enum:
               - qcom,qcm2290-qce
+              - qcom,shikra-qce
               - qcom,sm6115-qce
     then:
       properties:

-- 
2.34.1

[PATCH v6 2/2] arm64: dts: qcom: shikra: Correct QCE node configuration

[Kuldeep Singh]

Shikra is derived from Agatti and uses the same QCE integration.
Update the QCE node to match the underlying hardware implementation by
adjusting the fallback compatible and related properties, including
clocks and clock-names.

Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/shikra.dtsi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/shikra.dtsi b/arch/arm64/boot/dts/qcom/shikra.dtsi
index c1f06f692f66..30c7cabc058a 100644
--- a/arch/arm64/boot/dts/qcom/shikra.dtsi
+++ b/arch/arm64/boot/dts/qcom/shikra.dtsi
@@ -1075,10 +1075,12 @@ cryptobam: dma-controller@1b04000 {
 			qcom,controlled-remotely;
 			num-channels = <16>;
 			qcom,num-ees = <4>;
+			clocks = <&rpmcc RPM_SMD_CE1_CLK>;
+			clock-names = "bam_clk";
 		};
 
 		crypto: crypto@1b3a000 {
-			compatible = "qcom,shikra-qce", "qcom,sm8150-qce", "qcom,qce";
+			compatible = "qcom,shikra-qce", "qcom,ipq4019-qce", "qcom,qce";
 			reg = <0x0 0x01b3a000 0x0 0x6000>;
 			dmas = <&cryptobam 4>, <&cryptobam 5>;
 			dma-names = "rx", "tx";
@@ -1089,9 +1091,8 @@ crypto: crypto@1b3a000 {
 				 <&apps_smmu 0x96 0x0011>,
 				 <&apps_smmu 0x98 0x0001>,
 				 <&apps_smmu 0x9f 0x0>;
-			interconnects = <&system_noc MASTER_CRYPTO_CORE0 0
-					 &mc_virt SLAVE_EBI_CH0 0>;
-			interconnect-names = "memory";
+			clocks = <&rpmcc RPM_SMD_CE1_CLK>;
+			clock-names = "core";
 		};
 
 		qfprom: efuse@1b44000 {

-- 
2.34.1

Re: [PATCH v6 2/2] arm64: dts: qcom: shikra: Correct QCE node configuration

[Abel Vesa]

On 26-09-07 17:33:37, Kuldeep Singh wrote:
> Shikra is derived from Agatti and uses the same QCE integration.
> Update the QCE node to match the underlying hardware implementation by
> adjusting the fallback compatible and related properties, including
> clocks and clock-names.
> 
> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>

No fixes tag ?

Re: [PATCH v6 2/2] arm64: dts: qcom: shikra: Correct QCE node configuration

[Kuldeep Singh]

On 07-09-2026 19:01, Abel Vesa wrote:
> On 26-09-07 17:33:37, Kuldeep Singh wrote:
>> Shikra is derived from Agatti and uses the same QCE integration.
>> Update the QCE node to match the underlying hardware implementation by
>> adjusting the fallback compatible and related properties, including
>> clocks and clock-names.
>>
>> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
> 
> No fixes tag ?

I was having confusion so didn't add it.

The parent change is in linux-next branch and not in torvalds tree
currently.
Shall i update Fixes tag based on linux-next commit only? or not needed
at all?

-- 
Regards
Kuldeep

Re: [PATCH v6 2/2] arm64: dts: qcom: shikra: Correct QCE node configuration

[Bartosz Golaszewski]

On Mon, 7 Sep 2026 15:39:10 +0200, Kuldeep Singh
<kuldeep.singh@oss.qualcomm.com> said:
> On 07-09-2026 19:01, Abel Vesa wrote:
>> On 26-09-07 17:33:37, Kuldeep Singh wrote:
>>> Shikra is derived from Agatti and uses the same QCE integration.
>>> Update the QCE node to match the underlying hardware implementation by
>>> adjusting the fallback compatible and related properties, including
>>> clocks and clock-names.
>>>
>>> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
>>
>> No fixes tag ?
>
> I was having confusion so didn't add it.
>
> The parent change is in linux-next branch and not in torvalds tree
> currently.
> Shall i update Fixes tag based on linux-next commit only? or not needed
> at all?
>

It still makes sense to add Fixes tag even if it's targetting the next cycle
and fixing an issue queued for v7.4.

Thanks,
Bart

Re: [PATCH v6 1/2] dt-bindings: crypto: Adjust Shikra compatible hierarchy

[Bartosz Golaszewski]

On Mon, 7 Sep 2026 14:03:36 +0200, Kuldeep Singh
<kuldeep.singh@oss.qualcomm.com> said:
> Shikra reuses the same QCE integration as Agatti and should follow the
> corresponding binding requirements too.
>
> Move the Shikra compatible to the appropriate binding hierarchy
> (matching qcom,qcm2290-qce) to reflect the underlying hardware
> description.
>
> Fixes: 45834ff95a6f ("dt-bindings: crypto: qcom-qce: Document the Shikra crypto engine")
> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
> ---
>  Documentation/devicetree/bindings/crypto/qcom-qce.yaml | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
> index 5a653757ee75..fcf725bfa36b 100644
> --- a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
> +++ b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
> @@ -39,6 +39,7 @@ properties:
>                - qcom,msm8996-qce
>                - qcom,qcm2290-qce
>                - qcom,sdm845-qce
> +              - qcom,shikra-qce
>                - qcom,sm6115-qce
>            - const: qcom,ipq4019-qce
>            - const: qcom,qce
> @@ -54,7 +55,6 @@ properties:
>                - qcom,qcs8300-qce
>                - qcom,sa8775p-qce
>                - qcom,sc7280-qce
> -              - qcom,shikra-qce
>                - qcom,sm6350-qce
>                - qcom,sm8250-qce
>                - qcom,sm8350-qce
> @@ -133,6 +133,7 @@ allOf:
>            contains:
>              enum:
>                - qcom,qcm2290-qce
> +              - qcom,shikra-qce
>                - qcom,sm6115-qce
>      then:
>        properties:
>
> --
> 2.34.1
>
>

Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>

Note: Shikra changes have not been released yet so this doesn't break anything.

Bart

Re: [PATCH v6 0/2] Shikra: Support for QCE

[Bartosz Golaszewski]

On Mon, 7 Sep 2026 14:03:35 +0200, Kuldeep Singh
<kuldeep.singh@oss.qualcomm.com> said:
> This patch series enable QCE support on Shikra.
> Shikra is derived from agatti target and QCE was using different
> compatible configuration.
> Also, one more reason to update QCE is, clk-smd-rpm was doing proxy
> voting and crypto was consuming it. With proxy vote removal, qce need to
> vote for it's own clocks explicitly which is already being done for
> agatti target. Adapt same mechanism to Shikra QCE too.
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/arch/arm64/boot/dts/qcom/agatti.dtsi#n889
>

This looks like a set of fixes to something that's already been queued, why
is this a v6 and not its own new series?

Bartosz

Re: [PATCH v6 2/2] arm64: dts: qcom: shikra: Correct QCE node configuration

[Kuldeep Singh]

On 07-09-2026 19:14, Bartosz Golaszewski wrote:
> On Mon, 7 Sep 2026 15:39:10 +0200, Kuldeep Singh
> <kuldeep.singh@oss.qualcomm.com> said:
>> On 07-09-2026 19:01, Abel Vesa wrote:
>>> On 26-09-07 17:33:37, Kuldeep Singh wrote:
>>>> Shikra is derived from Agatti and uses the same QCE integration.
>>>> Update the QCE node to match the underlying hardware implementation by
>>>> adjusting the fallback compatible and related properties, including
>>>> clocks and clock-names.
>>>>
>>>> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
>>>
>>> No fixes tag ?
>>
>> I was having confusion so didn't add it.
>>
>> The parent change is in linux-next branch and not in torvalds tree
>> currently.
>> Shall i update Fixes tag based on linux-next commit only? or not needed
>> at all?
>>
> 
> It still makes sense to add Fixes tag even if it's targetting the next cycle
> and fixing an issue queued for v7.4.

Sure, makes sense. Will update in next rev.
Fixes: 099cd05d200b ("arm64: dts: qcom: shikra: Add ICE, TRNG and QCE
nodes")
-- 
Regards
Kuldeep

Re: [PATCH v6 2/2] arm64: dts: qcom: shikra: Correct QCE node configuration

[Wenjia Zhang]

On 9/7/2026 8:03 PM, Kuldeep Singh wrote:
> Shikra is derived from Agatti and uses the same QCE integration.
> Update the QCE node to match the underlying hardware implementation by
> adjusting the fallback compatible and related properties, including
> clocks and clock-names.
>
> Signed-off-by: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
> ---
>   arch/arm64/boot/dts/qcom/shikra.dtsi | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/shikra.dtsi b/arch/arm64/boot/dts/qcom/shikra.dtsi
> index c1f06f692f66..30c7cabc058a 100644
> --- a/arch/arm64/boot/dts/qcom/shikra.dtsi
> +++ b/arch/arm64/boot/dts/qcom/shikra.dtsi
> @@ -1075,10 +1075,12 @@ cryptobam: dma-controller@1b04000 {
>   			qcom,controlled-remotely;
>   			num-channels = <16>;
>   			qcom,num-ees = <4>;
> +			clocks = <&rpmcc RPM_SMD_CE1_CLK>;
> +			clock-names = "bam_clk";
>   		};
>   
>   		crypto: crypto@1b3a000 {
> -			compatible = "qcom,shikra-qce", "qcom,sm8150-qce", "qcom,qce";
> +			compatible = "qcom,shikra-qce", "qcom,ipq4019-qce", "qcom,qce";
>   			reg = <0x0 0x01b3a000 0x0 0x6000>;
>   			dmas = <&cryptobam 4>, <&cryptobam 5>;
>   			dma-names = "rx", "tx";
> @@ -1089,9 +1091,8 @@ crypto: crypto@1b3a000 {
>   				 <&apps_smmu 0x96 0x0011>,
>   				 <&apps_smmu 0x98 0x0001>,
>   				 <&apps_smmu 0x9f 0x0>;
> -			interconnects = <&system_noc MASTER_CRYPTO_CORE0 0
> -					 &mc_virt SLAVE_EBI_CH0 0>;
> -			interconnect-names = "memory";
> +			clocks = <&rpmcc RPM_SMD_CE1_CLK>;
> +			clock-names = "core";
>   		};
>   
>   		qfprom: efuse@1b44000 {
Tested-by: Wanjia Zhang <wenjia.zhang@oss.qualcomm.com> #on shikra device

Re: [PATCH v6 0/2] Shikra: Support for QCE

[Kuldeep Singh]

On 07-09-2026 19:16, Bartosz Golaszewski wrote:
> On Mon, 7 Sep 2026 14:03:35 +0200, Kuldeep Singh
> <kuldeep.singh@oss.qualcomm.com> said:
>> This patch series enable QCE support on Shikra.
>> Shikra is derived from agatti target and QCE was using different
>> compatible configuration.
>> Also, one more reason to update QCE is, clk-smd-rpm was doing proxy
>> voting and crypto was consuming it. With proxy vote removal, qce need to
>> vote for it's own clocks explicitly which is already being done for
>> agatti target. Adapt same mechanism to Shikra QCE too.
>> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/arch/arm64/boot/dts/qcom/agatti.dtsi#n889
>>
> 
> This looks like a set of fixes to something that's already been queued, why
> is this a v6 and not its own new series?

Umm, both commits are having fixes tag so indeed it should be new
series. I'll collect feedback on current patchsets and send v1 version
next time.

-- 
Regards
Kuldeep