| Message ID | 20230402100509.1154220-1-bhupesh.sharma@linaro.org |
|---|---|
| Headers | show |
| Series | arm64: qcom: Enable Crypto Engine for a few Qualcomm SoCs | expand |
On Mon, 3 Apr 2023 at 11:06, Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> wrote: > > On 4/2/23 13:05, Bhupesh Sharma wrote: > > Currently the compatible list available in 'qce' dt-bindings does not > > support SM8150 and IPQ4019 SoCs directly which may lead to potential > > 'dtbs_check' error(s). > > > > Fix the same. > > > > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > > --- > > Documentation/devicetree/bindings/crypto/qcom-qce.yaml | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml > > index e375bd981300..90ddf98a6df9 100644 > > --- a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml > > +++ b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml > > @@ -24,6 +24,12 @@ properties: > > deprecated: true > > description: Kept only for ABI backward compatibility > > > > + - items: > > + - enum: > > + - qcom,ipq4019-qce > > + - qcom,sm8150-qce > > + - const: qcom,qce > > + > > - items: > > - enum: > > - qcom,ipq6018-qce > > Two commit tags given for v2 are missing. Cannot get your comment. Please be more descriptive. Thanks, Bhupesh
On 3.04.2023 08:15, Bhupesh Sharma wrote: > On Mon, 3 Apr 2023 at 11:06, Vladimir Zapolskiy > <vladimir.zapolskiy@linaro.org> wrote: >> >> On 4/2/23 13:05, Bhupesh Sharma wrote: >>> Currently the compatible list available in 'qce' dt-bindings does not >>> support SM8150 and IPQ4019 SoCs directly which may lead to potential >>> 'dtbs_check' error(s). >>> >>> Fix the same. >>> >>> Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> >>> --- >>> Documentation/devicetree/bindings/crypto/qcom-qce.yaml | 6 ++++++ >>> 1 file changed, 6 insertions(+) >>> >>> diff --git a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml >>> index e375bd981300..90ddf98a6df9 100644 >>> --- a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml >>> +++ b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml >>> @@ -24,6 +24,12 @@ properties: >>> deprecated: true >>> description: Kept only for ABI backward compatibility >>> >>> + - items: >>> + - enum: >>> + - qcom,ipq4019-qce >>> + - qcom,sm8150-qce >>> + - const: qcom,qce >>> + >>> - items: >>> - enum: >>> - qcom,ipq6018-qce >> >> Two commit tags given for v2 are missing. > > Cannot get your comment. Please be more descriptive. https://lore.kernel.org/linux-arm-msm/333081a2-6b31-3fca-1a95-4273b5a46fb7@linaro.org/ Konrad > > Thanks, > Bhupesh
Hi Bhupesh, On 2.04.23 13:05, Bhupesh Sharma wrote: > Add crypto engine (CE) and CE BAM related nodes and definitions to > 'sm8350.dtsi'. > > Co-developed-by and Signed-off-by: Robert Foss <rfoss@kernel.org> > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8350.dtsi | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi > index 7fbc288eca58..090ee07d1800 100644 > --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi > @@ -1730,6 +1730,28 @@ ufs_mem_phy_lanes: phy@1d87400 { > }; > }; > > + cryptobam: dma-controller@1dc4000 { > + compatible = "qcom,bam-v1.7.4", "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 0x594 0x0011>, > + <&apps_smmu 0x596 0x0011>; > + }; > + > + crypto: crypto@1dfa000 { > + compatible = "qcom,sm8350-qce", "qcom,sm8150-qce", "qcom,qce"; > + reg = <0 0x01dfa000 0 0x6000>; > + dmas = <&cryptobam 4>, <&cryptobam 5>; > + dma-names = "rx", "tx"; > + iommus = <&apps_smmu 0x594 0x0011>, > + <&apps_smmu 0x596 0x0011>; > + interconnects = <&aggre2_noc MASTER_CRYPTO &mc_virt SLAVE_EBI1>; > + interconnect-names = "memory"; We switched to #interconnect-cells = <2> (since commit 4f287e31ff5f), so maybe #include dt-bindings/interconnect/qcom,icc.h and add the tags. BR, Georgi > + }; > + > ipa: ipa@1e40000 { > compatible = "qcom,sm8350-ipa"; >
On Mon, 3 Apr 2023 at 17:46, Georgi Djakov <djakov@kernel.org> wrote: > > Hi Bhupesh, > > On 2.04.23 13:05, Bhupesh Sharma wrote: > > Add crypto engine (CE) and CE BAM related nodes and definitions to > > 'sm8350.dtsi'. > > > > Co-developed-by and Signed-off-by: Robert Foss <rfoss@kernel.org> > > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/sm8350.dtsi | 22 ++++++++++++++++++++++ > > 1 file changed, 22 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi > > index 7fbc288eca58..090ee07d1800 100644 > > --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi > > @@ -1730,6 +1730,28 @@ ufs_mem_phy_lanes: phy@1d87400 { > > }; > > }; > > > > + cryptobam: dma-controller@1dc4000 { > > + compatible = "qcom,bam-v1.7.4", "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 0x594 0x0011>, > > + <&apps_smmu 0x596 0x0011>; > > + }; > > + > > + crypto: crypto@1dfa000 { > > + compatible = "qcom,sm8350-qce", "qcom,sm8150-qce", "qcom,qce"; > > + reg = <0 0x01dfa000 0 0x6000>; > > + dmas = <&cryptobam 4>, <&cryptobam 5>; > > + dma-names = "rx", "tx"; > > + iommus = <&apps_smmu 0x594 0x0011>, > > + <&apps_smmu 0x596 0x0011>; > > + interconnects = <&aggre2_noc MASTER_CRYPTO &mc_virt SLAVE_EBI1>; > > + interconnect-names = "memory"; > > We switched to #interconnect-cells = <2> (since commit 4f287e31ff5f), so maybe #include > dt-bindings/interconnect/qcom,icc.h and add the tags. Sure Georgi, I will fix it in the next version. Thanks, Bhupesh
On Sun, 02 Apr 2023 15:34:59 +0530, Bhupesh Sharma wrote: > Add new compatible for BAM DMA engine version v1.7.4 which is > found on Qualcomm SM6115 and QCM2290 SoCs. Since its very similar > to v1.7.0 used on SM8150 like SoCs, mark the comptible scheme > accordingly. > > While at it, also update qcom,bam-dma bindings to add comments > which describe the BAM DMA versions used in SM8150 and SM8250 SoCs. > This provides an easy reference for identifying the actual BAM DMA > version available on Qualcomm SoCs. > > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > --- > .../devicetree/bindings/dma/qcom,bam-dma.yaml | 20 ++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) > Acked-by: Rob Herring <robh@kernel.org>
Changes since v4: ----------------- - v4 can be viewed here: https://lore.kernel.org/linux-arm-msm/20230331164323.729093-1-bhupesh.sharma@linaro.org/ - Collected R-Bs from Konrad for a couple of patches sent in v4. - Fixed incorrect email IDs for a couple of patches sent in v3, which I used for some patches created on a different work machine. - No functional changes since v3. Changes since v3: ----------------- - v3 can be viewed here: https://lore.kernel.org/linux-arm-msm/20230328092815.292665-1-bhupesh.sharma@linaro.org/ - Collected Acks from Krzysztof for a couple of patches sent in v3. - Fixed review comments from Krzysztof regarding DMA binding document and also added a couple of new patches which are required to fix the 'dtbs_check' errors highlighted after this fix. Changes since v2: ----------------- - v2 can be viewed here: https://lore.kernel.org/linux-arm-msm/20230322114519.3412469-1-bhupesh.sharma@linaro.org/ - No functional change since v2. As the sdm845 patch from v1 was accepted in linux-next, dropped it from this version. Changes since v1: ----------------- - v1 can be viewed here: https://lore.kernel.org/linux-arm-msm/20230321190118.3327360-1-bhupesh.sharma@linaro.org/ - Folded the BAM DMA dt-binding change. (sent earlier as: https://lore.kernel.org/linux-arm-msm/20230321184811.3325725-1-bhupesh.sharma@linaro.org/) - Folded the QCE dt-binding change. (sent earlier as: https://lore.kernel.org/linux-arm-msm/20230320073816.3012198-1-bhupesh.sharma@linaro.org/) - Folded Neil's SM8450 dts patch in this series. - Addressed review comments from Rob, Stephan and Konrad. - Collected Konrad's R-B for [PATCH 5/9]. This patchset enables Crypto Engine support for Qualcomm SoCs like SM6115, SM8150, SM8250, SM8350 and SM8450. Note that: - SM8250 crypto engine patch utilizes the work already done by myself and Vladimir. - SM8350 crypto engine patch utilizes the work already done by Robert. - SM8450 crypto engine patch utilizes the work already done by Neil. Also this patchset is rebased on linux-next/master. Bhupesh Sharma (10): dt-bindings: dma: Add support for SM6115 and QCM2290 SoCs dt-bindings: dma: Increase iommu maxItems for BAM DMA arm64: dts: qcom: sdm8550: Fix the BAM DMA engine compatible string arm64: dts: qcom: sdm845: Fix the slimbam DMA engine compatible string dt-bindings: qcom-qce: Fix compatible combinations for SM8150 and IPQ4019 SoCs dt-bindings: qcom-qce: Add compatibles for SM6115 and QCM2290 arm64: dts: qcom: sm6115: Add Crypto Engine support arm64: dts: qcom: sm8150: Add Crypto Engine support arm64: dts: qcom: sm8250: Add Crypto Engine support arm64: dts: qcom: sm8350: Add Crypto Engine support Neil Armstrong (1): arm64: dts: qcom: sm8450: add crypto nodes .../devicetree/bindings/crypto/qcom-qce.yaml | 8 ++++++ .../devicetree/bindings/dma/qcom,bam-dma.yaml | 22 +++++++++------ arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm6115.dtsi | 22 +++++++++++++++ arch/arm64/boot/dts/qcom/sm8150.dtsi | 22 +++++++++++++++ arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 +++++++++++++++ arch/arm64/boot/dts/qcom/sm8350.dtsi | 22 +++++++++++++++ arch/arm64/boot/dts/qcom/sm8450.dtsi | 28 +++++++++++++++++++ arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 9 files changed, 140 insertions(+), 10 deletions(-)