linux-toradex.git/drivers/iommu/iommu.c, branch v3.4.1

Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next

2012-01-09T12:06:28+00:00

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/intel-iommu.c
	include/linux/iommu.h

Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next

2012-01-09T12:04:05+00:00

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c

iommu: Initialize domain->handler in iommu_domain_alloc()

2011-12-16T14:05:13+00:00

Since it is not guaranteed that an iommu driver initializes in its
domain_init() function, it must be initialized with NULL to prevent
calling a function in an arbitrary location when iommu fault occurred.

Signed-off-by: KyongHo Cho 
Signed-off-by: Joerg Roedel

iommu: Add iommu_device_group callback and iommu_group sysfs entry

2011-11-15T11:22:23+00:00

An IOMMU group is a set of devices for which the IOMMU cannot
distinguish transactions.  For PCI devices, a group often occurs
when a PCI bridge is involved.  Transactions from any device
behind the bridge appear to be sourced from the bridge itself.
We leave it to the IOMMU driver to define the grouping restraints
for their platform.

Using this new interface, the group for a device can be retrieved
using the iommu_device_group() callback.  Users will compare the
value returned against the value returned for other devices to
determine whether they are part of the same group.  Devices with
no group are not translated by the IOMMU.  There should be no
expectations about the group numbers as they may be arbitrarily
assigned by the IOMMU driver and may not be persistent across boots.

We also provide a sysfs interface to the group numbers here so
that userspace can understand IOMMU dependencies between devices
for managing safe, userspace drivers.

[Some code changes by Joerg Roedel ]

Signed-off-by: Alex Williamson 
Signed-off-by: Joerg Roedel

iommu/core: remove the temporary pgsize settings

2011-11-10T10:40:38+00:00

Now that all IOMMU drivers are exporting their supported pgsizes,
we can remove the default pgsize settings in register_iommu().

Signed-off-by: Ohad Ben-Cohen 
Signed-off-by: Joerg Roedel

iommu/core: split mapping to page sizes as supported by the hardware

2011-11-10T10:40:37+00:00

When mapping a memory region, split it to page sizes as supported
by the iommu hardware. Always prefer bigger pages, when possible,
in order to reduce the TLB pressure.

The logic to do that is now added to the IOMMU core, so neither the iommu
drivers themselves nor users of the IOMMU API have to duplicate it.

This allows a more lenient granularity of mappings; traditionally the
IOMMU API took 'order' (of a page) as a mapping size, and directly let
the low level iommu drivers handle the mapping, but now that the IOMMU
core can split arbitrary memory regions into pages, we can remove this
limitation, so users don't have to split those regions by themselves.

Currently the supported page sizes are advertised once and they then
remain static. That works well for OMAP and MSM but it would probably
not fly well with intel's hardware, where the page size capabilities
seem to have the potential to be different between several DMA
remapping devices.

register_iommu() currently sets a default pgsize behavior, so we can convert
the IOMMU drivers in subsequent patches. After all the drivers
are converted, the temporary default settings will be removed.

Mainline users of the IOMMU API (kvm and omap-iovmm) are adopted
to deal with bytes instead of page order.

Many thanks to Joerg Roedel  for significant review!

Signed-off-by: Ohad Ben-Cohen 
Cc: David Brown 
Cc: David Woodhouse 
Cc: Joerg Roedel 
Cc: Stepan Moskovchenko 
Cc: KyongHo Cho 
Cc: Hiroshi DOYU 
Cc: Laurent Pinchart 
Cc: kvm@vger.kernel.org
Signed-off-by: Joerg Roedel

iommu/core: stop converting bytes to page order back and forth

2011-11-10T10:40:37+00:00

Express sizes in bytes rather than in page order, to eliminate the
size->order->size conversions we have whenever the IOMMU API is calling
the low level drivers' map/unmap methods.

Adopt all existing drivers.

Signed-off-by: Ohad Ben-Cohen 
Cc: David Brown 
Cc: David Woodhouse 
Cc: Joerg Roedel 
Cc: Stepan Moskovchenko 
Cc: KyongHo Cho 
Cc: Hiroshi DOYU 
Cc: Laurent Pinchart 
Signed-off-by: Joerg Roedel

Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next

2011-10-21T12:38:55+00:00

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/iommu.c

iommu/core: Remove global iommu_ops and register_iommu

2011-10-21T12:37:23+00:00

With all IOMMU drivers being converted to bus_set_iommu the
global iommu_ops are no longer required. The same is true
for the deprecated register_iommu function.

Signed-off-by: Joerg Roedel

iommu/core: Use bus->iommu_ops in the iommu-api

2011-10-21T12:37:21+00:00

Use the per-bus iommu-ops in the functions of the iommu-api
instead of the global iommu_ops.

Signed-off-by: Joerg Roedel