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

Merge branches 'iommu/fixes', 'arm/smmu', 'ppc/pamu', 'virtio', 'x86/vt-d',... 

Merge branches 'iommu/fixes', 'arm/smmu', 'ppc/pamu', 'virtio', 'x86/vt-d', 'core' and 'x86/amd' into next
parents 45a3e24f 5b00369f ac3c4563 139a57a9 7061b6af b4da4e11 5957c193 78db2985

.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/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)