Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751118AbbFMGtf (ORCPT ); Sat, 13 Jun 2015 02:49:35 -0400 Received: from 8bytes.org ([81.169.241.247]:51359 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751984AbbFMGr5 (ORCPT ); Sat, 13 Jun 2015 02:47:57 -0400 From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: David Woodhouse , zhen-hual@hp.com, bhe@redhat.com, ddutile@redhat.com, alex.williamson@redhat.com, dyoung@redhat.com, linux-kernel@vger.kernel.org, jroedel@8bytes.org, joro@8bytes.org, Joerg Roedel Subject: [PATCH 15/19] iommu/vt-d: Disable IRQ remapping in intel_prepare_irq_remapping Date: Sat, 13 Jun 2015 08:47:23 +0200 Message-Id: <1434178047-17809-16-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434178047-17809-1-git-send-email-joro@8bytes.org> References: <1434178047-17809-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1270 Lines: 42 From: Joerg Roedel Move it to this function for now, so that the copy routines for irq remapping take no effect yet. Signed-off-by: Joerg Roedel --- drivers/iommu/intel_irq_remapping.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 46d17e1..f1711836 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -654,6 +654,9 @@ static int __init intel_prepare_irq_remapping(void) pr_info("%s does not support EIM\n", iommu->name); eim = 0; } + + /* Disable IRQ remapping if it is already enabled */ + iommu_disable_irq_remapping(iommu); } eim_mode = eim; @@ -682,9 +685,6 @@ static int __init intel_enable_irq_remapping(void) struct intel_iommu *iommu; bool setup = false; - for_each_iommu(iommu, drhd) - iommu_disable_irq_remapping(iommu); - /* * Setup Interrupt-remapping for all the DRHD's now. */ -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/