Commit 125f34e4 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'qualcomm/msm',... 

Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'qualcomm/msm', 'rockchip', 'riscv', 'core', 'intel/vt-d' and 'amd/amd-vi' into next
parents 5bc55a33 1f3dc29d 8735e47e afc0cbc6 5a0751fc 10c62c38 54e7d900 acf5d49a 082f1bca

Documentation/arch/arm64/silicon-errata.rst

+2 −1
Original line number Diff line number Diff line
@@ -198,7 +198,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Neoverse-V3     | #3312417        | ARM64_ERRATUM_3194386       |

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

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

| ARM            | MMU-500         | #841119,826419  | ARM_SMMU_MMU_500_CPRE_ERRATA|

|                |                 | #562869,1047329 |                             |

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

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

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

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

+22 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ properties: 
              - qcom,sm8450-smmu-500

              - qcom,sm8550-smmu-500

              - qcom,sm8650-smmu-500

              - qcom,sm8750-smmu-500

              - qcom,x1e80100-smmu-500

          - const: qcom,smmu-500

          - const: arm,mmu-500
@@ -88,6 +89,7 @@ properties: 
        items:

          - enum:

              - qcom,qcm2290-smmu-500

              - qcom,qcs615-smmu-500

              - qcom,sa8255p-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sar2130p-smmu-500
@@ -102,6 +104,7 @@ properties: 
              - qcom,sm8450-smmu-500

              - qcom,sm8550-smmu-500

              - qcom,sm8650-smmu-500

              - qcom,sm8750-smmu-500

              - qcom,x1e80100-smmu-500

          - const: qcom,adreno-smmu

          - const: qcom,smmu-500
@@ -122,6 +125,7 @@ properties: 
              - qcom,msm8996-smmu-v2

              - qcom,sc7180-smmu-v2

              - qcom,sdm630-smmu-v2

              - qcom,sdm670-smmu-v2

              - qcom,sdm845-smmu-v2

              - qcom,sm6350-smmu-v2

              - qcom,sm7150-smmu-v2
@@ -474,6 +478,7 @@ allOf: 
          items:

            - enum:

                - qcom,qcm2290-smmu-500

                - qcom,qcs615-smmu-500

                - qcom,sm6115-smmu-500

                - qcom,sm6125-smmu-500

            - const: qcom,adreno-smmu
@@ -550,6 +555,23 @@ allOf: 
            - description: GPU SNoC bus clock

            - description: GPU AHB clock



  - if:

      properties:

        compatible:

          items:

            - const: qcom,sm8750-smmu-500

            - const: qcom,adreno-smmu

            - const: qcom,smmu-500

            - const: arm,mmu-500

    then:

      properties:

        clock-names:

          items:

            - const: hlos

        clocks:

          items:

            - description: HLOS vote clock



  # Disallow clocks for all other platforms with specific compatibles

  - if:

      properties:
@@ -559,7 +581,6 @@ allOf: 
              - cavium,smmu-v2

              - marvell,ap806-smmu-500

              - nvidia,smmu-500

              - qcom,qcs615-smmu-500

              - qcom,qcs8300-smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sa8255p-smmu-500

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

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - items:

          - enum:

              - qcom,msm8916-iommu

              - qcom,msm8917-iommu

              - qcom,msm8953-iommu

          - const: qcom,msm-iommu-v1

      - items:

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
          - rockchip,rk3568-iommu

      - items:

          - enum:

              - rockchip,rk3576-iommu

              - rockchip,rk3588-iommu

          - const: rockchip,rk3568-iommu

drivers/iommu/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -367,6 +367,18 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT 
	  'arm-smmu.disable_bypass' will continue to override this

	  config.



config ARM_SMMU_MMU_500_CPRE_ERRATA

	bool "Enable errata workaround for CPRE in SMMU reset path"

	depends on ARM_SMMU

	default y

	help

	  Say Y here (by default) to apply workaround to disable

	  MMU-500's next-page prefetcher for sake of 4 known errata.



	  Say N here only when it is sure that any errata related to

	  prefetch enablement are not applicable on the platform.

	  Refer silicon-errata.rst for info on errata IDs.



config ARM_SMMU_QCOM

	def_tristate y

	depends on ARM_SMMU && ARCH_QCOM