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

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

Pull iommu updates from Joerg Roedel:
 "Core changes:
   - iova_magazine_alloc() optimization
   - Make flush-queue an IOMMU driver capability
   - Consolidate the error handling around device attachment

  AMD IOMMU changes:
   - AVIC Interrupt Remapping Improvements
   - Some minor fixes and cleanups

  Intel VT-d changes from Lu Baolu:
   - Small and misc cleanups

  ARM-SMMU changes from Will Deacon:
   - Device-tree binding updates:
      - Add missing clocks for SC8280XP and SA8775 Adreno SMMUs
      - Add two new Qualcomm SMMUs in SDX75 and SM6375
   - Workarounds for Arm MMU-700 errata:
      - 1076982: Avoid use of SEV-based cmdq wakeup
      - 2812531: Terminate command batches with a CMD_SYNC
      - Enforce single-stage translation to avoid nesting-related errata
   - Set the correct level hint for range TLB invalidation on teardown

  .. and some other minor fixes and cleanups (including Freescale PAMU
  and virtio-iommu changes)"

* tag 'iommu-updates-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (50 commits)
  iommu/vt-d: Remove commented-out code
  iommu/vt-d: Remove two WARN_ON in domain_context_mapping_one()
  iommu/vt-d: Handle the failure case of dmar_reenable_qi()
  iommu/vt-d: Remove unnecessary (void*) conversions
  iommu/amd: Remove extern from function prototypes
  iommu/amd: Use BIT/BIT_ULL macro to define bit fields
  iommu/amd: Fix DTE_IRQ_PHYS_ADDR_MASK macro
  iommu/amd: Fix compile error for unused function
  iommu/amd: Improving Interrupt Remapping Table Invalidation
  iommu/amd: Do not Invalidate IRT when IRTE caching is disabled
  iommu/amd: Introduce Disable IRTE Caching Support
  iommu/amd: Remove the unused struct amd_ir_data.ref
  iommu/amd: Switch amd_iommu_update_ga() to use modify_irte_ga()
  iommu/arm-smmu-v3: Set TTL invalidation hint better
  iommu/arm-smmu-v3: Document nesting-related errata
  iommu/arm-smmu-v3: Add explicit feature for nesting
  iommu/arm-smmu-v3: Document MMU-700 erratum 2812531
  iommu/arm-smmu-v3: Work around MMU-600 erratum 1076982
  dt-bindings: arm-smmu: Add SDX75 SMMU compatible
  dt-bindings: arm-smmu: Add SM6375 GPU SMMU
  ...
parents 0b26eadb a7a33407

.clang-format

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

  - 'for_each_free_mem_range_reverse'

  - 'for_each_func_rsrc'

  - 'for_each_group_device'

  - 'for_each_group_evsel'

  - 'for_each_group_member'

  - 'for_each_hstate'

Documentation/admin-guide/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ 
				       option with care.

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

			pgtbl_v2     - Use v2 page table for DMA-API.

			irtcachedis  - Disable Interrupt Remapping Table (IRT) caching.



	amd_iommu_dump=	[HW,X86-64]

			Enable AMD IOMMU driver option to dump the ACPI table

Documentation/arch/arm64/silicon-errata.rst

+4 −0
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | MMU-500         | #841119,826419  | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | MMU-600         | #1076982,1209401| N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | MMU-700         | #2268618,2812531| N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| Broadcom       | Brahma-B53      | N/A             | ARM64_ERRATUM_845719        |

+----------------+-----------------+-----------------+-----------------------------+

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

+9 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
              - qcom,msm8996-smmu-v2

              - qcom,msm8998-smmu-v2

              - qcom,sdm630-smmu-v2

              - qcom,sm6375-smmu-v2

          - const: qcom,smmu-v2



      - description: Qcom SoCs implementing "qcom,smmu-500" and "arm,mmu-500"
@@ -45,6 +46,7 @@ properties: 
              - qcom,sdm845-smmu-500

              - qcom,sdx55-smmu-500

              - qcom,sdx65-smmu-500

              - qcom,sdx75-smmu-500

              - qcom,sm6115-smmu-500

              - qcom,sm6125-smmu-500

              - qcom,sm6350-smmu-500
@@ -79,7 +81,9 @@ properties: 
      - description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,mmu-500"

        items:

          - enum:

              - qcom,sa8775p-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8280xp-smmu-500

              - qcom,sm6115-smmu-500

              - qcom,sm6125-smmu-500

              - qcom,sm8150-smmu-500
@@ -267,6 +271,7 @@ allOf: 
            enum:

              - qcom,msm8998-smmu-v2

              - qcom,sdm630-smmu-v2

              - qcom,sm6375-smmu-v2

    then:

      anyOf:

        - properties:
@@ -331,7 +336,10 @@ allOf: 
      properties:

        compatible:

          contains:

            const: qcom,sc7280-smmu-500

            enum:

              - qcom,sa8775p-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8280xp-smmu-500

    then:

      properties:

        clock-names:
@@ -413,10 +421,8 @@ allOf: 
              - nvidia,smmu-500

              - qcom,qcm2290-smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sc7180-smmu-500

              - qcom,sc8180x-smmu-500

              - qcom,sc8280xp-smmu-500

              - qcom,sdm670-smmu-500

              - qcom,sdm845-smmu-500

              - qcom,sdx55-smmu-500

arch/powerpc/sysdev/fsl_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1353,6 +1353,7 @@ static struct platform_driver fsl_pci_driver = { 
		.of_match_table = pci_ids,

	},

	.probe = fsl_pci_probe,

	.driver_managed_dma = true,

};



static int __init fsl_pci_init(void)