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

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

Pull iommu updates from Joerg Roedel:

 - remove the bus_set_iommu() interface which became unnecesary because
   of IOMMU per-device probing

 - make the dma-iommu.h header private

 - Intel VT-d changes from Lu Baolu:
	  - Decouple PASID and PRI from SVA
	  - Add ESRTPS & ESIRTPS capability check
	  - Cleanups

 - Apple DART support for the M1 Pro/MAX SOCs

 - support for AMD IOMMUv2 page-tables for the DMA-API layer.

   The v2 page-tables are compatible with the x86 CPU page-tables. Using
   them for DMA-API prepares support for hardware-assisted IOMMU
   virtualization

 - support for MT6795 Helio X10 M4Us in the Mediatek IOMMU driver

 - some smaller fixes and cleanups

* tag 'iommu-updates-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (59 commits)
  iommu/vt-d: Avoid unnecessary global DMA cache invalidation
  iommu/vt-d: Avoid unnecessary global IRTE cache invalidation
  iommu/vt-d: Rename cap_5lp_support to cap_fl5lp_support
  iommu/vt-d: Remove pasid_set_eafe()
  iommu/vt-d: Decouple PASID & PRI enabling from SVA
  iommu/vt-d: Remove unnecessary SVA data accesses in page fault path
  dt-bindings: iommu: arm,smmu-v3: Relax order of interrupt names
  iommu: dart: Support t6000 variant
  iommu/io-pgtable-dart: Add DART PTE support for t6000
  iommu/io-pgtable: Add DART subpage protection support
  iommu/io-pgtable: Move Apple DART support to its own file
  iommu/mediatek: Add support for MT6795 Helio X10 M4Us
  iommu/mediatek: Introduce new flag TF_PORT_TO_ADDR_MT8173
  dt-bindings: mediatek: Add bindings for MT6795 M4U
  iommu/iova: Fix module config properly
  iommu/amd: Fix sparse warning
  iommu/amd: Remove outdated comment
  iommu/amd: Free domain ID after domain_flush_pages
  iommu/amd: Free domain id in error path
  iommu/virtio: Fix compile error with viommu_capable()
  ...
parents 706eacad 38713c60

Documentation/admin-guide/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ 
			force_enable - Force enable the IOMMU on platforms known

				       to be buggy with IOMMU enabled. Use this

				       option with care.

			pgtbl_v1     - Use v1 page table for DMA-API (Default).

			pgtbl_v2     - Use v2 page table for DMA-API.



	amd_iommu_dump=	[HW,X86-64]

			Enable AMD IOMMU driver option to dump the ACPI table

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

+5 −10
Original line number Diff line number Diff line
@@ -39,16 +39,11 @@ properties: 
          any others.

      - minItems: 1

        items:

          - enum:

          enum:

            - eventq      # Event Queue not empty

            - gerror      # Global Error activated

          - const: gerror

          - enum:

            - cmdq-sync   # CMD_SYNC complete

            - priq        # PRI Queue not empty

          - enum:

              - cmdq-sync

              - priq



  '#iommu-cells':

    const: 1

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

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ properties: 
          - mediatek,mt2701-m4u  # generation one

          - mediatek,mt2712-m4u  # generation two

          - mediatek,mt6779-m4u  # generation two

          - mediatek,mt6795-m4u  # generation two

          - mediatek,mt8167-m4u  # generation two

          - mediatek,mt8173-m4u  # generation two

          - mediatek,mt8183-m4u  # generation two
@@ -124,6 +125,7 @@ properties: 
      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,

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

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

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

      dt-binding/memory/mt8183-larb-port.h for mt8183,
@@ -148,6 +150,7 @@ allOf: 
            enum:

              - mediatek,mt2701-m4u

              - mediatek,mt2712-m4u

              - mediatek,mt6795-m4u

              - mediatek,mt8173-m4u

              - mediatek,mt8186-iommu-mm

              - mediatek,mt8192-m4u
@@ -177,6 +180,7 @@ allOf: 
          contains:

            enum:

              - mediatek,mt2712-m4u

              - mediatek,mt6795-m4u

              - mediatek,mt8173-m4u



    then:

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1915,6 +1915,7 @@ F: drivers/dma/apple-admac.c 
F:	drivers/i2c/busses/i2c-pasemi-core.c

F:	drivers/i2c/busses/i2c-pasemi-platform.c

F:	drivers/iommu/apple-dart.c

F:	drivers/iommu/io-pgtable-dart.c

F:	drivers/irqchip/irq-apple-aic.c

F:	drivers/mailbox/apple-mailbox.c

F:	drivers/nvme/host/apple.c
@@ -10689,8 +10690,8 @@ L: iommu@lists.linux.dev 
S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git

F:	drivers/iommu/dma-iommu.c

F:	drivers/iommu/dma-iommu.h

F:	drivers/iommu/iova.c

F:	include/linux/dma-iommu.h

F:	include/linux/iova.h









IOMMU SUBSYSTEM
































arch/arm64/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -209,7 +209,6 @@ config ARM64







	select HAVE_KPROBES









	select HAVE_KRETPROBES









	select HAVE_GENERIC_VDSO









	select IOMMU_DMA if IOMMU_SUPPORT









	select IRQ_DOMAIN









	select IRQ_FORCED_THREADING









	select KASAN_VMALLOC if KASAN