iommu/vt-d: Use pci_ats_supported() (da656a04) · Commits · 戴 / test

The pci_ats_supported() helper checks if a device supports ATS and is allowed to use it. By checking the ATS capability it also integrates the pci_ats_disabled() check from pci_ats_init(). Simplify the vt-d checks. Signed-off-by:

Jean-Philippe Brucker <jean-philippe@linaro.org> Acked-by:

Lu Baolu <baolu.lu@linux.intel.com> Link: https://lore.kernel.org/r/20200520152201.3309416-5-jean-philippe@linaro.org Signed-off-by:

Joerg Roedel <jroedel@suse.de>

drivers/iommu/intel-iommu.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -1454,8 +1454,7 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info)
		!pci_reset_pri(pdev) && !pci_enable_pri(pdev, 32))
		info->pri_enabled = 1;
		#endif
		if (!pdev->untrusted && info->ats_supported &&
		pci_ats_page_aligned(pdev) &&
		if (info->ats_supported && pci_ats_page_aligned(pdev) &&
		!pci_enable_ats(pdev, VTD_PAGE_SHIFT)) {
		info->ats_enabled = 1;
		domain_update_iotlb(info->domain);
		@@ -2611,10 +2610,8 @@ static struct dmar_domain dmar_insert_one_dev_info(struct intel_iommu iommu,
		if (dev && dev_is_pci(dev)) {
		struct pci_dev *pdev = to_pci_dev(info->dev);

		if (!pdev->untrusted &&
		!pci_ats_disabled() &&
		ecap_dev_iotlb_support(iommu->ecap) &&
		pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ATS) &&
		if (ecap_dev_iotlb_support(iommu->ecap) &&
		pci_ats_supported(pdev) &&
		dmar_find_matched_atsr_unit(pdev))
		info->ats_supported = 1;

Admin message