iommu/vt-d: Remove pdev from iommu_no_mapping() (ecb509ec) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/iommu/intel-iommu.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -2902,10 +2902,9 @@ static int iommu_dummy(struct device *dev)
		return dev->archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;
		}

		/* Check if the pdev needs to go through non-identity map and unmap process.*/
		/* Check if the dev needs to go through non-identity map and unmap process.*/
		static int iommu_no_mapping(struct device *dev)
		{
		struct pci_dev *pdev;
		int found;

		if (unlikely(!dev_is_pci(dev)))
		@@ -2917,10 +2916,9 @@ static int iommu_no_mapping(struct device *dev)
		if (!iommu_identity_mapping)
		return 0;

		pdev = to_pci_dev(dev);
		found = identity_mapping(dev);
		if (found) {
		if (iommu_should_identity_map(&pdev->dev, 0))
		if (iommu_should_identity_map(dev, 0))
		return 1;
		else {
		/*
		@@ -2929,7 +2927,7 @@ static int iommu_no_mapping(struct device *dev)
		*/
		domain_remove_one_dev_info(si_domain, dev);
		printk(KERN_INFO "32bit %s uses non-identity mapping\n",
		pci_name(pdev));
		dev_name(dev));
		return 0;
		}
		} else {
		@@ -2937,7 +2935,7 @@ static int iommu_no_mapping(struct device *dev)
		* In case of a detached 64 bit DMA device from vm, the device
		* is put into si_domain for identity mapping.
		*/
		if (iommu_should_identity_map(&pdev->dev, 0)) {
		if (iommu_should_identity_map(dev, 0)) {
		int ret;
		ret = domain_add_dev_info(si_domain, dev,
		hw_pass_through ?
		@@ -2945,7 +2943,7 @@ static int iommu_no_mapping(struct device *dev)
		CONTEXT_TT_MULTI_LEVEL);
		if (!ret) {
		printk(KERN_INFO "64bit %s uses identity mapping\n",
		pci_name(pdev));
		dev_name(dev));
		return 1;
		}
		}