intel-iommu: make domain_add_dev_info() call domain_context_mapping() (5fe60f4e) · Commits · 戴 / test

drivers/pci/intel-iommu.c

+15 −20

Original line number	Original line	Diff line number	Diff line
	@@ -2094,15 +2094,23 @@ static int identity_mapping(struct pci_dev *pdev)
	}		}

	static int domain_add_dev_info(struct dmar_domain *domain,		static int domain_add_dev_info(struct dmar_domain *domain,
	struct pci_dev *pdev)		struct pci_dev *pdev,
			int translation)
	{		{
	struct device_domain_info *info;		struct device_domain_info *info;
	unsigned long flags;		unsigned long flags;
			int ret;

	info = alloc_devinfo_mem();		info = alloc_devinfo_mem();
	if (!info)		if (!info)
	return -ENOMEM;		return -ENOMEM;

			ret = domain_context_mapping(domain, pdev, translation);
			if (ret) {
			free_devinfo_mem(info);
			return ret;
			}

	info->segment = pci_domain_nr(pdev->bus);		info->segment = pci_domain_nr(pdev->bus);
	info->bus = pdev->bus->number;		info->bus = pdev->bus->number;
	info->devfn = pdev->devfn;		info->devfn = pdev->devfn;
	@@ -2173,15 +2181,11 @@ static int iommu_prepare_static_identity_mapping(int hw)
	printk(KERN_INFO "IOMMU: %s identity mapping for device %s\n",		printk(KERN_INFO "IOMMU: %s identity mapping for device %s\n",
	hw ? "hardware" : "software", pci_name(pdev));		hw ? "hardware" : "software", pci_name(pdev));

	ret = domain_context_mapping(si_domain, pdev,		ret = domain_add_dev_info(si_domain, pdev,
	hw ? CONTEXT_TT_PASS_THROUGH :		hw ? CONTEXT_TT_PASS_THROUGH :
	CONTEXT_TT_MULTI_LEVEL);		CONTEXT_TT_MULTI_LEVEL);
	if (ret)		if (ret)
	return ret;		return ret;

	ret = domain_add_dev_info(si_domain, pdev);
	if (ret)
	return ret;
	}		}
	}		}

	@@ -2510,10 +2514,7 @@ static int iommu_no_mapping(struct device *dev)
	*/		*/
	if (iommu_should_identity_map(pdev, 0)) {		if (iommu_should_identity_map(pdev, 0)) {
	int ret;		int ret;
	ret = domain_add_dev_info(si_domain, pdev);		ret = domain_add_dev_info(si_domain, pdev,
	if (ret)
	return 0;
	ret = domain_context_mapping(si_domain, pdev,
	hw_pass_through ?		hw_pass_through ?
	CONTEXT_TT_PASS_THROUGH :		CONTEXT_TT_PASS_THROUGH :
	CONTEXT_TT_MULTI_LEVEL);		CONTEXT_TT_MULTI_LEVEL);
	@@ -3486,7 +3487,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
	struct intel_iommu *iommu;		struct intel_iommu *iommu;
	int addr_width;		int addr_width;
	u64 end;		u64 end;
	int ret;

	/* normally pdev is not mapped */		/* normally pdev is not mapped */
	if (unlikely(domain_context_mapped(pdev))) {		if (unlikely(domain_context_mapped(pdev))) {
	@@ -3518,12 +3518,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
	return -EFAULT;		return -EFAULT;
	}		}

	ret = domain_add_dev_info(dmar_domain, pdev);		return domain_add_dev_info(dmar_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
	if (ret)
	return ret;

	ret = domain_context_mapping(dmar_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
	return ret;
	}		}

	static void intel_iommu_detach_device(struct iommu_domain *domain,		static void intel_iommu_detach_device(struct iommu_domain *domain,

Admin message