Commit d8fe59f1 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/rockchip',... 

Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'unisoc', 'x86/vt-d', 'x86/amd' and 'core' into next
parents 706a7415 ed8c975b 972f49c5 52a8fd24 2a7e6400 90654da4 d48a5128 cb4396e0 0652cf98 d477f603

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

+41 −0
Original line number Diff line number Diff line
@@ -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:

Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml

+11 −1
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ properties: 
          - mediatek,mt8173-m4u  # generation two

          - mediatek,mt8183-m4u  # generation two

          - mediatek,mt8186-iommu-mm         # generation two

          - mediatek,mt8188-iommu-vdo        # generation two

          - mediatek,mt8188-iommu-vpp        # generation two

          - mediatek,mt8188-iommu-infra      # generation two

          - mediatek,mt8192-m4u  # generation two

          - mediatek,mt8195-iommu-vdo        # generation two

          - mediatek,mt8195-iommu-vpp        # generation two
@@ -123,6 +126,7 @@ properties: 
    description: |

      This is the mtk_m4u_id according to the HW. Specifies the mtk_m4u_id as

      defined in

      dt-binding/memory/mediatek,mt8188-memory-port.h for mt8188,

      dt-binding/memory/mt2701-larb-port.h for mt2701 and mt7623,

      dt-binding/memory/mt2712-larb-port.h for mt2712,

      dt-binding/memory/mt6779-larb-port.h for mt6779,
@@ -155,6 +159,8 @@ allOf: 
              - mediatek,mt6795-m4u

              - mediatek,mt8173-m4u

              - mediatek,mt8186-iommu-mm

              - mediatek,mt8188-iommu-vdo

              - mediatek,mt8188-iommu-vpp

              - mediatek,mt8192-m4u

              - mediatek,mt8195-iommu-vdo

              - mediatek,mt8195-iommu-vpp
@@ -168,6 +174,8 @@ allOf: 
        compatible:

          enum:

            - mediatek,mt8186-iommu-mm

            - mediatek,mt8188-iommu-vdo

            - mediatek,mt8188-iommu-vpp

            - mediatek,mt8192-m4u

            - mediatek,mt8195-iommu-vdo

            - mediatek,mt8195-iommu-vpp
@@ -194,7 +202,9 @@ allOf: 
        properties:

          compatible:

            contains:

              const: mediatek,mt8195-iommu-infra

              enum:

                - mediatek,mt8188-iommu-infra

                - mediatek,mt8195-iommu-infra



    then:

      required:

Documentation/devicetree/bindings/iommu/qcom,iommu.yaml

+17 −5
Original line number Diff line number Diff line
@@ -17,11 +17,16 @@ description: | 


properties:

  compatible:

    items:

    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

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13247,6 +13247,7 @@ L: linux-mediatek@lists.infradead.org (moderated for non-subscribers) 
S:	Supported

F:	Documentation/devicetree/bindings/iommu/mediatek*

F:	drivers/iommu/mtk_iommu*

F:	include/dt-bindings/memory/mediatek,mt*-port.h

F:	include/dt-bindings/memory/mt*-port.h









MEDIATEK JPEG DRIVER
































drivers/acpi/scan.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1581,7 +1581,7 @@ static const struct iommu_ops *acpi_iommu_configure_id(struct device *dev,







	 * If we have reason to believe the IOMMU driver missed the initial









	 * iommu_probe_device() call for dev, replay it to get things in order.









	 */









	if (!err && dev->bus && !device_iommu_mapped(dev))









	if (!err && dev->bus)









		err = iommu_probe_device(dev);



















	/* Ignore all other errors apart from EPROBE_DEFER */