* [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema
@ 2022-06-26 11:46 David Heidelberg
2022-06-26 11:46 ` [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings David Heidelberg
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: David Heidelberg @ 2022-06-26 11:46 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski
Cc: ~okias/devicetree, David Heidelberg, Robert Marko,
Guru Das Srinagesh, linux-arm-msm, devicetree, linux-kernel
First device specific compatible, then general one.
Cc: Robert Marko <robimarko@gmail.com>
Cc: Guru Das Srinagesh <quic_gurus@quicinc.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
arch/arm/boot/dts/qcom-apq8064.dtsi | 2 +-
arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +-
arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +-
arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 9120d10dcd9e..67e625e56e04 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -309,7 +309,7 @@ dsps_smsm: dsps@4 {
firmware {
scm {
- compatible = "qcom,scm-apq8064";
+ compatible = "qcom,scm-apq8064", "qcom,scm";
clocks = <&rpmcc RPM_DAYTONA_FABRIC_CLK>;
clock-names = "core";
diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
index cb01faa23eb7..123c0c32d1df 100644
--- a/arch/arm/boot/dts/qcom-apq8084.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
@@ -95,7 +95,7 @@ memory {
firmware {
scm {
- compatible = "qcom,scm";
+ compatible = "qcom,scm-apq8084", "qcom,scm";
clocks = <&gcc GCC_CE1_CLK> , <&gcc GCC_CE1_AXI_CLK>, <&gcc GCC_CE1_AHB_CLK>;
clock-names = "core", "bus", "iface";
};
diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi
index c5da723f7674..4faf854aab9c 100644
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -156,7 +156,7 @@ xo: xo {
firmware {
scm {
- compatible = "qcom,scm-ipq4019";
+ compatible = "qcom,scm-ipq4019", "qcom,scm";
};
};
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 804d094c4d79..4cbd8d91f7d0 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -96,7 +96,7 @@ CPU_SPC: spc {
firmware {
scm {
- compatible = "qcom,scm";
+ compatible = "qcom,scm-msm8974", "qcom,scm";
clocks = <&gcc GCC_CE1_CLK>, <&gcc GCC_CE1_AXI_CLK>, <&gcc GCC_CE1_AHB_CLK>;
clock-names = "core", "bus", "iface";
};
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings 2022-06-26 11:46 [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema David Heidelberg @ 2022-06-26 11:46 ` David Heidelberg 2022-06-26 16:46 ` Krzysztof Kozlowski 2022-06-27 16:11 ` Guru Das Srinagesh 2022-06-26 11:46 ` [PATCH v3 3/3] dt-bindings: firmware: convert Qualcomm SCM binding to the yaml David Heidelberg 2022-06-26 16:46 ` [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema Krzysztof Kozlowski 2 siblings, 2 replies; 9+ messages in thread From: David Heidelberg @ 2022-06-26 11:46 UTC (permalink / raw) To: Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski Cc: ~okias/devicetree, David Heidelberg, Robert Marko, Guru Das Srinagesh, linux-arm-msm, devicetree, linux-kernel Follow scheme where device specific compatible is first, then general compatible string. Cc: Robert Marko <robimarko@gmail.com> Cc: Guru Das Srinagesh <quic_gurus@quicinc.com> Signed-off-by: David Heidelberg <david@ixit.cz> --- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi index 748575ed1490..19228e4f5313 100644 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi @@ -125,7 +125,7 @@ opp-1800000000 { firmware { scm { - compatible = "qcom,scm"; + compatible = "qcom,scm-ipq6018", "qcom,scm"; }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi index ffc3ec2cd3bc..6fd361be0fe2 100644 --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi @@ -215,7 +215,7 @@ L2_1: l2-cache_1 { firmware { scm: scm { - compatible = "qcom,scm-msm8953"; + compatible = "qcom,scm-msm8953", "qcom,scm"; clocks = <&gcc GCC_CRYPTO_CLK>, <&gcc GCC_CRYPTO_AXI_CLK>, <&gcc GCC_CRYPTO_AHB_CLK>; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index ab95ec4a7491..7c854c9c2517 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -357,7 +357,7 @@ opp-2150400000 { firmware { scm { - compatible = "qcom,scm-msm8996"; + compatible = "qcom,scm-msm8996", "qcom,scm"; qcom,dload-mode = <&tcsr 0x13000>; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index d0760e6ec942..fc4a490add48 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -628,7 +628,7 @@ cpu7_opp20: opp-2841600000 { firmware { scm: scm { - compatible = "qcom,scm"; + compatible = "qcom,scm-sm8250", "qcom,scm"; #reset-cells = <1>; }; }; -- 2.35.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings 2022-06-26 11:46 ` [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings David Heidelberg @ 2022-06-26 16:46 ` Krzysztof Kozlowski 2022-06-27 16:11 ` Guru Das Srinagesh 1 sibling, 0 replies; 9+ messages in thread From: Krzysztof Kozlowski @ 2022-06-26 16:46 UTC (permalink / raw) To: David Heidelberg, Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski Cc: ~okias/devicetree, Robert Marko, Guru Das Srinagesh, linux-arm-msm, devicetree, linux-kernel On 26/06/2022 13:46, David Heidelberg wrote: > Follow scheme where device specific compatible is first, > then general compatible string. > > Cc: Robert Marko <robimarko@gmail.com> > Cc: Guru Das Srinagesh <quic_gurus@quicinc.com> > Signed-off-by: David Heidelberg <david@ixit.cz> > --- > arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- > arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- > arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings 2022-06-26 11:46 ` [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings David Heidelberg 2022-06-26 16:46 ` Krzysztof Kozlowski @ 2022-06-27 16:11 ` Guru Das Srinagesh 1 sibling, 0 replies; 9+ messages in thread From: Guru Das Srinagesh @ 2022-06-27 16:11 UTC (permalink / raw) To: David Heidelberg Cc: Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, ~okias/devicetree, Robert Marko, linux-arm-msm, devicetree, linux-kernel On Jun 26 2022 13:46, David Heidelberg wrote: > Follow scheme where device specific compatible is first, > then general compatible string. > > Cc: Robert Marko <robimarko@gmail.com> > Cc: Guru Das Srinagesh <quic_gurus@quicinc.com> > Signed-off-by: David Heidelberg <david@ixit.cz> Reviewed-by: Guru Das Srinagesh <quic_gurus@quicinc.com> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 3/3] dt-bindings: firmware: convert Qualcomm SCM binding to the yaml 2022-06-26 11:46 [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema David Heidelberg 2022-06-26 11:46 ` [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings David Heidelberg @ 2022-06-26 11:46 ` David Heidelberg 2022-06-26 16:45 ` Krzysztof Kozlowski 2022-06-26 16:46 ` [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema Krzysztof Kozlowski 2 siblings, 1 reply; 9+ messages in thread From: David Heidelberg @ 2022-06-26 11:46 UTC (permalink / raw) To: Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, Robert Marko, Das Srinagesh Cc: ~okias/devicetree, David Heidelberg, linux-arm-msm, devicetree, linux-kernel Convert Qualcomm SCM firmware binding to the yaml format. This commit also: - adds qcom,scm-mdm9607 into list which has only core clock - adds qcom,scm-sm6125, qcom,scm-ipq6018 - #reset-cells, because the property is already used Cc: Robert Marko <robimarko@gmail.com> Cc: Guru Das Srinagesh <quic_gurus@quicinc.com> Signed-off-by: David Heidelberg <david@ixit.cz> --- v3: - add preceding patches for ARM and arm64 adding missing compatible strings - extended with missing compatible strings - added two additional maintainers, see https://lkml.org/lkml/2022/6/23/1969 v2: - changed maintainer to Bjorn - document #reset-cells .../devicetree/bindings/firmware/qcom,scm.txt | 57 -------- .../bindings/firmware/qcom,scm.yaml | 131 ++++++++++++++++++ 2 files changed, 131 insertions(+), 57 deletions(-) delete mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.yaml diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt deleted file mode 100644 index 0f4e5ab26477..000000000000 --- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt +++ /dev/null @@ -1,57 +0,0 @@ -QCOM Secure Channel Manager (SCM) - -Qualcomm processors include an interface to communicate to the secure firmware. -This interface allows for clients to request different types of actions. These -can include CPU power up/down, HDCP requests, loading of firmware, and other -assorted actions. - -Required properties: -- compatible: must contain one of the following: - * "qcom,scm-apq8064" - * "qcom,scm-apq8084" - * "qcom,scm-ipq4019" - * "qcom,scm-ipq806x" - * "qcom,scm-ipq8074" - * "qcom,scm-mdm9607" - * "qcom,scm-msm8226" - * "qcom,scm-msm8660" - * "qcom,scm-msm8916" - * "qcom,scm-msm8953" - * "qcom,scm-msm8960" - * "qcom,scm-msm8974" - * "qcom,scm-msm8976" - * "qcom,scm-msm8994" - * "qcom,scm-msm8996" - * "qcom,scm-msm8998" - * "qcom,scm-sc7180" - * "qcom,scm-sc7280" - * "qcom,scm-sdm845" - * "qcom,scm-sdx55" - * "qcom,scm-sm6350" - * "qcom,scm-sm8150" - * "qcom,scm-sm8250" - * "qcom,scm-sm8350" - * "qcom,scm-sm8450" - and: - * "qcom,scm" -- clocks: Specifies clocks needed by the SCM interface, if any: - * core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660" and - "qcom,scm-msm8960" - * core, iface and bus clocks required for "qcom,scm-apq8084", - "qcom,scm-msm8916", "qcom,scm-msm8953", "qcom,scm-msm8974" and "qcom,scm-msm8976" -- clock-names: Must contain "core" for the core clock, "iface" for the interface - clock and "bus" for the bus clock per the requirements of the compatible. -- qcom,dload-mode: phandle to the TCSR hardware block and offset of the - download mode control register (optional) - -Example for MSM8916: - - firmware { - scm { - compatible = "qcom,msm8916", "qcom,scm"; - clocks = <&gcc GCC_CRYPTO_CLK> , - <&gcc GCC_CRYPTO_AXI_CLK>, - <&gcc GCC_CRYPTO_AHB_CLK>; - clock-names = "core", "bus", "iface"; - }; - }; diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.yaml b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml new file mode 100644 index 000000000000..17d06e75b82b --- /dev/null +++ b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml @@ -0,0 +1,131 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/firmware/qcom,scm.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: QCOM Secure Channel Manager (SCM) + +description: | + Qualcomm processors include an interface to communicate to the secure firmware. + This interface allows for clients to request different types of actions. + These can include CPU power up/down, HDCP requests, loading of firmware, + and other assorted actions. + +maintainers: + - Bjorn Andersson <bjorn.andersson@linaro.org> + - Robert Marko <robimarko@gmail.com> + - Guru Das Srinagesh <quic_gurus@quicinc.com> + +properties: + compatible: + items: + - enum: + - qcom,scm-apq8064 + - qcom,scm-apq8084 + - qcom,scm-ipq4019 + - qcom,scm-ipq6018 + - qcom,scm-ipq806x + - qcom,scm-ipq8074 + - qcom,scm-mdm9607 + - qcom,scm-msm8226 + - qcom,scm-msm8660 + - qcom,scm-msm8916 + - qcom,scm-msm8953 + - qcom,scm-msm8960 + - qcom,scm-msm8974 + - qcom,scm-msm8976 + - qcom,scm-msm8994 + - qcom,scm-msm8996 + - qcom,scm-msm8998 + - qcom,scm-sc7180 + - qcom,scm-sc7280 + - qcom,scm-sdm845 + - qcom,scm-sdx55 + - qcom,scm-sm6125 + - qcom,scm-sm6350 + - qcom,scm-sm8150 + - qcom,scm-sm8250 + - qcom,scm-sm8350 + - qcom,scm-sm8450 + - qcom,scm-qcs404 + - const: qcom,scm + + clocks: + minItems: 1 + maxItems: 3 + + clock-names: true + + '#reset-cells': + const: 1 + + qcom,dload-mode: + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to TCSR hardware block + - description: offset of the download mode control register + description: + Should be phandle/offset pair. + +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,scm-apq8064 + - qcom,scm-mdm9607 + - qcom,scm-msm8660 + - qcom,scm-msm8960 + then: + properties: + clock-names: + items: + - const: core + + required: + - clocks + - clock-names + + - if: + properties: + compatible: + contains: + enum: + - qcom,scm-apq8084 + - qcom,scm-msm8916 + - qcom,scm-msm8953 + - qcom,scm-msm8974 + - qcom,scm-msm8976 + then: + properties: + clock-names: + items: + - const: core + - const: bus + - const: iface + + required: + - clocks + - clock-names + +required: + - compatible + +additionalProperties: false + +examples: + - | + include <dt-bindings/clock/qcom,gcc-msm8916.h> + + firmware { + scm { + compatible = "qcom,msm8916", "qcom,scm"; + clocks = <&gcc GCC_CRYPTO_CLK>, + <&gcc GCC_CRYPTO_AXI_CLK>, + <&gcc GCC_CRYPTO_AHB_CLK>; + clock-names = "core", "bus", "iface"; + }; + }; -- 2.35.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] dt-bindings: firmware: convert Qualcomm SCM binding to the yaml 2022-06-26 11:46 ` [PATCH v3 3/3] dt-bindings: firmware: convert Qualcomm SCM binding to the yaml David Heidelberg @ 2022-06-26 16:45 ` Krzysztof Kozlowski 2022-06-26 17:13 ` David Heidelberg 0 siblings, 1 reply; 9+ messages in thread From: Krzysztof Kozlowski @ 2022-06-26 16:45 UTC (permalink / raw) To: David Heidelberg, Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, Robert Marko, Das Srinagesh Cc: ~okias/devicetree, linux-arm-msm, devicetree, linux-kernel On 26/06/2022 13:46, David Heidelberg wrote: > Convert Qualcomm SCM firmware binding to the yaml format. > > This commit also: > - adds qcom,scm-mdm9607 into list which has only core clock > - adds qcom,scm-sm6125, qcom,scm-ipq6018 > - #reset-cells, because the property is already used > > Cc: Robert Marko <robimarko@gmail.com> > Cc: Guru Das Srinagesh <quic_gurus@quicinc.com> > Signed-off-by: David Heidelberg <david@ixit.cz> > --- > v3: > - add preceding patches for ARM and arm64 adding missing compatible strings > - extended with missing compatible strings > - added two additional maintainers, see https://lkml.org/lkml/2022/6/23/1969 > v2: > - changed maintainer to Bjorn > - document #reset-cells > > .../devicetree/bindings/firmware/qcom,scm.txt | 57 -------- > .../bindings/firmware/qcom,scm.yaml | 131 ++++++++++++++++++ > 2 files changed, 131 insertions(+), 57 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt > create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.yaml > > diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt > deleted file mode 100644 > index 0f4e5ab26477..000000000000 > --- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt > +++ /dev/null > @@ -1,57 +0,0 @@ > -QCOM Secure Channel Manager (SCM) > - > -Qualcomm processors include an interface to communicate to the secure firmware. > -This interface allows for clients to request different types of actions. These > -can include CPU power up/down, HDCP requests, loading of firmware, and other > -assorted actions. > - > -Required properties: > -- compatible: must contain one of the following: > - * "qcom,scm-apq8064" > - * "qcom,scm-apq8084" > - * "qcom,scm-ipq4019" > - * "qcom,scm-ipq806x" > - * "qcom,scm-ipq8074" > - * "qcom,scm-mdm9607" > - * "qcom,scm-msm8226" > - * "qcom,scm-msm8660" > - * "qcom,scm-msm8916" > - * "qcom,scm-msm8953" > - * "qcom,scm-msm8960" > - * "qcom,scm-msm8974" > - * "qcom,scm-msm8976" > - * "qcom,scm-msm8994" > - * "qcom,scm-msm8996" > - * "qcom,scm-msm8998" > - * "qcom,scm-sc7180" > - * "qcom,scm-sc7280" > - * "qcom,scm-sdm845" > - * "qcom,scm-sdx55" > - * "qcom,scm-sm6350" > - * "qcom,scm-sm8150" > - * "qcom,scm-sm8250" > - * "qcom,scm-sm8350" > - * "qcom,scm-sm8450" > - and: > - * "qcom,scm" > -- clocks: Specifies clocks needed by the SCM interface, if any: > - * core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660" and > - "qcom,scm-msm8960" > - * core, iface and bus clocks required for "qcom,scm-apq8084", > - "qcom,scm-msm8916", "qcom,scm-msm8953", "qcom,scm-msm8974" and "qcom,scm-msm8976" > -- clock-names: Must contain "core" for the core clock, "iface" for the interface > - clock and "bus" for the bus clock per the requirements of the compatible. > -- qcom,dload-mode: phandle to the TCSR hardware block and offset of the > - download mode control register (optional) > - > -Example for MSM8916: > - > - firmware { > - scm { > - compatible = "qcom,msm8916", "qcom,scm"; > - clocks = <&gcc GCC_CRYPTO_CLK> , > - <&gcc GCC_CRYPTO_AXI_CLK>, > - <&gcc GCC_CRYPTO_AHB_CLK>; > - clock-names = "core", "bus", "iface"; > - }; > - }; > diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.yaml b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml > new file mode 100644 > index 000000000000..17d06e75b82b > --- /dev/null > +++ b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml > @@ -0,0 +1,131 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/firmware/qcom,scm.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" No quotes here. > + > +title: QCOM Secure Channel Manager (SCM) > + > +description: | > + Qualcomm processors include an interface to communicate to the secure firmware. > + This interface allows for clients to request different types of actions. > + These can include CPU power up/down, HDCP requests, loading of firmware, > + and other assorted actions. > + > +maintainers: > + - Bjorn Andersson <bjorn.andersson@linaro.org> > + - Robert Marko <robimarko@gmail.com> > + - Guru Das Srinagesh <quic_gurus@quicinc.com> > + > +properties: > + compatible: > + items: > + - enum: > + - qcom,scm-apq8064 > + - qcom,scm-apq8084 > + - qcom,scm-ipq4019 > + - qcom,scm-ipq6018 > + - qcom,scm-ipq806x > + - qcom,scm-ipq8074 > + - qcom,scm-mdm9607 > + - qcom,scm-msm8226 > + - qcom,scm-msm8660 > + - qcom,scm-msm8916 > + - qcom,scm-msm8953 > + - qcom,scm-msm8960 > + - qcom,scm-msm8974 > + - qcom,scm-msm8976 > + - qcom,scm-msm8994 > + - qcom,scm-msm8996 > + - qcom,scm-msm8998 > + - qcom,scm-sc7180 > + - qcom,scm-sc7280 > + - qcom,scm-sdm845 > + - qcom,scm-sdx55 > + - qcom,scm-sm6125 > + - qcom,scm-sm6350 > + - qcom,scm-sm8150 > + - qcom,scm-sm8250 > + - qcom,scm-sm8350 > + - qcom,scm-sm8450 > + - qcom,scm-qcs404 > + - const: qcom,scm > + > + clocks: > + minItems: 1 > + maxItems: 3 > + > + clock-names: true You should have constraints here - min/maxItems. > + > + '#reset-cells': > + const: 1 > + > + qcom,dload-mode: > + $ref: /schemas/types.yaml#/definitions/phandle-array > + items: > + - items: > + - description: phandle to TCSR hardware block > + - description: offset of the download mode control register > + description: > + Should be phandle/offset pair. This description is not helpful. Should be something closer to "TCSR hardware block". > + > +allOf: > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,scm-apq8064 > + - qcom,scm-mdm9607 > + - qcom,scm-msm8660 > + - qcom,scm-msm8960 > + then: > + properties: > + clock-names: > + items: > + - const: core Missing constraints (maxItems:2) for clocks. > + > + required: > + - clocks > + - clock-names > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,scm-apq8084 > + - qcom,scm-msm8916 > + - qcom,scm-msm8953 > + - qcom,scm-msm8974 > + - qcom,scm-msm8976 > + then: > + properties: > + clock-names: > + items: > + - const: core > + - const: bus > + - const: iface Missing constraints for clocks. > + > + required: > + - clocks > + - clock-names > + > +required: > + - compatible > + > +additionalProperties: false > + Best regards, Krzysztof ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] dt-bindings: firmware: convert Qualcomm SCM binding to the yaml 2022-06-26 16:45 ` Krzysztof Kozlowski @ 2022-06-26 17:13 ` David Heidelberg 2022-06-26 18:28 ` Krzysztof Kozlowski 0 siblings, 1 reply; 9+ messages in thread From: David Heidelberg @ 2022-06-26 17:13 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: ~okias/devicetree, linux-arm-msm, devicetree, linux-kernel, Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, Das Srinagesh, Robert Marko On 26/06/2022 18:45, Krzysztof Kozlowski wrote: > On 26/06/2022 13:46, David Heidelberg wrote: >> Convert Qualcomm SCM firmware binding to the yaml format. >> >> This commit also: >> - adds qcom,scm-mdm9607 into list which has only core clock >> - adds qcom,scm-sm6125, qcom,scm-ipq6018 >> - #reset-cells, because the property is already used >> >> Cc: Robert Marko <robimarko@gmail.com> >> Cc: Guru Das Srinagesh <quic_gurus@quicinc.com> >> Signed-off-by: David Heidelberg <david@ixit.cz> >> --- >> v3: >> - add preceding patches for ARM and arm64 adding missing compatible strings >> - extended with missing compatible strings >> - added two additional maintainers, see https://lkml.org/lkml/2022/6/23/1969 >> v2: >> - changed maintainer to Bjorn >> - document #reset-cells >> >> .../devicetree/bindings/firmware/qcom,scm.txt | 57 -------- >> .../bindings/firmware/qcom,scm.yaml | 131 ++++++++++++++++++ >> 2 files changed, 131 insertions(+), 57 deletions(-) >> delete mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt >> create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.yaml >> >> diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt >> deleted file mode 100644 >> index 0f4e5ab26477..000000000000 >> --- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt >> +++ /dev/null >> @@ -1,57 +0,0 @@ >> -QCOM Secure Channel Manager (SCM) >> - >> -Qualcomm processors include an interface to communicate to the secure firmware. >> -This interface allows for clients to request different types of actions. These >> -can include CPU power up/down, HDCP requests, loading of firmware, and other >> -assorted actions. >> - >> -Required properties: >> -- compatible: must contain one of the following: >> - * "qcom,scm-apq8064" >> - * "qcom,scm-apq8084" >> - * "qcom,scm-ipq4019" >> - * "qcom,scm-ipq806x" >> - * "qcom,scm-ipq8074" >> - * "qcom,scm-mdm9607" >> - * "qcom,scm-msm8226" >> - * "qcom,scm-msm8660" >> - * "qcom,scm-msm8916" >> - * "qcom,scm-msm8953" >> - * "qcom,scm-msm8960" >> - * "qcom,scm-msm8974" >> - * "qcom,scm-msm8976" >> - * "qcom,scm-msm8994" >> - * "qcom,scm-msm8996" >> - * "qcom,scm-msm8998" >> - * "qcom,scm-sc7180" >> - * "qcom,scm-sc7280" >> - * "qcom,scm-sdm845" >> - * "qcom,scm-sdx55" >> - * "qcom,scm-sm6350" >> - * "qcom,scm-sm8150" >> - * "qcom,scm-sm8250" >> - * "qcom,scm-sm8350" >> - * "qcom,scm-sm8450" >> - and: >> - * "qcom,scm" >> -- clocks: Specifies clocks needed by the SCM interface, if any: >> - * core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660" and >> - "qcom,scm-msm8960" >> - * core, iface and bus clocks required for "qcom,scm-apq8084", >> - "qcom,scm-msm8916", "qcom,scm-msm8953", "qcom,scm-msm8974" and "qcom,scm-msm8976" >> -- clock-names: Must contain "core" for the core clock, "iface" for the interface >> - clock and "bus" for the bus clock per the requirements of the compatible. >> -- qcom,dload-mode: phandle to the TCSR hardware block and offset of the >> - download mode control register (optional) >> - >> -Example for MSM8916: >> - >> - firmware { >> - scm { >> - compatible = "qcom,msm8916", "qcom,scm"; >> - clocks = <&gcc GCC_CRYPTO_CLK> , >> - <&gcc GCC_CRYPTO_AXI_CLK>, >> - <&gcc GCC_CRYPTO_AHB_CLK>; >> - clock-names = "core", "bus", "iface"; >> - }; >> - }; >> diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.yaml b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml >> new file mode 100644 >> index 000000000000..17d06e75b82b >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml >> @@ -0,0 +1,131 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: "http://devicetree.org/schemas/firmware/qcom,scm.yaml#" >> +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > No quotes here. > >> + >> +title: QCOM Secure Channel Manager (SCM) >> + >> +description: | >> + Qualcomm processors include an interface to communicate to the secure firmware. >> + This interface allows for clients to request different types of actions. >> + These can include CPU power up/down, HDCP requests, loading of firmware, >> + and other assorted actions. >> + >> +maintainers: >> + - Bjorn Andersson <bjorn.andersson@linaro.org> >> + - Robert Marko <robimarko@gmail.com> >> + - Guru Das Srinagesh <quic_gurus@quicinc.com> >> + >> +properties: >> + compatible: >> + items: >> + - enum: >> + - qcom,scm-apq8064 >> + - qcom,scm-apq8084 >> + - qcom,scm-ipq4019 >> + - qcom,scm-ipq6018 >> + - qcom,scm-ipq806x >> + - qcom,scm-ipq8074 >> + - qcom,scm-mdm9607 >> + - qcom,scm-msm8226 >> + - qcom,scm-msm8660 >> + - qcom,scm-msm8916 >> + - qcom,scm-msm8953 >> + - qcom,scm-msm8960 >> + - qcom,scm-msm8974 >> + - qcom,scm-msm8976 >> + - qcom,scm-msm8994 >> + - qcom,scm-msm8996 >> + - qcom,scm-msm8998 >> + - qcom,scm-sc7180 >> + - qcom,scm-sc7280 >> + - qcom,scm-sdm845 >> + - qcom,scm-sdx55 >> + - qcom,scm-sm6125 >> + - qcom,scm-sm6350 >> + - qcom,scm-sm8150 >> + - qcom,scm-sm8250 >> + - qcom,scm-sm8350 >> + - qcom,scm-sm8450 >> + - qcom,scm-qcs404 >> + - const: qcom,scm >> + >> + clocks: >> + minItems: 1 >> + maxItems: 3 >> + >> + clock-names: true > You should have constraints here - min/maxItems. > >> + >> + '#reset-cells': >> + const: 1 >> + >> + qcom,dload-mode: >> + $ref: /schemas/types.yaml#/definitions/phandle-array >> + items: >> + - items: >> + - description: phandle to TCSR hardware block >> + - description: offset of the download mode control register >> + description: >> + Should be phandle/offset pair. > This description is not helpful. Should be something closer to "TCSR > hardware block". > >> + >> +allOf: >> + - if: >> + properties: >> + compatible: >> + contains: >> + enum: >> + - qcom,scm-apq8064 >> + - qcom,scm-mdm9607 >> + - qcom,scm-msm8660 >> + - qcom,scm-msm8960 >> + then: >> + properties: >> + clock-names: >> + items: >> + - const: core > Missing constraints (maxItems:2) for clocks. Why 2? I would put `maxItems: 1` there > >> + >> + required: >> + - clocks >> + - clock-names >> + >> + - if: >> + properties: >> + compatible: >> + contains: >> + enum: >> + - qcom,scm-apq8084 >> + - qcom,scm-msm8916 >> + - qcom,scm-msm8953 >> + - qcom,scm-msm8974 >> + - qcom,scm-msm8976 >> + then: >> + properties: >> + clock-names: >> + items: >> + - const: core >> + - const: bus >> + - const: iface > Missing constraints for clocks. > >> + >> + required: >> + - clocks >> + - clock-names >> + >> +required: >> + - compatible >> + >> +additionalProperties: false >> + > Best regards, > Krzysztof -- David Heidelberg Consultant Software Engineer Matrix: @okias:matrix.org ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] dt-bindings: firmware: convert Qualcomm SCM binding to the yaml 2022-06-26 17:13 ` David Heidelberg @ 2022-06-26 18:28 ` Krzysztof Kozlowski 0 siblings, 0 replies; 9+ messages in thread From: Krzysztof Kozlowski @ 2022-06-26 18:28 UTC (permalink / raw) To: David Heidelberg Cc: ~okias/devicetree, linux-arm-msm, devicetree, linux-kernel, Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, Das Srinagesh, Robert Marko On 26/06/2022 19:13, David Heidelberg wrote: > On 26/06/2022 18:45, Krzysztof Kozlowski wrote: >> On 26/06/2022 13:46, David Heidelberg wrote: >>> Convert Qualcomm SCM firmware binding to the yaml format. >>> >>> This commit also: >>> - adds qcom,scm-mdm9607 into list which has only core clock >>> - adds qcom,scm-sm6125, qcom,scm-ipq6018 >>> - #reset-cells, because the property is already used >>> >>> Cc: Robert Marko <robimarko@gmail.com> >>> Cc: Guru Das Srinagesh <quic_gurus@quicinc.com> >>> Signed-off-by: David Heidelberg <david@ixit.cz> >>> --- >>> v3: >>> - add preceding patches for ARM and arm64 adding missing compatible strings >>> - extended with missing compatible strings >>> - added two additional maintainers, see https://lkml.org/lkml/2022/6/23/1969 >>> v2: >>> - changed maintainer to Bjorn >>> - document #reset-cells >>> >>> .../devicetree/bindings/firmware/qcom,scm.txt | 57 -------- >>> .../bindings/firmware/qcom,scm.yaml | 131 ++++++++++++++++++ >>> 2 files changed, 131 insertions(+), 57 deletions(-) >>> delete mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt >>> create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.yaml >>> >>> diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt >>> deleted file mode 100644 >>> index 0f4e5ab26477..000000000000 >>> --- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt >>> +++ /dev/null >>> @@ -1,57 +0,0 @@ >>> -QCOM Secure Channel Manager (SCM) >>> - >>> -Qualcomm processors include an interface to communicate to the secure firmware. >>> -This interface allows for clients to request different types of actions. These >>> -can include CPU power up/down, HDCP requests, loading of firmware, and other >>> -assorted actions. >>> - >>> -Required properties: >>> -- compatible: must contain one of the following: >>> - * "qcom,scm-apq8064" >>> - * "qcom,scm-apq8084" >>> - * "qcom,scm-ipq4019" >>> - * "qcom,scm-ipq806x" >>> - * "qcom,scm-ipq8074" >>> - * "qcom,scm-mdm9607" >>> - * "qcom,scm-msm8226" >>> - * "qcom,scm-msm8660" >>> - * "qcom,scm-msm8916" >>> - * "qcom,scm-msm8953" >>> - * "qcom,scm-msm8960" >>> - * "qcom,scm-msm8974" >>> - * "qcom,scm-msm8976" >>> - * "qcom,scm-msm8994" >>> - * "qcom,scm-msm8996" >>> - * "qcom,scm-msm8998" >>> - * "qcom,scm-sc7180" >>> - * "qcom,scm-sc7280" >>> - * "qcom,scm-sdm845" >>> - * "qcom,scm-sdx55" >>> - * "qcom,scm-sm6350" >>> - * "qcom,scm-sm8150" >>> - * "qcom,scm-sm8250" >>> - * "qcom,scm-sm8350" >>> - * "qcom,scm-sm8450" >>> - and: >>> - * "qcom,scm" >>> -- clocks: Specifies clocks needed by the SCM interface, if any: >>> - * core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660" and >>> - "qcom,scm-msm8960" >>> - * core, iface and bus clocks required for "qcom,scm-apq8084", >>> - "qcom,scm-msm8916", "qcom,scm-msm8953", "qcom,scm-msm8974" and "qcom,scm-msm8976" >>> -- clock-names: Must contain "core" for the core clock, "iface" for the interface >>> - clock and "bus" for the bus clock per the requirements of the compatible. >>> -- qcom,dload-mode: phandle to the TCSR hardware block and offset of the >>> - download mode control register (optional) >>> - >>> -Example for MSM8916: >>> - >>> - firmware { >>> - scm { >>> - compatible = "qcom,msm8916", "qcom,scm"; >>> - clocks = <&gcc GCC_CRYPTO_CLK> , >>> - <&gcc GCC_CRYPTO_AXI_CLK>, >>> - <&gcc GCC_CRYPTO_AHB_CLK>; >>> - clock-names = "core", "bus", "iface"; >>> - }; >>> - }; >>> diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.yaml b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml >>> new file mode 100644 >>> index 000000000000..17d06e75b82b >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml >>> @@ -0,0 +1,131 @@ >>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >>> +%YAML 1.2 >>> +--- >>> +$id: "http://devicetree.org/schemas/firmware/qcom,scm.yaml#" >>> +$schema: "http://devicetree.org/meta-schemas/core.yaml#" >> No quotes here. >> >>> + >>> +title: QCOM Secure Channel Manager (SCM) >>> + >>> +description: | >>> + Qualcomm processors include an interface to communicate to the secure firmware. >>> + This interface allows for clients to request different types of actions. >>> + These can include CPU power up/down, HDCP requests, loading of firmware, >>> + and other assorted actions. >>> + >>> +maintainers: >>> + - Bjorn Andersson <bjorn.andersson@linaro.org> >>> + - Robert Marko <robimarko@gmail.com> >>> + - Guru Das Srinagesh <quic_gurus@quicinc.com> >>> + >>> +properties: >>> + compatible: >>> + items: >>> + - enum: >>> + - qcom,scm-apq8064 >>> + - qcom,scm-apq8084 >>> + - qcom,scm-ipq4019 >>> + - qcom,scm-ipq6018 >>> + - qcom,scm-ipq806x >>> + - qcom,scm-ipq8074 >>> + - qcom,scm-mdm9607 >>> + - qcom,scm-msm8226 >>> + - qcom,scm-msm8660 >>> + - qcom,scm-msm8916 >>> + - qcom,scm-msm8953 >>> + - qcom,scm-msm8960 >>> + - qcom,scm-msm8974 >>> + - qcom,scm-msm8976 >>> + - qcom,scm-msm8994 >>> + - qcom,scm-msm8996 >>> + - qcom,scm-msm8998 >>> + - qcom,scm-sc7180 >>> + - qcom,scm-sc7280 >>> + - qcom,scm-sdm845 >>> + - qcom,scm-sdx55 >>> + - qcom,scm-sm6125 >>> + - qcom,scm-sm6350 >>> + - qcom,scm-sm8150 >>> + - qcom,scm-sm8250 >>> + - qcom,scm-sm8350 >>> + - qcom,scm-sm8450 >>> + - qcom,scm-qcs404 >>> + - const: qcom,scm >>> + >>> + clocks: >>> + minItems: 1 >>> + maxItems: 3 >>> + >>> + clock-names: true >> You should have constraints here - min/maxItems. >> >>> + >>> + '#reset-cells': >>> + const: 1 >>> + >>> + qcom,dload-mode: >>> + $ref: /schemas/types.yaml#/definitions/phandle-array >>> + items: >>> + - items: >>> + - description: phandle to TCSR hardware block >>> + - description: offset of the download mode control register >>> + description: >>> + Should be phandle/offset pair. >> This description is not helpful. Should be something closer to "TCSR >> hardware block". >> >>> + >>> +allOf: >>> + - if: >>> + properties: >>> + compatible: >>> + contains: >>> + enum: >>> + - qcom,scm-apq8064 >>> + - qcom,scm-mdm9607 >>> + - qcom,scm-msm8660 >>> + - qcom,scm-msm8960 >>> + then: >>> + properties: >>> + clock-names: >>> + items: >>> + - const: core >> Missing constraints (maxItems:2) for clocks. > > Why 2? I would put `maxItems: 1` there > Yes, of course, typo. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema 2022-06-26 11:46 [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema David Heidelberg 2022-06-26 11:46 ` [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings David Heidelberg 2022-06-26 11:46 ` [PATCH v3 3/3] dt-bindings: firmware: convert Qualcomm SCM binding to the yaml David Heidelberg @ 2022-06-26 16:46 ` Krzysztof Kozlowski 2 siblings, 0 replies; 9+ messages in thread From: Krzysztof Kozlowski @ 2022-06-26 16:46 UTC (permalink / raw) To: David Heidelberg, Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski Cc: ~okias/devicetree, Robert Marko, Guru Das Srinagesh, linux-arm-msm, devicetree, linux-kernel On 26/06/2022 13:46, David Heidelberg wrote: > First device specific compatible, then general one. > > Cc: Robert Marko <robimarko@gmail.com> > Cc: Guru Das Srinagesh <quic_gurus@quicinc.com> > Signed-off-by: David Heidelberg <david@ixit.cz> > --- > arch/arm/boot/dts/qcom-apq8064.dtsi | 2 +- > arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +- > arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- > arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-06-27 16:11 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-06-26 11:46 [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema David Heidelberg 2022-06-26 11:46 ` [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings David Heidelberg 2022-06-26 16:46 ` Krzysztof Kozlowski 2022-06-27 16:11 ` Guru Das Srinagesh 2022-06-26 11:46 ` [PATCH v3 3/3] dt-bindings: firmware: convert Qualcomm SCM binding to the yaml David Heidelberg 2022-06-26 16:45 ` Krzysztof Kozlowski 2022-06-26 17:13 ` David Heidelberg 2022-06-26 18:28 ` Krzysztof Kozlowski 2022-06-26 16:46 ` [PATCH v3 1/3] ARM: dts: qcom: extend scm compatible to match dt-schema Krzysztof Kozlowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).