Messages in this thread Patch in this message | | | Date | Mon, 16 Nov 2020 13:00:28 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: x86/urgent] iommu/vt-d: Take CONFIG_PCI_ATS into account |
| |
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 8986f223bd777a73119f5d593c15b4d630ff49bb Gitweb: https://git.kernel.org/tip/8986f223bd777a73119f5d593c15b4d630ff49bb Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Mon, 16 Nov 2020 13:52:47 +01:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Mon, 16 Nov 2020 13:57:46 +01:00
iommu/vt-d: Take CONFIG_PCI_ATS into account
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: ff828729be44 ("iommu/vt-d: Cure VF irqdomain hickup") Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Joerg Roedel <joro@8bytes.org> --- drivers/iommu/intel/dmar.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c index b2e8044..bc9f4cf 100644 --- 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,
| |