Commit ce5cfb0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-updates-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux 

Pull iommu updates from Joerg Roedel:

 - Introduction of the generic IO page-table framework with support for
   Intel and AMD IOMMU formats from Jason.

   This has good potential for unifying more IO page-table
   implementations and making future enhancements more easy. But this
   also needed quite some fixes during development. All known issues
   have been fixed, but my feeling is that there is a higher potential
   than usual that more might be needed.

 - Intel VT-d updates:
    - Use right invalidation hint in qi_desc_iotlb()
    - Reduce the scope of INTEL_IOMMU_FLOPPY_WA

 - ARM-SMMU updates:
    - Qualcomm device-tree binding updates for Kaanapali and Glymur SoCs
      and a new clock for the TBU.
    - Fix error handling if level 1 CD table allocation fails.
    - Permit more than the architectural maximum number of SMRs for
      funky Qualcomm mis-implementations of SMMUv2.

 - Mediatek driver:
    - MT8189 iommu support

 - Move ARM IO-pgtable selftests to kunit

 - Device leak fixes for a couple of drivers

 - Random smaller fixes and improvements

* tag 'iommu-updates-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux: (81 commits)
  iommupt/vtd: Support mgaw's less than a 4 level walk for first stage
  iommupt/vtd: Allow VT-d to have a larger table top than the vasz requires
  powerpc/pseries/svm: Make mem_encrypt.h self contained
  genpt: Make GENERIC_PT invisible
  iommupt: Avoid a compiler bug with sw_bit
  iommu/arm-smmu-qcom: Enable use of all SMR groups when running bare-metal
  iommupt: Fix unlikely flows in increase_top()
  iommu/amd: Propagate the error code returned by __modify_irte_ga() in modify_irte_ga()
  MAINTAINERS: Update my email address
  iommu/arm-smmu-v3: Fix error check in arm_smmu_alloc_cd_tables
  dt-bindings: iommu: qcom_iommu: Allow 'tbu' clock
  iommu/vt-d: Restore previous domain::aperture_end calculation
  iommu/vt-d: Fix unused invalidation hint in qi_desc_iotlb
  iommu/vt-d: Set INTEL_IOMMU_FLOPPY_WA depend on BLK_DEV_FD
  iommu/tegra: fix device leak on probe_device()
  iommu/sun50i: fix device leak on of_xlate()
  iommu/omap: simplify probe_device() error handling
  iommu/omap: fix device leaks on probe_device()
  iommu/mediatek-v1: add missing larb count sanity check
  iommu/mediatek-v1: fix device leaks on probe()
  ...
parents 5797d10e 0d081b16

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ ForEachMacros: 
  - 'for_each_prop_dlc_cpus'

  - 'for_each_prop_dlc_platforms'

  - 'for_each_property_of_node'

  - 'for_each_pt_level_entry'

  - 'for_each_rdt_resource'

  - 'for_each_reg'

  - 'for_each_reg_filtered'

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -345,7 +345,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com> 
Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>

Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>

Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>

<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>

Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe.brucker@arm.com>

Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe@linaro.org>

Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org> <jeanmichel.hautbois@ideasonboard.com>

Jean Tourrilhes <jt@hpl.hp.com>

Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>

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

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ properties: 
      - description: Qcom SoCs implementing "qcom,smmu-500" and "arm,mmu-500"

        items:

          - enum:

              - qcom,glymur-smmu-500

              - qcom,kaanapali-smmu-500

              - qcom,milos-smmu-500

              - qcom,qcm2290-smmu-500

              - qcom,qcs615-smmu-500

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

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ properties: 
          - mediatek,mt8188-iommu-vdo        # generation two

          - mediatek,mt8188-iommu-vpp        # generation two

          - mediatek,mt8188-iommu-infra      # generation two

          - mediatek,mt8189-iommu-apu        # generation two

          - mediatek,mt8189-iommu-infra      # generation two

          - mediatek,mt8189-iommu-mm         # generation two

          - mediatek,mt8192-m4u  # generation two

          - mediatek,mt8195-iommu-vdo        # generation two

          - mediatek,mt8195-iommu-vpp        # generation two
@@ -128,6 +131,7 @@ properties: 
      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/mediatek,mt8189-memory-port.h for mt8189,

      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,
@@ -164,6 +168,7 @@ allOf: 
              - mediatek,mt8186-iommu-mm

              - mediatek,mt8188-iommu-vdo

              - mediatek,mt8188-iommu-vpp

              - mediatek,mt8189-iommu-mm

              - mediatek,mt8192-m4u

              - mediatek,mt8195-iommu-vdo

              - mediatek,mt8195-iommu-vpp
@@ -180,6 +185,7 @@ allOf: 
            - mediatek,mt8186-iommu-mm

            - mediatek,mt8188-iommu-vdo

            - mediatek,mt8188-iommu-vpp

            - mediatek,mt8189-iommu-mm

            - mediatek,mt8192-m4u

            - mediatek,mt8195-iommu-vdo

            - mediatek,mt8195-iommu-vpp
@@ -208,6 +214,8 @@ allOf: 
            contains:

              enum:

                - mediatek,mt8188-iommu-infra

                - mediatek,mt8189-iommu-apu

                - mediatek,mt8189-iommu-infra

                - mediatek,mt8195-iommu-infra



    then:

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

+4 −0
Original line number Diff line number Diff line
@@ -32,14 +32,18 @@ properties: 
          - const: qcom,msm-iommu-v2



  clocks:

    minItems: 2

    items:

      - description: Clock required for IOMMU register group access

      - description: Clock required for underlying bus access

      - description: Clock required for Translation Buffer Unit access



  clock-names:

    minItems: 2

    items:

      - const: iface

      - const: bus

      - const: tbu



  power-domains:

    maxItems: 1