Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d140667 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IOMMU updates from Joerg Roedel:
 "This time with:

   - A new IOMMU-API call: iommu_map_sg() to map multiple non-contiguous
     pages into an IO address space with only one API call.  This allows
     certain optimizations in the IOMMU driver.

   - DMAR device hotplug in the Intel VT-d driver.  It is now possible
     to hotplug the IOMMU itself.

   - A new IOMMU driver for the Rockchip ARM platform.

   - Couple of cleanups and improvements in the OMAP IOMMU driver.

   - Nesting support for the ARM-SMMU driver.

   - Various other small cleanups and improvements.

  Please note that this time some branches were also pulled into other
  trees, like the DRI and the Tegra tree.  The VT-d branch was also
  pulled into tip/x86/apic.

  Some patches for the AMD IOMMUv2 driver are not in the IOMMU tree but
  were merged by Andrew (or finally ended up in the DRI tree)"

* tag 'iommu-updates-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (42 commits)
  iommu: Decouple iommu_map_sg from CPU page size
  iommu/vt-d: Fix an off-by-one bug in __domain_mapping()
  pci, ACPI, iommu: Enhance pci_root to support DMAR device hotplug
  iommu/vt-d: Enhance intel-iommu driver to support DMAR unit hotplug
  iommu/vt-d: Enhance error recovery in function intel_enable_irq_remapping()
  iommu/vt-d: Enhance intel_irq_remapping driver to support DMAR unit hotplug
  iommu/vt-d: Search for ACPI _DSM method for DMAR hotplug
  iommu/vt-d: Implement DMAR unit hotplug framework
  iommu/vt-d: Dynamically allocate and free seq_id for DMAR units
  iommu/vt-d: Introduce helper function dmar_walk_resources()
  iommu/arm-smmu: add support for DOMAIN_ATTR_NESTING attribute
  iommu/arm-smmu: Play nice on non-ARM/SMMU systems
  iommu/amd: remove compiler warning due to IOMMU_CAP_NOEXEC
  iommu/arm-smmu: add IOMMU_CAP_NOEXEC to the ARM SMMU driver
  iommu: add capability IOMMU_CAP_NOEXEC
  iommu/arm-smmu: change IOMMU_EXEC to IOMMU_NOEXEC
  iommu/amd: Fix accounting of device_state
  x86/vt-d: Fix incorrect bit operations in setting values
  iommu/rockchip: Allow to compile with COMPILE_TEST
  iommu/ipmmu-vmsa: Return proper error if devm_request_irq fails
  ...
parents 87c779ba 76771c93

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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Rockchip IOMMU

==============



A Rockchip DRM iommu translates io virtual addresses to physical addresses for

its master device.  Each slave device is bound to a single master device, and

shares its clocks, power domain and irq.



Required properties:

- compatible      : Should be "rockchip,iommu"

- reg             : Address space for the configuration registers

- interrupts      : Interrupt specifier for the IOMMU instance

- interrupt-names : Interrupt name for the IOMMU instance

- #iommu-cells    : Should be <0>.  This indicates the iommu is a

                    "single-master" device, and needs no additional information

                    to associate with its master device.  See:

                    Documentation/devicetree/bindings/iommu/iommu.txt



Example:



	vopl_mmu: iommu@ff940300 {

		compatible = "rockchip,iommu";

		reg = <0xff940300 0x100>;

		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vopl_mmu";

		#iommu-cells = <0>;

	};

drivers/acpi/pci_root.c

+14 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/pci.h>

#include <linux/pci-acpi.h>

#include <linux/pci-aspm.h>

#include <linux/dmar.h>

#include <linux/acpi.h>

#include <linux/slab.h>

#include <linux/dmi.h>
@@ -525,6 +526,7 @@ static int acpi_pci_root_add(struct acpi_device *device, 
	struct acpi_pci_root *root;

	acpi_handle handle = device->handle;

	int no_aspm = 0, clear_aspm = 0;

	bool hotadd = system_state != SYSTEM_BOOTING;



	root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);

	if (!root)
@@ -571,6 +573,11 @@ static int acpi_pci_root_add(struct acpi_device *device, 
	strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);

	device->driver_data = root;



	if (hotadd && dmar_device_add(handle)) {

		result = -ENXIO;

		goto end;

	}



	pr_info(PREFIX "%s [%s] (domain %04x %pR)\n",

	       acpi_device_name(device), acpi_device_bid(device),

	       root->segment, &root->secondary);
@@ -597,7 +604,7 @@ static int acpi_pci_root_add(struct acpi_device *device, 
			root->segment, (unsigned int)root->secondary.start);

		device->driver_data = NULL;

		result = -ENODEV;

		goto end;

		goto remove_dmar;

	}



	if (clear_aspm) {
@@ -611,7 +618,7 @@ static int acpi_pci_root_add(struct acpi_device *device, 
	if (device->wakeup.flags.run_wake)

		device_set_run_wake(root->bus->bridge, true);



	if (system_state != SYSTEM_BOOTING) {

	if (hotadd) {

		pcibios_resource_survey_bus(root->bus);

		pci_assign_unassigned_root_bus_resources(root->bus);

	}
@@ -621,6 +628,9 @@ static int acpi_pci_root_add(struct acpi_device *device, 
	pci_unlock_rescan_remove();

	return 1;



remove_dmar:

	if (hotadd)

		dmar_device_remove(handle);

end:

	kfree(root);

	return result;
@@ -639,6 +649,8 @@ static void acpi_pci_root_remove(struct acpi_device *device) 


	pci_remove_root_bus(root->bus);



	dmar_device_remove(device->handle);



	pci_unlock_rescan_remove();



	kfree(root);

drivers/iommu/Kconfig

+19 −6
Original line number Diff line number Diff line
@@ -144,14 +144,27 @@ config OMAP_IOMMU 
	select IOMMU_API



config OMAP_IOMMU_DEBUG

       tristate "Export OMAP IOMMU internals in DebugFS"

	bool "Export OMAP IOMMU internals in DebugFS"

	depends on OMAP_IOMMU && DEBUG_FS

       help

	---help---

	  Select this to see extensive information about

	  the internal state of OMAP IOMMU in debugfs.



	  Say N unless you know you need this.



config ROCKCHIP_IOMMU

	bool "Rockchip IOMMU Support"

	depends on ARM

	depends on ARCH_ROCKCHIP || COMPILE_TEST

	select IOMMU_API

	select ARM_DMA_USE_IOMMU

	help

	  Support for IOMMUs found on Rockchip rk32xx SOCs.

	  These IOMMUs allow virtualization of the address space used by most

	  cores within the multimedia subsystem.

	  Say Y here if you are using a Rockchip SoC that includes an IOMMU

	  device.



config TEGRA_IOMMU_GART

	bool "Tegra GART IOMMU Support"

	depends on ARCH_TEGRA_2x_SOC

drivers/iommu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o 
obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o

obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o

obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o

obj-$(CONFIG_OMAP_IOMMU) += omap-iommu2.o

obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o

obj-$(CONFIG_ROCKCHIP_IOMMU) += rockchip-iommu.o

obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o

obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o

obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o

drivers/iommu/amd_iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -3411,6 +3411,8 @@ static bool amd_iommu_capable(enum iommu_cap cap) 
		return true;

	case IOMMU_CAP_INTR_REMAP:

		return (irq_remapping_enabled == 1);

	case IOMMU_CAP_NOEXEC:

		return false;

	}



	return false;