Commit de24e553 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/vt-d: Simplify domain_context_mapping_one 



Get rid of the special cases for VM domains vs. non-VM
domains and simplify the code further to just handle the
hardware passthrough vs. page-table case.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 28ccce0d

drivers/iommu/intel-iommu.c

+26 −34
Original line number Diff line number Diff line
@@ -1942,24 +1942,21 @@ static int domain_context_mapping_one(struct dmar_domain *domain, 
		return 0;

	}



	context_clear_entry(context);



	id = domain->id;

	pgd = domain->pgd;



	if (domain_type_is_vm_or_si(domain)) {

		if (domain_type_is_vm(domain)) {

	id = __iommu_attach_domain(domain, iommu);

	if (id < 0) {

		spin_unlock_irqrestore(&iommu->lock, flags);

		pr_err("%s: No free domain ids\n", iommu->name);

		return -EFAULT;

	}

		}



		/* Skip top levels of page tables for

		 * iommu which has less agaw than default.

		 * Unnecessary for PT mode.

	context_clear_entry(context);

	context_set_domain_id(context, id);



	/*

	 * Skip top levels of page tables for iommu which has less agaw

	 * than default.  Unnecessary for PT mode.

	 */

	if (translation != CONTEXT_TT_PASS_THROUGH) {

		for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) {
@@ -1969,25 +1966,20 @@ static int domain_context_mapping_one(struct dmar_domain *domain, 
				return -ENOMEM;

			}

		}

		}

	}



	context_set_domain_id(context, id);



	if (translation != CONTEXT_TT_PASS_THROUGH) {

		info = iommu_support_dev_iotlb(domain, iommu, bus, devfn);

		translation = info ? CONTEXT_TT_DEV_IOTLB :

				     CONTEXT_TT_MULTI_LEVEL;

	}



		context_set_address_root(context, virt_to_phys(pgd));

		context_set_address_width(context, iommu->agaw);

	} else {

		/*

	 * In pass through mode, AW must be programmed to indicate the largest

	 * AGAW value supported by hardware. And ASR is ignored by hardware.

		 * In pass through mode, AW must be programmed to

		 * indicate the largest AGAW value supported by

		 * hardware. And ASR is ignored by hardware.

		 */

	if (unlikely(translation == CONTEXT_TT_PASS_THROUGH))

		context_set_address_width(context, iommu->msagaw);

	else {

		context_set_address_root(context, virt_to_phys(pgd));

		context_set_address_width(context, iommu->agaw);

	}



	context_set_translation_type(context, translation);