Commit b09a75fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/iommu-2.6 

* git://git.infradead.org/iommu-2.6: (23 commits)
  intel-iommu: Disable PMRs after we enable translation, not before
  intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
  intel-iommu: Fix integer wrap on 32 bit kernels
  intel-iommu: Fix integer overflow in dma_pte_{clear_range,free_pagetable}()
  intel-iommu: Limit DOMAIN_MAX_PFN to fit in an 'unsigned long'
  intel-iommu: Fix kernel hang if interrupt remapping disabled in BIOS
  intel-iommu: Disallow interrupt remapping if not all ioapics covered
  intel-iommu: include linux/dmi.h to use dmi_ routines
  pci/dmar: correct off-by-one error in dmar_fault()
  intel-iommu: Cope with yet another BIOS screwup causing crashes
  intel-iommu: iommu init error path bug fixes
  intel-iommu: Mark functions with __init
  USB: Work around BIOS bugs by quiescing USB controllers earlier
  ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
  intel-iommu: make domain_add_dev_info() call domain_context_mapping()
  intel-iommu: Unify hardware and software passthrough support
  intel-iommu: Cope with broken HP DC7900 BIOS
  iommu=pt is a valid early param
  intel-iommu: double kfree()
  intel-iommu: Kill pointless intel_unmap_single() function
  ...

Fixed up trivial include lines conflict in drivers/pci/intel-iommu.c
parents cf63ff5f b94996c9

Documentation/Intel-IOMMU.txt

+1 −5
Original line number Diff line number Diff line
@@ -56,11 +56,7 @@ Graphics Problems? 
------------------

If you encounter issues with graphics devices, you can try adding

option intel_iommu=igfx_off to turn off the integrated graphics engine.



If it happens to be a PCI device included in the INCLUDE_ALL Engine,

then try enabling CONFIG_DMAR_GFX_WA to setup a 1-1 map. We hear

graphics drivers may be in process of using DMA api's in the near

future and at that time this option can be yanked out.

If this fixes anything, please ensure you file a bug reporting the problem.



Some exceptions to IOVA

-----------------------

arch/ia64/kernel/pci-swiotlb.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void __init swiotlb_dma_init(void) 


void __init pci_swiotlb_init(void)

{

	if (!iommu_detected || iommu_pass_through) {

	if (!iommu_detected) {

#ifdef CONFIG_IA64_GENERIC

		swiotlb = 1;

		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1901,7 +1901,7 @@ config DMAR_DEFAULT_ON 
config DMAR_BROKEN_GFX_WA

	def_bool n

	prompt "Workaround broken graphics drivers (going away soon)"

	depends on DMAR

	depends on DMAR && BROKEN

	---help---

	  Current Graphics drivers tend to use physical address

	  for DMA and avoid using DMA APIs. Setting this config

arch/x86/kernel/pci-swiotlb.c

+2 −3
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ void __init pci_swiotlb_init(void) 
{

	/* don't initialize swiotlb if iommu=off (no_iommu=1) */

#ifdef CONFIG_X86_64

	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||

		iommu_pass_through)

	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))

		swiotlb = 1;

#endif

	if (swiotlb_force)

drivers/pci/dmar.c

+29 −8
Original line number Diff line number Diff line
@@ -577,9 +577,6 @@ int __init dmar_table_init(void) 
		printk(KERN_INFO PREFIX "No ATSR found\n");

#endif



#ifdef CONFIG_INTR_REMAP

	parse_ioapics_under_ir();

#endif

	return 0;

}
@@ -639,20 +636,31 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) 
	iommu->cap = dmar_readq(iommu->reg + DMAR_CAP_REG);

	iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);



	if (iommu->cap == (uint64_t)-1 && iommu->ecap == (uint64_t)-1) {

		/* Promote an attitude of violence to a BIOS engineer today */

		WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"

		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",

		     drhd->reg_base_addr,

		     dmi_get_system_info(DMI_BIOS_VENDOR),

		     dmi_get_system_info(DMI_BIOS_VERSION),

		     dmi_get_system_info(DMI_PRODUCT_VERSION));

		goto err_unmap;

	}



#ifdef CONFIG_DMAR

	agaw = iommu_calculate_agaw(iommu);

	if (agaw < 0) {

		printk(KERN_ERR

		       "Cannot get a valid agaw for iommu (seq_id = %d)\n",

		       iommu->seq_id);

		goto error;

		goto err_unmap;

	}

	msagaw = iommu_calculate_max_sagaw(iommu);

	if (msagaw < 0) {

		printk(KERN_ERR

			"Cannot get a valid max agaw for iommu (seq_id = %d)\n",

			iommu->seq_id);

		goto error;

		goto err_unmap;

	}

#endif

	iommu->agaw = agaw;
@@ -672,7 +680,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) 
	}



	ver = readl(iommu->reg + DMAR_VER_REG);

	pr_debug("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n",

	pr_info("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n",

		(unsigned long long)drhd->reg_base_addr,

		DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver),

		(unsigned long long)iommu->cap,
@@ -682,6 +690,9 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) 


	drhd->iommu = iommu;

	return 0;



 err_unmap:

	iounmap(iommu->reg);

 error:

	kfree(iommu);

	return -1;
@@ -1219,7 +1230,7 @@ irqreturn_t dmar_fault(int irq, void *dev_id) 
				source_id, guest_addr);



		fault_index++;

		if (fault_index > cap_num_fault_regs(iommu->cap))

		if (fault_index >= cap_num_fault_regs(iommu->cap))

			fault_index = 0;

		spin_lock_irqsave(&iommu->register_lock, flag);

	}
@@ -1312,3 +1323,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu) 


	return 0;

}



/*

 * Check interrupt remapping support in DMAR table description.

 */

int dmar_ir_support(void)

{

	struct acpi_table_dmar *dmar;

	dmar = (struct acpi_table_dmar *)dmar_tbl;

	return dmar->flags & 0x1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE