IOMMU updates for 2.6.36
Hi Ingo,
The following changes since commit b37fa16e78d6f9790462b3181602a26b5af36260:
Linus Torvalds (1):
Linux 2.6.35-rc6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git iommu/2.6.36
Joerg Roedel (2):
x86/amd-iommu: Export cache-coherency capability
Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36
Kulikov Vasiliy (1):
x86/amd-iommu: Use for_each_pci_dev()
Tom Lyon (1):
iommu-api: Extension to check for interrupt remapping
arch/x86/kernel/amd_iommu.c | 8 ++++++-- drivers/pci/intel-iommu.c | 2 ++ include/linux/iommu.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-)
The changes are all minor. There is one cleanup patch, and two patches that extend the capabilities exported by the IOMMU-API. Please pull.
Joerg
PATCH 1/3 x86/amd-iommu: Use for_each_pci_dev()
From: Kulikov Vasiliy <[email protected]>
Use for_each_pci_dev() to simplify the code.
--- arch/x86/kernel/amd_iommu.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
arch/x86/kernel/amd_iommu.c +1 -2
@@ -2609,8 +2609,7 @@ int __init amd_iommu_init_passthrough(void) pt_domain->mode |=PAGE_MODE_NONE ; -while ((dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) { - +for_each_pci_dev (dev) {if (!check_device (&dev->dev))continue ;
Signature · 1 line
1.7.0.4
PATCH 2/3 iommu-api: Extension to check for interrupt remapping
In reply to Joerg RoedelFrom: Tom Lyon <[email protected]>
This patch allows IOMMU users to determine whether the hardware and software support safe, isolated interrupt remapping. Not all Intel IOMMUs have the hardware, and the software for AMD is not there yet.
--- drivers/pci/intel-iommu.c | 2 ++ include/linux/iommu.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-)
drivers/pci/intel-iommu.c +2 -0
@@ -3698,6 +3698,8 @@ static int intel_iommu_domain_has_cap(struct iommu_domain *domain,if (cap ==IOMMU_CAP_CACHE_COHERENCY )return dmar_domain->iommu_snooping; +if (cap ==IOMMU_CAP_INTR_REMAP ) +return intr_remapping_enabled;return 0 ; }
include/linux/iommu.h +1 -0
@@ -30,6 +30,7 @@ struct iommu_domain { };#define IOMMU_CAP_CACHE_COHERENCY 0x1 +#define IOMMU_CAP_INTR_REMAP 0x2/* isolates device intrs */ struct iommu_ops {int (*domain_init)(struct iommu_domain *domain);
Signature · 1 line
1.7.0.4
PATCH 3/3 x86/amd-iommu: Export cache-coherency capability
In reply to Joerg RoedelThis patch exports the capability of the AMD IOMMU to force cache coherency of DMA transactions through the IOMMU-API. This is required to disable some nasty hacks in KVM when this capability is not available.
--- arch/x86/kernel/amd_iommu.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/x86/kernel/amd_iommu.c +5 -0
@@ -2572,6 +2572,11 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,static int amd_iommu_domain_has_cap (struct iommu_domain *domain,unsigned long cap) { +switch (cap) { +case IOMMU_CAP_CACHE_COHERENCY : +return 1 ; + } +return 0 ; }
Signature · 1 line
1.7.0.4
Quoted 20 lines · Joerg Roedel
Hi Ingo,
The following changes since commit
b37fa16e78d6f9790462b3181602a26b5af36260:
Linus Torvalds (1):Linux 2.6.35-rc6are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.gitiommu/2.6.36Joerg Roedel (2):
x86/amd-iommu: Export cache-coherency capability
Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36Kulikov Vasiliy (1):
x86/amd-iommu: Use for_each_pci_dev()Tom Lyon (1):
iommu-api: Extension to check for interrupt remapping
Quoted 7 lines
arch/x86/kernel/amd_iommu.c | 8 ++++++-- drivers/pci/intel-iommu.c | 2 ++ include/linux/iommu.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-)The changes are all minor. There is one cleanup patch, and two patches that extend the capabilities exported by the IOMMU-API. Please pull.
Pulled, thanks Joerg!
Ingo