[PATCH 2/2] vfio: type1: conditionally check MSI remapping at irq domain level

From	Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/2] vfio: type1: conditionally check MSI remapping at irq domain level
Date	2017-03-02 11:40 +0100
Message-ID	<tgw9H-Sh-5@gated-at.bofh.it> (permalink)
References	<tgw02-OJ-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Check only if irq domains are available.

Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
---
 drivers/vfio/vfio_iommu_type1.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index bd6f293c4ebd..e3ed50e40ead 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -1287,8 +1287,9 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,
 	INIT_LIST_HEAD(&domain->group_list);
 	list_add(&group->next, &domain->group_list);
 
-	msi_remap = resv_msi ? irq_domain_check_msi_remap() :
-				iommu_capable(bus, IOMMU_CAP_INTR_REMAP);
+	msi_remap = resv_msi && IS_ENABLED(CONFIG_IRQ_DOMAIN) ?
+			irq_domain_check_msi_remap() :
+			iommu_capable(bus, IOMMU_CAP_INTR_REMAP);
 
 	if (!allow_unsafe_interrupts && !msi_remap) {
 		pr_warn("%s: No interrupt remapping support.  Use the module param \"allow_unsafe_interrupts\" to enable VFIO IOMMU support on this platform\n",
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] irqdomain: add empty irq_domain_check_msi_remap Mian Yousaf Kaukab <yousaf.kaukab@suse.com> - 2017-03-02 11:40 +0100
  [PATCH 2/2] vfio: type1: conditionally check MSI remapping at irq domain level Mian Yousaf Kaukab <yousaf.kaukab@suse.com> - 2017-03-02 11:40 +0100

csiph-web