On Fri, Apr 23, 2021 at 01:38:31PM +0200, Jean-Philippe Brucker wrote: > Add a driver for the ACPI VIOT table, which provides topology > information for para-virtual platforms. Enable virtio-iommu on > non-devicetree platforms, including x86. Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx> Mostly ACPI stuff so I assume it's best to merge through that tree. > Since v1 [1]: > * The VIOT header definitions have been picked for v5.13 > * Share more code with IORT. Patches 1 and 2 extract the common code > from IORT. > * Simplify the VIOT driver. Use the existing fwnode infrastructure > instead of adding hooks to the IOMMU driver. > > You can find a QEMU implementation at [2], with extra support for > testing all VIOT nodes including MMIO-based endpoints and IOMMU. This > series, based on linux-next, is at [3] > > [1] https://lore.kernel.org/linux-iommu/20210316191652.3401335-1-jean-philippe@xxxxxxxxxx/ > [2] https://jpbrucker.net/git/qemu/log/?h=virtio-iommu/acpi > [3] https://jpbrucker.net/git/linux/log/?h=virtio-iommu/acpi > > Jean-Philippe Brucker (6): > ACPI: arm64: Move DMA setup operations out of IORT > ACPI: Move IOMMU setup code out of IORT > ACPI: Add driver for the VIOT table > iommu/dma: Pass address limit rather than size to > iommu_setup_dma_ops() > iommu/dma: Simplify calls to iommu_setup_dma_ops() > iommu/virtio: Enable x86 support > > drivers/acpi/Kconfig | 3 + > drivers/iommu/Kconfig | 4 +- > drivers/acpi/Makefile | 2 + > drivers/acpi/arm64/Makefile | 1 + > include/acpi/acpi_bus.h | 3 + > include/linux/acpi.h | 3 + > include/linux/acpi_iort.h | 14 +- > include/linux/acpi_viot.h | 19 ++ > include/linux/dma-iommu.h | 4 +- > arch/arm64/mm/dma-mapping.c | 2 +- > drivers/acpi/arm64/dma.c | 50 +++++ > drivers/acpi/arm64/iort.c | 129 ++----------- > drivers/acpi/bus.c | 2 + > drivers/acpi/scan.c | 60 +++++- > drivers/acpi/viot.c | 350 +++++++++++++++++++++++++++++++++++ > drivers/iommu/amd/iommu.c | 9 +- > drivers/iommu/dma-iommu.c | 17 +- > drivers/iommu/intel/iommu.c | 10 +- > drivers/iommu/virtio-iommu.c | 8 + > MAINTAINERS | 8 + > 20 files changed, 548 insertions(+), 150 deletions(-) > create mode 100644 include/linux/acpi_viot.h > create mode 100644 drivers/acpi/arm64/dma.c > create mode 100644 drivers/acpi/viot.c > > -- > 2.31.1