* [PATCH v7 1/4] ARM: dts: qcom: Use new compatibles for crypto nodes
2022-09-21 4:55 [PATCH v7 0/4] ARM: dts + defconfig: Add support for Qualcomm QCE block on new SoCs and in defconfig Bhupesh Sharma
@ 2022-09-21 4:55 ` Bhupesh Sharma
2022-09-21 4:56 ` [PATCH v7 2/4] arm64: dts: qcom: sm8250: Add dt entries to support crypto engine Bhupesh Sharma
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Bhupesh Sharma @ 2022-09-21 4:55 UTC (permalink / raw)
To: linux-arm-kernel, linux-arm-msm
Cc: agross, linux-kernel, robh+dt, thara.gopinath, devicetree, robh,
krzysztof.kozlowski, andersson, bhupesh.sharma, bhupesh.linux,
catalin.marinas, will, arnd
Since we are using soc specific qce crypto IP compatibles
in the bindings now, use the same in the device tree files
which include the crypto nodes.
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
---
arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +-
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +-
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi
index b23591110bd2..9c40714562d5 100644
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -314,7 +314,7 @@ cryptobam: dma-controller@8e04000 {
};
crypto: crypto@8e3a000 {
- compatible = "qcom,crypto-v5.1";
+ compatible = "qcom,ipq4019-qce";
reg = <0x08e3a000 0x6000>;
clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
<&gcc GCC_CRYPTO_AXI_CLK>,
diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
index a7c7ca980a71..0ae3c601b279 100644
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -198,7 +198,7 @@ cryptobam: dma-controller@704000 {
};
crypto: crypto@73a000 {
- compatible = "qcom,crypto-v5.1";
+ compatible = "qcom,ipq6018-qce";
reg = <0x0 0x0073a000 0x0 0x6000>;
clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
<&gcc GCC_CRYPTO_AXI_CLK>,
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
index a47acf9bdf24..0683ef931413 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -286,7 +286,7 @@ cryptobam: dma-controller@704000 {
};
crypto: crypto@73a000 {
- compatible = "qcom,crypto-v5.1";
+ compatible = "qcom,ipq8074-qce";
reg = <0x0073a000 0x6000>;
clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
<&gcc GCC_CRYPTO_AXI_CLK>,
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index c0a2baffa49d..0dd6e1fea99c 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -755,7 +755,7 @@ cryptobam: dma-controller@644000 {
};
crypto: crypto@67a000 {
- compatible = "qcom,crypto-v5.4";
+ compatible = "qcom,msm8996-qce";
reg = <0x0067a000 0x6000>;
clocks = <&gcc GCC_CE1_AHB_CLK>,
<&gcc GCC_CE1_AXI_CLK>,
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index d761da47220d..4aa5a82bd265 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -2566,7 +2566,7 @@ cryptobam: dma-controller@1dc4000 {
};
crypto: crypto@1dfa000 {
- compatible = "qcom,crypto-v5.4";
+ compatible = "qcom,sdm845-qce";
reg = <0 0x01dfa000 0 0x6000>;
clocks = <&gcc GCC_CE1_AHB_CLK>,
<&gcc GCC_CE1_AXI_CLK>,
--
2.37.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v7 2/4] arm64: dts: qcom: sm8250: Add dt entries to support crypto engine.
2022-09-21 4:55 [PATCH v7 0/4] ARM: dts + defconfig: Add support for Qualcomm QCE block on new SoCs and in defconfig Bhupesh Sharma
2022-09-21 4:55 ` [PATCH v7 1/4] ARM: dts: qcom: Use new compatibles for crypto nodes Bhupesh Sharma
@ 2022-09-21 4:56 ` Bhupesh Sharma
2022-09-21 4:56 ` [PATCH v7 3/4] arm64: dts: qcom: sm8150: " Bhupesh Sharma
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Bhupesh Sharma @ 2022-09-21 4:56 UTC (permalink / raw)
To: linux-arm-kernel, linux-arm-msm
Cc: agross, linux-kernel, robh+dt, thara.gopinath, devicetree, robh,
krzysztof.kozlowski, andersson, bhupesh.sharma, bhupesh.linux,
catalin.marinas, will, arnd
Add crypto engine (CE) and CE BAM related nodes and definitions to
'sm8250.dtsi'.
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index a5b62cadb129..7b3af34f8486 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2188,6 +2188,34 @@ ufs_mem_phy_lanes: phy@1d87400 {
};
};
+ cryptobam: dma-controller@1dc4000 {
+ compatible = "qcom,bam-v1.7.0";
+ reg = <0 0x01dc4000 0 0x24000>;
+ interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+ #dma-cells = <1>;
+ qcom,ee = <0>;
+ qcom,controlled-remotely;
+ iommus = <&apps_smmu 0x584 0x0011>,
+ <&apps_smmu 0x586 0x0011>,
+ <&apps_smmu 0x594 0x0011>,
+ <&apps_smmu 0x596 0x0011>;
+ interconnects = <&aggre2_noc MASTER_CRYPTO_CORE_0 &mc_virt SLAVE_EBI_CH0>;
+ interconnect-names = "memory";
+ };
+
+ crypto: crypto@1dfa000 {
+ compatible = "qcom,sm8250-qce";
+ reg = <0 0x01dfa000 0 0x6000>;
+ dmas = <&cryptobam 4>, <&cryptobam 5>;
+ dma-names = "rx", "tx";
+ iommus = <&apps_smmu 0x584 0x0011>,
+ <&apps_smmu 0x586 0x0011>,
+ <&apps_smmu 0x594 0x0011>,
+ <&apps_smmu 0x596 0x0011>;
+ interconnects = <&aggre2_noc MASTER_CRYPTO_CORE_0 &mc_virt SLAVE_EBI_CH0>;
+ interconnect-names = "memory";
+ };
+
ipa_virt: interconnect@1e00000 {
compatible = "qcom,sm8250-ipa-virt";
reg = <0 0x01e00000 0 0x1000>;
--
2.37.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v7 3/4] arm64: dts: qcom: sm8150: Add dt entries to support crypto engine.
2022-09-21 4:55 [PATCH v7 0/4] ARM: dts + defconfig: Add support for Qualcomm QCE block on new SoCs and in defconfig Bhupesh Sharma
2022-09-21 4:55 ` [PATCH v7 1/4] ARM: dts: qcom: Use new compatibles for crypto nodes Bhupesh Sharma
2022-09-21 4:56 ` [PATCH v7 2/4] arm64: dts: qcom: sm8250: Add dt entries to support crypto engine Bhupesh Sharma
@ 2022-09-21 4:56 ` Bhupesh Sharma
2022-09-21 4:56 ` [PATCH v7 4/4] arm64: defconfig: Enable Qualcomm QCE crypto Bhupesh Sharma
2022-11-07 3:11 ` (subset) [PATCH v7 0/4] ARM: dts + defconfig: Add support for Qualcomm QCE block on new SoCs and in defconfig Bjorn Andersson
4 siblings, 0 replies; 7+ messages in thread
From: Bhupesh Sharma @ 2022-09-21 4:56 UTC (permalink / raw)
To: linux-arm-kernel, linux-arm-msm
Cc: agross, linux-kernel, robh+dt, thara.gopinath, devicetree, robh,
krzysztof.kozlowski, andersson, bhupesh.sharma, bhupesh.linux,
catalin.marinas, will, arnd
Add crypto engine (CE) and CE BAM related nodes and definitions to
'sm8150.dtsi'.
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8150.dtsi | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index cef8c4f4f0ff..6e21352a158c 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -2041,6 +2041,34 @@ ufs_mem_phy_lanes: phy@1d87400 {
};
};
+ cryptobam: dma-controller@1dc4000 {
+ compatible = "qcom,bam-v1.7.0";
+ reg = <0 0x01dc4000 0 0x24000>;
+ interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+ #dma-cells = <1>;
+ qcom,ee = <0>;
+ qcom,controlled-remotely;
+ iommus = <&apps_smmu 0x504 0x0011>,
+ <&apps_smmu 0x506 0x0011>,
+ <&apps_smmu 0x514 0x0011>,
+ <&apps_smmu 0x516 0x0011>;
+ interconnects = <&aggre2_noc MASTER_CRYPTO_CORE_0 &mc_virt SLAVE_EBI_CH0>;
+ interconnect-names = "memory";
+ };
+
+ crypto: crypto@1dfa000 {
+ compatible = "qcom,sm8150-qce";
+ reg = <0 0x01dfa000 0 0x6000>;
+ dmas = <&cryptobam 4>, <&cryptobam 5>;
+ dma-names = "rx", "tx";
+ iommus = <&apps_smmu 0x504 0x0011>,
+ <&apps_smmu 0x506 0x0011>,
+ <&apps_smmu 0x514 0x0011>,
+ <&apps_smmu 0x516 0x0011>;
+ interconnects = <&aggre2_noc MASTER_CRYPTO_CORE_0 &mc_virt SLAVE_EBI_CH0>;
+ interconnect-names = "memory";
+ };
+
ipa_virt: interconnect@1e00000 {
compatible = "qcom,sm8150-ipa-virt";
reg = <0 0x01e00000 0 0x1000>;
--
2.37.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v7 4/4] arm64: defconfig: Enable Qualcomm QCE crypto
2022-09-21 4:55 [PATCH v7 0/4] ARM: dts + defconfig: Add support for Qualcomm QCE block on new SoCs and in defconfig Bhupesh Sharma
` (2 preceding siblings ...)
2022-09-21 4:56 ` [PATCH v7 3/4] arm64: dts: qcom: sm8150: " Bhupesh Sharma
@ 2022-09-21 4:56 ` Bhupesh Sharma
2022-09-21 19:20 ` Krzysztof Kozlowski
2022-11-07 3:11 ` (subset) [PATCH v7 0/4] ARM: dts + defconfig: Add support for Qualcomm QCE block on new SoCs and in defconfig Bjorn Andersson
4 siblings, 1 reply; 7+ messages in thread
From: Bhupesh Sharma @ 2022-09-21 4:56 UTC (permalink / raw)
To: linux-arm-kernel, linux-arm-msm
Cc: agross, linux-kernel, robh+dt, thara.gopinath, devicetree, robh,
krzysztof.kozlowski, andersson, bhupesh.sharma, bhupesh.linux,
catalin.marinas, will, arnd
Now that the QCE crypto block is supported on several
Qualcomm SoCs upstream, enable the same as a module in the
arm64 defconfig.
Cc: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 5a4ba141d15c..46d6c95b8d25 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1321,6 +1321,7 @@ CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_DEV_SUN8I_CE=m
CONFIG_CRYPTO_DEV_FSL_CAAM=m
CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
+CONFIG_CRYPTO_DEV_QCE=m
CONFIG_CRYPTO_DEV_QCOM_RNG=m
CONFIG_CRYPTO_DEV_CCREE=m
CONFIG_CRYPTO_DEV_HISI_SEC2=m
--
2.37.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v7 4/4] arm64: defconfig: Enable Qualcomm QCE crypto
2022-09-21 4:56 ` [PATCH v7 4/4] arm64: defconfig: Enable Qualcomm QCE crypto Bhupesh Sharma
@ 2022-09-21 19:20 ` Krzysztof Kozlowski
0 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-21 19:20 UTC (permalink / raw)
To: Bhupesh Sharma, linux-arm-kernel, linux-arm-msm
Cc: agross, linux-kernel, robh+dt, thara.gopinath, devicetree, robh,
andersson, bhupesh.linux, catalin.marinas, will, arnd
On 21/09/2022 06:56, Bhupesh Sharma wrote:
> Now that the QCE crypto block is supported on several
> Qualcomm SoCs upstream, enable the same as a module in the
> arm64 defconfig.
>
> Cc: Bjorn Andersson <andersson@kernel.org>
> Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: (subset) [PATCH v7 0/4] ARM: dts + defconfig: Add support for Qualcomm QCE block on new SoCs and in defconfig
2022-09-21 4:55 [PATCH v7 0/4] ARM: dts + defconfig: Add support for Qualcomm QCE block on new SoCs and in defconfig Bhupesh Sharma
` (3 preceding siblings ...)
2022-09-21 4:56 ` [PATCH v7 4/4] arm64: defconfig: Enable Qualcomm QCE crypto Bhupesh Sharma
@ 2022-11-07 3:11 ` Bjorn Andersson
4 siblings, 0 replies; 7+ messages in thread
From: Bjorn Andersson @ 2022-11-07 3:11 UTC (permalink / raw)
To: bhupesh.sharma, linux-arm-kernel, linux-arm-msm
Cc: robh, Arnd Bergmann, devicetree, jorcrous, catalin.marinas,
agross, will, robh+dt, linux-kernel, bhupesh.linux,
thara.gopinath, krzysztof.kozlowski
On Wed, 21 Sep 2022 10:25:58 +0530, Bhupesh Sharma wrote:
> Changes since v6:
> =================
> - v6 can be seen here: https://lore.kernel.org/linux-arm-msm/30756e6f-952f-ccf2-b493-e515ba4f0a64@linaro.org/
> - No code changes since v6.
> - As per Krzysztof's suggestion on v6, clubbed the crypto driver and
> dt-bindings changes together. Now the overall v5 patchset into 3
> separate patchsets, one each for the following areas to allow easier
> review and handling from the maintainer:
> arm-msm, crypto and dma
> - This patch targets the arm/arm-msm tree specifically.
> - This patchset is dependent on the crypto + dt-binding patchset, which
> can be seen here: https://lore.kernel.org/linux-arm-msm/20220920114051.1116441-1-bhupesh.sharma@linaro.org/
>
> [...]
Applied, thanks!
[4/4] arm64: defconfig: Enable Qualcomm QCE crypto
commit: e19d0bf25c8119eaf401041c55af4edb5beab90c
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 7+ messages in thread