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

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

Pull iommu updates from Joerg Roedel:

 - ARM SMMU and Mediatek updates from Will Deacon:
     - Support for MT8192 IOMMU from Mediatek
     - Arm v7s io-pgtable extensions for MT8192
     - Removal of TLBI_ON_MAP quirk
     - New Qualcomm compatible strings
     - Allow SVA without hardware broadcast TLB maintenance on SMMUv3
     - Virtualization Host Extension support for SMMUv3 (SVA)
     - Allow SMMUv3 PMU perf driver to be built independently from IOMMU

 - Some tidy-up in IOVA and core code

 - Conversion of the AMD IOMMU code to use the generic IO-page-table
   framework

 - Intel VT-d updates from Lu Baolu:
     - Audit capability consistency among different IOMMUs
     - Add SATC reporting structure support
     - Add iotlb_sync_map callback support

 - SDHI support for Renesas IOMMU driver

 - Misc cleanups and other small improvments

* tag 'iommu-updates-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (94 commits)
  iommu/amd: Fix performance counter initialization
  MAINTAINERS: repair file pattern in MEDIATEK IOMMU DRIVER
  iommu/mediatek: Fix error code in probe()
  iommu/mediatek: Fix unsigned domid comparison with less than zero
  iommu/vt-d: Parse SATC reporting structure
  iommu/vt-d: Add new enum value and structure for SATC
  iommu/vt-d: Add iotlb_sync_map callback
  iommu/vt-d: Move capability check code to cap_audit files
  iommu/vt-d: Audit IOMMU Capabilities and add helper functions
  iommu/vt-d: Fix 'physical' typos
  iommu: Properly pass gfp_t in _iommu_map() to avoid atomic sleeping
  iommu/vt-d: Fix compile error [-Werror=implicit-function-declaration]
  driver/perf: Remove ARM_SMMU_V3_PMU dependency on ARM_SMMU_V3
  MAINTAINERS: Add entry for MediaTek IOMMU
  iommu/mediatek: Add mt8192 support
  iommu/mediatek: Remove unnecessary check in attach_device
  iommu/mediatek: Support master use iova over 32bit
  iommu/mediatek: Add iova reserved function
  iommu/mediatek: Support for multi domains
  iommu/mediatek: Add get_domain_id from dev->dma_range_map
  ...
parents 3672ac8a 45e606f2

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

+2 −0
Original line number Diff line number Diff line
@@ -34,9 +34,11 @@ properties: 
        items:

          - enum:

              - qcom,sc7180-smmu-500

              - qcom,sc8180x-smmu-500

              - qcom,sdm845-smmu-500

              - qcom,sm8150-smmu-500

              - qcom,sm8250-smmu-500

              - qcom,sm8350-smmu-500

          - const: arm,mmu-500

      - description: Qcom Adreno GPUs implementing "arm,smmu-v2"

        items:

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

deleted100644 → 0
+0 −105
Original line number Diff line number Diff line 
* Mediatek IOMMU Architecture Implementation



  Some Mediatek SOCs contain a Multimedia Memory Management Unit (M4U), and

this M4U have two generations of HW architecture. Generation one uses flat

pagetable, and only supports 4K size page mapping. Generation two uses the

ARM Short-Descriptor translation table format for address translation.



  About the M4U Hardware Block Diagram, please check below:



              EMI (External Memory Interface)

               |

              m4u (Multimedia Memory Management Unit)

               |

          +--------+

          |        |

      gals0-rx   gals1-rx    (Global Async Local Sync rx)

          |        |

          |        |

      gals0-tx   gals1-tx    (Global Async Local Sync tx)

          |        |          Some SoCs may have GALS.

          +--------+

               |

           SMI Common(Smart Multimedia Interface Common)

               |

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

       |                |

       |             gals-rx        There may be GALS in some larbs.

       |                |

       |                |

       |             gals-tx

       |                |

   SMI larb0        SMI larb1   ... SoCs have several SMI local arbiter(larb).

   (display)         (vdec)

       |                |

       |                |

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

 |     |     |     |    |    |

 |     |     |...  |    |    |  ... There are different ports in each larb.

 |     |     |     |    |    |

OVL0 RDMA0 WDMA0  MC   PP   VLD



  As above, The Multimedia HW will go through SMI and M4U while it

access EMI. SMI is a bridge between m4u and the Multimedia HW. It contain

smi local arbiter and smi common. It will control whether the Multimedia

HW should go though the m4u for translation or bypass it and talk

directly with EMI. And also SMI help control the power domain and clocks for

each local arbiter.

  Normally we specify a local arbiter(larb) for each multimedia HW

like display, video decode, and camera. And there are different ports

in each larb. Take a example, There are many ports like MC, PP, VLD in the

video decode local arbiter, all these ports are according to the video HW.

  In some SoCs, there may be a GALS(Global Async Local Sync) module between

smi-common and m4u, and additional GALS module between smi-larb and

smi-common. GALS can been seen as a "asynchronous fifo" which could help

synchronize for the modules in different clock frequency.



Required properties:

- compatible : must be one of the following string:

	"mediatek,mt2701-m4u" for mt2701 which uses generation one m4u HW.

	"mediatek,mt2712-m4u" for mt2712 which uses generation two m4u HW.

	"mediatek,mt6779-m4u" for mt6779 which uses generation two m4u HW.

	"mediatek,mt7623-m4u", "mediatek,mt2701-m4u" for mt7623 which uses

						     generation one m4u HW.

	"mediatek,mt8167-m4u" for mt8167 which uses generation two m4u HW.

	"mediatek,mt8173-m4u" for mt8173 which uses generation two m4u HW.

	"mediatek,mt8183-m4u" for mt8183 which uses generation two m4u HW.

- reg : m4u register base and size.

- interrupts : the interrupt of m4u.

- clocks : must contain one entry for each clock-names.

- clock-names : Only 1 optional clock:

  - "bclk": the block clock of m4u.

  Here is the list which require this "bclk":

  - mt2701, mt2712, mt7623 and mt8173.

  Note that m4u use the EMI clock which always has been enabled before kernel

  if there is no this "bclk".

- mediatek,larbs : List of phandle to the local arbiters in the current Socs.

	Refer to bindings/memory-controllers/mediatek,smi-larb.txt. It must sort

	according to the local arbiter index, like larb0, larb1, larb2...

- iommu-cells : must be 1. This is the mtk_m4u_id according to the HW.

	Specifies the mtk_m4u_id as defined in

	dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623

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

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

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

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

	dt-binding/memory/mt8183-larb-port.h for mt8183.



Example:

	iommu: iommu@10205000 {

		compatible = "mediatek,mt8173-m4u";

		reg = <0 0x10205000 0 0x1000>;

		interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&infracfg CLK_INFRA_M4U>;

		clock-names = "bclk";

		mediatek,larbs = <&larb0 &larb1 &larb2 &larb3 &larb4 &larb5>;

		#iommu-cells = <1>;

	};



Example for a client device:

	display {

		compatible = "mediatek,mt8173-disp";

		iommus = <&iommu M4U_PORT_DISP_OVL0>,

			 <&iommu M4U_PORT_DISP_RDMA0>;

		...

	};

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

0 → 100644
+183 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iommu/mediatek,iommu.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: MediaTek IOMMU Architecture Implementation



maintainers:

  - Yong Wu <yong.wu@mediatek.com>



description: |+

  Some MediaTek SOCs contain a Multimedia Memory Management Unit (M4U), and

  this M4U have two generations of HW architecture. Generation one uses flat

  pagetable, and only supports 4K size page mapping. Generation two uses the

  ARM Short-Descriptor translation table format for address translation.



  About the M4U Hardware Block Diagram, please check below:



                EMI (External Memory Interface)

                 |

                m4u (Multimedia Memory Management Unit)

                 |

            +--------+

            |        |

        gals0-rx   gals1-rx    (Global Async Local Sync rx)

            |        |

            |        |

        gals0-tx   gals1-tx    (Global Async Local Sync tx)

            |        |          Some SoCs may have GALS.

            +--------+

                 |

             SMI Common(Smart Multimedia Interface Common)

                 |

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

         |                |

         |             gals-rx        There may be GALS in some larbs.

         |                |

         |                |

         |             gals-tx

         |                |

     SMI larb0        SMI larb1   ... SoCs have several SMI local arbiter(larb).

     (display)         (vdec)

         |                |

         |                |

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

   |     |     |     |    |    |

   |     |     |...  |    |    |  ... There are different ports in each larb.

   |     |     |     |    |    |

  OVL0 RDMA0 WDMA0  MC   PP   VLD



  As above, The Multimedia HW will go through SMI and M4U while it

  access EMI. SMI is a bridge between m4u and the Multimedia HW. It contain

  smi local arbiter and smi common. It will control whether the Multimedia

  HW should go though the m4u for translation or bypass it and talk

  directly with EMI. And also SMI help control the power domain and clocks for

  each local arbiter.



  Normally we specify a local arbiter(larb) for each multimedia HW

  like display, video decode, and camera. And there are different ports

  in each larb. Take a example, There are many ports like MC, PP, VLD in the

  video decode local arbiter, all these ports are according to the video HW.



  In some SoCs, there may be a GALS(Global Async Local Sync) module between

  smi-common and m4u, and additional GALS module between smi-larb and

  smi-common. GALS can been seen as a "asynchronous fifo" which could help

  synchronize for the modules in different clock frequency.



properties:

  compatible:

    oneOf:

      - enum:

          - mediatek,mt2701-m4u  # generation one

          - mediatek,mt2712-m4u  # generation two

          - mediatek,mt6779-m4u  # generation two

          - mediatek,mt8167-m4u  # generation two

          - mediatek,mt8173-m4u  # generation two

          - mediatek,mt8183-m4u  # generation two

          - mediatek,mt8192-m4u  # generation two



      - description: mt7623 generation one

        items:

          - const: mediatek,mt7623-m4u

          - const: mediatek,mt2701-m4u



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: bclk is the block clock.



  clock-names:

    items:

      - const: bclk



  mediatek,larbs:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    minItems: 1

    maxItems: 32

    description: |

      List of phandle to the local arbiters in the current Socs.

      Refer to bindings/memory-controllers/mediatek,smi-larb.yaml. It must sort

      according to the local arbiter index, like larb0, larb1, larb2...



  '#iommu-cells':

    const: 1

    description: |

      This is the mtk_m4u_id according to the HW. Specifies the mtk_m4u_id as

      defined in

      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/mt8167-larb-port.h for mt8167,

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

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

      dt-binding/memory/mt8192-larb-port.h for mt8192.



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - mediatek,larbs

  - '#iommu-cells'



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - mediatek,mt2701-m4u

              - mediatek,mt2712-m4u

              - mediatek,mt8173-m4u

              - mediatek,mt8192-m4u



    then:

      required:

        - clocks



  - if:

      properties:

        compatible:

          enum:

            - mediatek,mt8192-m4u



    then:

      required:

        - power-domains



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/mt8173-clk.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    iommu: iommu@10205000 {

            compatible = "mediatek,mt8173-m4u";

            reg = <0x10205000 0x1000>;

            interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_LOW>;

            clocks = <&infracfg CLK_INFRA_M4U>;

            clock-names = "bclk";

            mediatek,larbs = <&larb0 &larb1 &larb2

                              &larb3 &larb4 &larb5>;

            #iommu-cells = <1>;

    };



  - |

    #include <dt-bindings/memory/mt8173-larb-port.h>



    /* Example for a client device */

    display {

           compatible = "mediatek,mt8173-disp";

           iommus = <&iommu M4U_PORT_DISP_OVL0>,

                    <&iommu M4U_PORT_DISP_RDMA0>;

     };

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -11175,6 +11175,15 @@ S: Maintained 
F:	Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt

F:	drivers/i2c/busses/i2c-mt65xx.c









MEDIATEK IOMMU DRIVER









M:	Yong Wu <yong.wu@mediatek.com>









L:	iommu@lists.linux-foundation.org









L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)









S:	Supported









F:	Documentation/devicetree/bindings/iommu/mediatek*









F:	drivers/iommu/mtk_iommu*









F:	include/dt-bindings/memory/mt*-port.h

















MEDIATEK JPEG DRIVER









M:	Rick Chang <rick.chang@mediatek.com>









M:	Bin Liu <bin.liu@mediatek.com>
































drivers/iommu/amd/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -10,6 +10,7 @@ config AMD_IOMMU







	select IOMMU_API









	select IOMMU_IOVA









	select IOMMU_DMA









	select IOMMU_IO_PGTABLE









	depends on X86_64 && PCI && ACPI && HAVE_CMPXCHG_DOUBLE









	help









	  With this option you can enable support for AMD IOMMU hardware in