diff options
| author | Joerg Roedel <jroedel@suse.de> | 2023-08-17 14:01:32 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2023-08-17 14:01:32 +0300 |
| commit | 90654da4d90447ba9c3cdfb034342fb3b475efdf (patch) | |
| tree | 44d098c276c50f3e3e00b8b7863d2be7f768e4fe /Documentation/devicetree/bindings/iommu | |
| parent | 6eaae198076080886b9e7d57f4ae06fa782f90ef (diff) | |
| parent | afe92fbfbfb7efb77b9525dbae3453c8f63e6b60 (diff) | |
| download | linux-90654da4d90447ba9c3cdfb034342fb3b475efdf.tar.xz | |
Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Qualc^WArm SMMU updates for 6.6
- Device-tree binding updates:
* Add additional compatible strings for Qualcomm SoCs
* Allow ASIDs to be configured in the DT to work around Qualcomm's
broken hypervisor
* Fix clocks for Qualcomm's MSM8998 SoC
- SMMUv2:
* Support for Qualcomm's legacy firmware implementation featured on
at least MSM8956 and MSM8976.
* Match compatible strings for Qualcomm SM6350 and SM6375 SoC variants
- SMMUv3:
* Use 'ida' instead of a bitmap for VMID allocation
Diffstat (limited to 'Documentation/devicetree/bindings/iommu')
| -rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 41 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/iommu/qcom,iommu.yaml | 22 |
2 files changed, 58 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index 3a31a979709b..cf29ab10501c 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -270,6 +270,47 @@ allOf: contains: enum: - qcom,msm8998-smmu-v2 + then: + anyOf: + - properties: + clock-names: + items: + - const: bus + clocks: + items: + - description: bus clock required for downstream bus access and for + the smmu ptw + - properties: + clock-names: + items: + - const: iface + - const: mem + - const: mem_iface + clocks: + items: + - description: interface clock required to access smmu's registers + through the TCU's programming interface. + - description: bus clock required for memory access + - description: bus clock required for GPU memory access + - properties: + clock-names: + items: + - const: iface-mm + - const: iface-smmu + - const: bus-smmu + clocks: + items: + - description: interface clock required to access mnoc's registers + through the TCU's programming interface. + - description: interface clock required to access smmu's registers + through the TCU's programming interface. + - description: bus clock required for the smmu ptw + + - if: + properties: + compatible: + contains: + enum: - qcom,sdm630-smmu-v2 - qcom,sm6375-smmu-v2 then: diff --git a/Documentation/devicetree/bindings/iommu/qcom,iommu.yaml b/Documentation/devicetree/bindings/iommu/qcom,iommu.yaml index d9fabdf930d9..a74eb899c381 100644 --- a/Documentation/devicetree/bindings/iommu/qcom,iommu.yaml +++ b/Documentation/devicetree/bindings/iommu/qcom,iommu.yaml @@ -17,11 +17,16 @@ description: | properties: compatible: - items: - - enum: - - qcom,msm8916-iommu - - qcom,msm8953-iommu - - const: qcom,msm-iommu-v1 + oneOf: + - items: + - enum: + - qcom,msm8916-iommu + - qcom,msm8953-iommu + - const: qcom,msm-iommu-v1 + - items: + - enum: + - qcom,msm8976-iommu + - const: qcom,msm-iommu-v2 clocks: items: @@ -64,6 +69,8 @@ patternProperties: enum: - qcom,msm-iommu-v1-ns - qcom,msm-iommu-v1-sec + - qcom,msm-iommu-v2-ns + - qcom,msm-iommu-v2-sec interrupts: maxItems: 1 @@ -71,6 +78,11 @@ patternProperties: reg: maxItems: 1 + qcom,ctx-asid: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + The ASID number associated to the context bank. + required: - compatible - interrupts |