Skip to content

Commit aebe916

Browse files
committed
Merge tag 'qcom-drivers-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers
A few more Qualcomm driver updates for v6.4 This introduces a new binding and a dedicated driver for the Qualcomm Inline-Crypto-Engine (ICE), in order to support a single shared instance between SDHCI and UFS, found in recent platforms. RSC version check is updated to support minor revisions of v3 of the ip block, the SMD-RPM interface is transitioned to GFP_ATOMIC to avoid the shrinker to kick in underneath the GPU and QCM2290 support is added to the SCM binding. * tag 'qcom-drivers-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: dt-bindings: crypto: Add Qualcomm Inline Crypto Engine soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver dt-bindings: firmware: document Qualcomm QCM2290 SCM soc: qcom: rpmh-rsc: Support RSC v3 minor versions soc: qcom: smd-rpm: Use GFP_ATOMIC in write path Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 3ac02aa + f6ff91a commit aebe916

File tree

8 files changed

+455
-2
lines changed

8 files changed

+455
-2
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/crypto/qcom,inline-crypto-engine.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Technologies, Inc. (QTI) Inline Crypto Engine
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
12+
properties:
13+
compatible:
14+
items:
15+
- enum:
16+
- qcom,sm8550-inline-crypto-engine
17+
- const: qcom,inline-crypto-engine
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
maxItems: 1
24+
25+
required:
26+
- compatible
27+
- reg
28+
- clocks
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
#include <dt-bindings/clock/qcom,sm8550-gcc.h>
35+
36+
crypto@1d88000 {
37+
compatible = "qcom,sm8550-inline-crypto-engine",
38+
"qcom,inline-crypto-engine";
39+
reg = <0x01d88000 0x8000>;
40+
clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
41+
};
42+
...

Documentation/devicetree/bindings/firmware/qcom,scm.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ properties:
4040
- qcom,scm-msm8994
4141
- qcom,scm-msm8996
4242
- qcom,scm-msm8998
43+
- qcom,scm-qcm2290
4344
- qcom,scm-qdu1000
4445
- qcom,scm-sa8775p
4546
- qcom,scm-sc7180
@@ -110,6 +111,7 @@ allOf:
110111
- qcom,scm-msm8960
111112
- qcom,scm-msm8974
112113
- qcom,scm-msm8976
114+
- qcom,scm-qcm2290
113115
- qcom,scm-sm6375
114116
then:
115117
required:
@@ -128,6 +130,7 @@ allOf:
128130
- qcom,scm-apq8064
129131
- qcom,scm-msm8660
130132
- qcom,scm-msm8960
133+
- qcom,scm-qcm2290
131134
- qcom,scm-sm6375
132135
then:
133136
properties:

drivers/soc/qcom/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,4 +275,8 @@ config QCOM_ICC_BWMON
275275
the fixed bandwidth votes from cpufreq (CPU nodes) thus achieve high
276276
memory throughput even with lower CPU frequencies.
277277

278+
config QCOM_INLINE_CRYPTO_ENGINE
279+
tristate
280+
select QCOM_SCM
281+
278282
endmenu

drivers/soc/qcom/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
3232
obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o
3333
obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) += kryo-l2-accessors.o
3434
obj-$(CONFIG_QCOM_ICC_BWMON) += icc-bwmon.o
35+
obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += ice.o

0 commit comments

Comments
 (0)