iommu/vt-d: Take CONFIG_PCI_ATS into account

KAGA-KOKO · KAGA-KOKO · commit 8986f223bd77 · 2020-11-16T13:57:46.000+01:00
pci_dev::physfn is only available when CONFIG_PCI_ATS is set. The recent fix for the irqdomain rework missed that dependency which makes the build fail when CONFIG_PCI_ATS=n. Add the necessary #ifdeffery. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Fixes: ff82872 ("iommu/vt-d: Cure VF irqdomain hickup") Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Joerg Roedel <joro@8bytes.org>
diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
@@ -335,7 +335,9 @@ static void  dmar_pci_bus_del_dev(struct dmar_pci_notify_info *info)
 
 static inline void vf_inherit_msi_domain(struct pci_dev *pdev)
 {
+#ifdef CONFIG_PCI_ATS
 	dev_set_msi_domain(&pdev->dev, dev_get_msi_domain(&pdev->physfn->dev));
+#endif
 }
 
 static int dmar_pci_bus_notifier(struct notifier_block *nb,

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,9 @@ static void dmar_pci_bus_del_dev(struct dmar_pci_notify_info *info)`
`335`	`335`
`336`	`336`	`static inline void vf_inherit_msi_domain(struct pci_dev *pdev)`
`337`	`337`	`{`
	`338`	`+#ifdef CONFIG_PCI_ATS`
`338`	`339`	`dev_set_msi_domain(&pdev->dev, dev_get_msi_domain(&pdev->physfn->dev));`
	`340`	`+#endif`
`339`	`341`	`}`
`340`	`342`
`341`	`343`	`static int dmar_pci_bus_notifier(struct notifier_block *nb,`