mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 22:02:28 +00:00
6664565681
A few updates this time, most important and exiciting (to me) is:
* The new ARM SMMU driver. This is a common IOMMU driver that will
hopefully be used in a lot of upcoming ARM chips. So the mess in the
past where every SOC had its own IOMMU will be over.
Besides that:
* Some important fixes in the IOMMU unmap path. There are fixes in the
common code and also in the AMD IOMMU driver.
* Other random fixes
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJR2nDJAAoJECvwRC2XARrjumoQAKOW6D+45grEWsS4Ashf8GKe
PYzaMgmcBZdg+wGTVdxDI95KtYHq0xzKF+j5Wccy4qIOL8Ca38eqt5evjdYc0LYC
NWDPbuwoOHldDF6DoAZxhl1O0vguAA7h9WRKCvDDuNb9BUyEmcNOfBUSddgLhyOX
+PzLZ5s7bqIIOZ7BCMTn8nMC1wi8dq6l3OOGkvlwVm45X9cQ0LCm2DY3r8cvlLEW
FobxVk3B8qo0eE2NEjf4WZbScjPlk5sn4EIhA/5BrDKRZCbe9qL84HRGKD2zya78
bZlKiLyYkdI7PZbfp0qiFyLVnIA3ILPUUwiUgEnXKaQskiQsHE4VI66j2qiG0wym
bTK+MYc+8Ys6GDGrKRa7/yEN6N8dc06cai+UWiAemie8HhsP1lOHSDhmiznyx29i
s5u0HSrQq61epa3Juz31Ou5n6x1QU6zq6tSA6muXmPq5Md8DnwaL63nd+9WXHdns
te64asNo5Wn1ZXA24Gv51NlGRfRmUYvp9inPBBqjRggNCQdimynWYwVJfwQ7AjjB
RXfCxpjJZBsK661KrRvwAJKW1Q2RBHJCAaGSchkqRgcNRW/cTzE7JSg/wQ4XrdoS
X0uxl8Jobp348885FIveCGmZL5Lcq3EMtiGRhvNR1Mc9oeGhEijC31ve8pydvKrT
OF02muOXJ7matfR+dmkz
=oJr3
-----END PGP SIGNATURE-----
Merge tag 'iommu-updates-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU updates from Joerg Roedel:
"A few updates this time, most important and exiciting (to me) is:
- The new ARM SMMU driver. This is a common IOMMU driver that will
hopefully be used in a lot of upcoming ARM chips. So the mess in
the past where every SOC had its own IOMMU will be over.
Besides that:
- Some important fixes in the IOMMU unmap path. There are fixes in
the common code and also in the AMD IOMMU driver.
- Other random fixes"
* tag 'iommu-updates-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
MAINTAINERS: add entry for ARM system MMU driver
iommu/arm: Add support for ARM Ltd. System MMU architecture
documentation/iommu: Add description of ARM System MMU binding
iommu: Use %pa and %zx instead of casting
iommu/amd: Only unmap large pages from the first pte
iommu: Fix compiler warning on pr_debug
iommu/amd: Fix memory leak in free_pagetable
iommu: Split iommu_unmaps
iommu/{vt-d,amd}: Remove multifunction assumption around grouping
iommu/omap: fix checkpatch warnings in omap iommu code
iommu/omap: fix printk formats for dma_addr_t
iommu/vt-d: DMAR reporting table needs at least one DRHD
iommu/vt-d: Downgrade the warning if enabling irq remapping fails
286 lines
8.3 KiB
Plaintext
286 lines
8.3 KiB
Plaintext
# IOMMU_API always gets selected by whoever wants it.
|
|
config IOMMU_API
|
|
bool
|
|
|
|
menuconfig IOMMU_SUPPORT
|
|
bool "IOMMU Hardware Support"
|
|
default y
|
|
---help---
|
|
Say Y here if you want to compile device drivers for IO Memory
|
|
Management Units into the kernel. These devices usually allow to
|
|
remap DMA requests and/or remap interrupts from other devices on the
|
|
system.
|
|
|
|
if IOMMU_SUPPORT
|
|
|
|
config OF_IOMMU
|
|
def_bool y
|
|
depends on OF
|
|
|
|
# MSM IOMMU support
|
|
config MSM_IOMMU
|
|
bool "MSM IOMMU Support"
|
|
depends on ARCH_MSM8X60 || ARCH_MSM8960
|
|
select IOMMU_API
|
|
help
|
|
Support for the IOMMUs found on certain Qualcomm SOCs.
|
|
These IOMMUs allow virtualization of the address space used by most
|
|
cores within the multimedia subsystem.
|
|
|
|
If unsure, say N here.
|
|
|
|
config IOMMU_PGTABLES_L2
|
|
def_bool y
|
|
depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n
|
|
|
|
# AMD IOMMU support
|
|
config AMD_IOMMU
|
|
bool "AMD IOMMU support"
|
|
select SWIOTLB
|
|
select PCI_MSI
|
|
select PCI_ATS
|
|
select PCI_PRI
|
|
select PCI_PASID
|
|
select IOMMU_API
|
|
depends on X86_64 && PCI && ACPI && X86_IO_APIC
|
|
---help---
|
|
With this option you can enable support for AMD IOMMU hardware in
|
|
your system. An IOMMU is a hardware component which provides
|
|
remapping of DMA memory accesses from devices. With an AMD IOMMU you
|
|
can isolate the DMA memory of different devices and protect the
|
|
system from misbehaving device drivers or hardware.
|
|
|
|
You can find out if your system has an AMD IOMMU if you look into
|
|
your BIOS for an option to enable it or if you have an IVRS ACPI
|
|
table.
|
|
|
|
config AMD_IOMMU_STATS
|
|
bool "Export AMD IOMMU statistics to debugfs"
|
|
depends on AMD_IOMMU
|
|
select DEBUG_FS
|
|
---help---
|
|
This option enables code in the AMD IOMMU driver to collect various
|
|
statistics about whats happening in the driver and exports that
|
|
information to userspace via debugfs.
|
|
If unsure, say N.
|
|
|
|
config AMD_IOMMU_V2
|
|
tristate "AMD IOMMU Version 2 driver"
|
|
depends on AMD_IOMMU && PROFILING
|
|
select MMU_NOTIFIER
|
|
---help---
|
|
This option enables support for the AMD IOMMUv2 features of the IOMMU
|
|
hardware. Select this option if you want to use devices that support
|
|
the PCI PRI and PASID interface.
|
|
|
|
# Intel IOMMU support
|
|
config DMAR_TABLE
|
|
bool
|
|
|
|
config INTEL_IOMMU
|
|
bool "Support for Intel IOMMU using DMA Remapping Devices"
|
|
depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)
|
|
select IOMMU_API
|
|
select DMAR_TABLE
|
|
help
|
|
DMA remapping (DMAR) devices support enables independent address
|
|
translations for Direct Memory Access (DMA) from devices.
|
|
These DMA remapping devices are reported via ACPI tables
|
|
and include PCI device scope covered by these DMA
|
|
remapping devices.
|
|
|
|
config INTEL_IOMMU_DEFAULT_ON
|
|
def_bool y
|
|
prompt "Enable Intel DMA Remapping Devices by default"
|
|
depends on INTEL_IOMMU
|
|
help
|
|
Selecting this option will enable a DMAR device at boot time if
|
|
one is found. If this option is not selected, DMAR support can
|
|
be enabled by passing intel_iommu=on to the kernel.
|
|
|
|
config INTEL_IOMMU_BROKEN_GFX_WA
|
|
bool "Workaround broken graphics drivers (going away soon)"
|
|
depends on INTEL_IOMMU && BROKEN && X86
|
|
---help---
|
|
Current Graphics drivers tend to use physical address
|
|
for DMA and avoid using DMA APIs. Setting this config
|
|
option permits the IOMMU driver to set a unity map for
|
|
all the OS-visible memory. Hence the driver can continue
|
|
to use physical addresses for DMA, at least until this
|
|
option is removed in the 2.6.32 kernel.
|
|
|
|
config INTEL_IOMMU_FLOPPY_WA
|
|
def_bool y
|
|
depends on INTEL_IOMMU && X86
|
|
---help---
|
|
Floppy disk drivers are known to bypass DMA API calls
|
|
thereby failing to work when IOMMU is enabled. This
|
|
workaround will setup a 1:1 mapping for the first
|
|
16MiB to make floppy (an ISA device) work.
|
|
|
|
config IRQ_REMAP
|
|
bool "Support for Interrupt Remapping"
|
|
depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI
|
|
select DMAR_TABLE
|
|
---help---
|
|
Supports Interrupt remapping for IO-APIC and MSI devices.
|
|
To use x2apic mode in the CPU's which support x2APIC enhancements or
|
|
to support platforms with CPU's having > 8 bit APIC ID, say Y.
|
|
|
|
# OMAP IOMMU support
|
|
config OMAP_IOMMU
|
|
bool "OMAP IOMMU Support"
|
|
depends on ARCH_OMAP2PLUS
|
|
select IOMMU_API
|
|
|
|
config OMAP_IOVMM
|
|
tristate "OMAP IO Virtual Memory Manager Support"
|
|
depends on OMAP_IOMMU
|
|
|
|
config OMAP_IOMMU_DEBUG
|
|
tristate "Export OMAP IOMMU/IOVMM internals in DebugFS"
|
|
depends on OMAP_IOVMM && DEBUG_FS
|
|
help
|
|
Select this to see extensive information about
|
|
the internal state of OMAP IOMMU/IOVMM in debugfs.
|
|
|
|
Say N unless you know you need this.
|
|
|
|
config TEGRA_IOMMU_GART
|
|
bool "Tegra GART IOMMU Support"
|
|
depends on ARCH_TEGRA_2x_SOC
|
|
select IOMMU_API
|
|
help
|
|
Enables support for remapping discontiguous physical memory
|
|
shared with the operating system into contiguous I/O virtual
|
|
space through the GART (Graphics Address Relocation Table)
|
|
hardware included on Tegra SoCs.
|
|
|
|
config TEGRA_IOMMU_SMMU
|
|
bool "Tegra SMMU IOMMU Support"
|
|
depends on ARCH_TEGRA && TEGRA_AHB
|
|
select IOMMU_API
|
|
help
|
|
Enables support for remapping discontiguous physical memory
|
|
shared with the operating system into contiguous I/O virtual
|
|
space through the SMMU (System Memory Management Unit)
|
|
hardware included on Tegra SoCs.
|
|
|
|
config EXYNOS_IOMMU
|
|
bool "Exynos IOMMU Support"
|
|
depends on ARCH_EXYNOS && EXYNOS_DEV_SYSMMU
|
|
select IOMMU_API
|
|
help
|
|
Support for the IOMMU(System MMU) of Samsung Exynos application
|
|
processor family. This enables H/W multimedia accellerators to see
|
|
non-linear physical memory chunks as a linear memory in their
|
|
address spaces
|
|
|
|
If unsure, say N here.
|
|
|
|
config EXYNOS_IOMMU_DEBUG
|
|
bool "Debugging log for Exynos IOMMU"
|
|
depends on EXYNOS_IOMMU
|
|
help
|
|
Select this to see the detailed log message that shows what
|
|
happens in the IOMMU driver
|
|
|
|
Say N unless you need kernel log message for IOMMU debugging
|
|
|
|
config SHMOBILE_IPMMU
|
|
bool
|
|
|
|
config SHMOBILE_IPMMU_TLB
|
|
bool
|
|
|
|
config SHMOBILE_IOMMU
|
|
bool "IOMMU for Renesas IPMMU/IPMMUI"
|
|
default n
|
|
depends on (ARM && ARCH_SHMOBILE)
|
|
select IOMMU_API
|
|
select ARM_DMA_USE_IOMMU
|
|
select SHMOBILE_IPMMU
|
|
select SHMOBILE_IPMMU_TLB
|
|
help
|
|
Support for Renesas IPMMU/IPMMUI. This option enables
|
|
remapping of DMA memory accesses from all of the IP blocks
|
|
on the ICB.
|
|
|
|
Warning: Drivers (including userspace drivers of UIO
|
|
devices) of the IP blocks on the ICB *must* use addresses
|
|
allocated from the IPMMU (iova) for DMA with this option
|
|
enabled.
|
|
|
|
If unsure, say N.
|
|
|
|
choice
|
|
prompt "IPMMU/IPMMUI address space size"
|
|
default SHMOBILE_IOMMU_ADDRSIZE_2048MB
|
|
depends on SHMOBILE_IOMMU
|
|
help
|
|
This option sets IPMMU/IPMMUI address space size by
|
|
adjusting the 1st level page table size. The page table size
|
|
is calculated as follows:
|
|
|
|
page table size = number of page table entries * 4 bytes
|
|
number of page table entries = address space size / 1 MiB
|
|
|
|
For example, when the address space size is 2048 MiB, the
|
|
1st level page table size is 8192 bytes.
|
|
|
|
config SHMOBILE_IOMMU_ADDRSIZE_2048MB
|
|
bool "2 GiB"
|
|
|
|
config SHMOBILE_IOMMU_ADDRSIZE_1024MB
|
|
bool "1 GiB"
|
|
|
|
config SHMOBILE_IOMMU_ADDRSIZE_512MB
|
|
bool "512 MiB"
|
|
|
|
config SHMOBILE_IOMMU_ADDRSIZE_256MB
|
|
bool "256 MiB"
|
|
|
|
config SHMOBILE_IOMMU_ADDRSIZE_128MB
|
|
bool "128 MiB"
|
|
|
|
config SHMOBILE_IOMMU_ADDRSIZE_64MB
|
|
bool "64 MiB"
|
|
|
|
config SHMOBILE_IOMMU_ADDRSIZE_32MB
|
|
bool "32 MiB"
|
|
|
|
endchoice
|
|
|
|
config SHMOBILE_IOMMU_L1SIZE
|
|
int
|
|
default 8192 if SHMOBILE_IOMMU_ADDRSIZE_2048MB
|
|
default 4096 if SHMOBILE_IOMMU_ADDRSIZE_1024MB
|
|
default 2048 if SHMOBILE_IOMMU_ADDRSIZE_512MB
|
|
default 1024 if SHMOBILE_IOMMU_ADDRSIZE_256MB
|
|
default 512 if SHMOBILE_IOMMU_ADDRSIZE_128MB
|
|
default 256 if SHMOBILE_IOMMU_ADDRSIZE_64MB
|
|
default 128 if SHMOBILE_IOMMU_ADDRSIZE_32MB
|
|
|
|
config SPAPR_TCE_IOMMU
|
|
bool "sPAPR TCE IOMMU Support"
|
|
depends on PPC_POWERNV || PPC_PSERIES
|
|
select IOMMU_API
|
|
help
|
|
Enables bits of IOMMU API required by VFIO. The iommu_ops
|
|
is not implemented as it is not necessary for VFIO.
|
|
|
|
config ARM_SMMU
|
|
bool "ARM Ltd. System MMU (SMMU) Support"
|
|
depends on ARM64 || (ARM_LPAE && OF)
|
|
select IOMMU_API
|
|
select ARM_DMA_USE_IOMMU if ARM
|
|
help
|
|
Support for implementations of the ARM System MMU architecture
|
|
versions 1 and 2. The driver supports both v7l and v8l table
|
|
formats with 4k and 64k page sizes.
|
|
|
|
Say Y here if your SoC includes an IOMMU device implementing
|
|
the ARM SMMU architecture.
|
|
|
|
endif # IOMMU_SUPPORT
|