linux-next: manual merge of the dwmw2-iommu tree with the x86 tree
Subsystems (3)
Hi David,
Today's linux-next merge of the dwmw2-iommu tree got a conflict in drivers/pci/intel-iommu.c between commit 937582382c71b75b29fbb92615629494e1a05ac0 ("x86, intr-remap: enable interrupt remapping early") from the x86 tree and commit 4ed0d3e6c64cfd9ba4ceb2099b10d1cf8ece4320 ("Intel IOMMU Pass Through Support") from the dwmw2-iommu tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary.
Signature · 52 lines
Cheers, Stephen Rothwell [email protected] diff --cc drivers/pci/intel-iommu.c index 9ce8f07,1312182..0000000 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@@ -1968,30 -2025,23 +2025,15 @@@ static int __init init_dmars(void } } -#ifdef CONFIG_INTR_REMAP - if (!intr_remapping_enabled) { - ret = enable_intr_remapping(0); - if (ret) - printk(KERN_ERR - "IOMMU: enable interrupt remapping failed\n"); - } -#endif /* - * For each rmrr - * for each dev attached to rmrr - * do - * locate drhd for dev, alloc domain for dev - * allocate free domain - * allocate page table entries for rmrr - * if context not allocated for bus - * allocate and init context - * set present in root table for this bus - * init context with domain, translation etc - * endfor - * endfor + * If pass through is set and enabled, context entries of all pci + * devices are intialized by pass through translation type. */ - for_each_rmrr_units(rmrr) { - for (i = 0; i < rmrr->devices_cnt; i++) { - pdev = rmrr->devices[i]; - /* some BIOS lists non-exist devices in DMAR table */ - if (!pdev) - continue; - ret = iommu_prepare_rmrr_dev(rmrr, pdev); - if (ret) - printk(KERN_ERR - "IOMMU: mapping reserved region failed\n"); + if (iommu_pass_through) { + ret = init_context_pass_through(); + if (ret) { + printk(KERN_ERR "IOMMU: Pass through init failed.\n"); + iommu_pass_through = 0; } }
PATCH 1/1 Fix for "undefined iommu_pass_through" compiling error
When CONFIG_DMAR is off, linux-next or iomm-2.6.git kernel build complains "undefined iommu_pass_through" error.
This patch moves iommu_pass_through beyond CONFIG_DMAR and fixes this issue.
Signed-off-by Fenghua Yu <[email protected]>
Acked-by Tony Luck <[email protected]>
---
arch/ia64/kernel/dma-mapping.c | 2 ++ arch/x86/kernel/pci-dma.c | 2 ++ drivers/pci/intel-iommu.c | 1 - 3 files changed, 4 insertions(+), 1 deletion(-)
arch/ia64/kernel/dma-mapping.c +2 -0
@@ -3,6 +3,8 @@/* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected__read_mostly ; +int iommu_pass_through; +struct dma_map_ops *dma_ops;EXPORT_SYMBOL (dma_ops);
arch/x86/kernel/pci-dma.c +2 -0
@@ -32,6 +32,8 @@ int no_iommu __read_mostly;/* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected__read_mostly =0 ; +int iommu_pass_through; +dma_addr_t bad_dma_address__read_mostly =0 ;EXPORT_SYMBOL (bad_dma_address);
drivers/pci/intel-iommu.c +0 -1
@@ -288,7 +288,6 @@ int dmar_disabled = 1;static int __initdata dmar_map_gfx =1 ;static int dmar_forcedac;static int intel_iommu_strict; -int iommu_pass_through;#define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1))static DEFINE_SPINLOCK (device_domain_lock);