diff options
author | Alex Williamson <alex.williamson@redhat.com> | 2011-10-21 15:56:24 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-11-15 12:22:31 +0100 |
commit | bcb71abe7d4c5a0d0368c67da0a7def4fc73497a (patch) | |
tree | 3a043f872b234cb5c47cec1c01b4bbb69539fa0f /arch/ia64 | |
parent | 8fbdce659549d93dfb257ec4eabacf63a188e506 (diff) | |
download | linux-bcb71abe7d4c5a0d0368c67da0a7def4fc73497a.tar.gz linux-bcb71abe7d4c5a0d0368c67da0a7def4fc73497a.tar.bz2 linux-bcb71abe7d4c5a0d0368c67da0a7def4fc73497a.zip |
iommu: Add option to group multi-function devices
The option iommu=group_mf indicates the that the iommu driver should
expose all functions of a multi-function PCI device as the same
iommu_device_group. This is useful for disallowing individual functions
being exposed as independent devices to userspace as there are often
hidden dependencies. Virtual functions are not affected by this option.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/include/asm/iommu.h | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/pci-dma.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h index 105c93b00b1b..b6a809fa2995 100644 --- a/arch/ia64/include/asm/iommu.h +++ b/arch/ia64/include/asm/iommu.h @@ -11,10 +11,12 @@ extern void no_iommu_init(void); extern int force_iommu, no_iommu; extern int iommu_pass_through; extern int iommu_detected; +extern int iommu_group_mf; #else #define iommu_pass_through (0) #define no_iommu (1) #define iommu_detected (0) +#define iommu_group_mf (0) #endif extern void iommu_dma_init(void); extern void machvec_init(const char *name); diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index c16162c70860..eb1175720050 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c @@ -33,6 +33,7 @@ int force_iommu __read_mostly; #endif int iommu_pass_through; +int iommu_group_mf; /* Dummy device used for NULL arguments (normally ISA). Better would be probably a smaller DMA mask, but this is bug-to-bug compatible |