From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: [PATCH 15/20] x86: Copy-n-paste arch_teardown_msi_irqs from msi.c to io_apic.c. Date: Wed, 4 Aug 2010 14:19:10 -0400 Message-ID: <1280945955-14229-16-git-send-email-konrad.wilk@oracle.com> References: <1280945955-14229-1-git-send-email-konrad.wilk@oracle.com> Return-path: In-Reply-To: <1280945955-14229-1-git-send-email-konrad.wilk@oracle.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Cc: alex.williamson@redhat.com, Konrad Rzeszutek Wilk , Jeremy Fitzhardinge , Thomas Gleixner , "H. Peter Anvin" , x86@kernel.org, Jesse Barnes List-Id: xen-devel@lists.xenproject.org In preparation for non-privileged domains to disable PCI devices' MSI/MSIx, we need to augment arch_teardown_msi_irqs to make a call to the privileged domain (patch to follow). Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: Jesse Barnes --- arch/x86/include/asm/pci.h | 1 + arch/x86/kernel/apic/io_apic.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 404a880..bcf84e1 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -94,6 +94,7 @@ extern void pci_iommu_alloc(void); /* MSI arch hook */ #define arch_setup_msi_irqs arch_setup_msi_irqs +#define arch_teardown_msi_irqs arch_teardown_msi_irqs #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 8353c40..a8d069e 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3597,6 +3597,20 @@ void arch_teardown_msi_irq(unsigned int irq) destroy_irq(irq); } +void arch_teardown_msi_irqs(struct pci_dev *dev) +{ + struct msi_desc *entry; + + list_for_each_entry(entry, &dev->msi_list, list) { + int i, nvec; + if (entry->irq == 0) + continue; + nvec = 1 << entry->msi_attrib.multiple; + for (i = 0; i < nvec; i++) + arch_teardown_msi_irq(entry->irq + i); + } +} + #if defined (CONFIG_DMAR) || defined (CONFIG_INTR_REMAP) #ifdef CONFIG_SMP static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask) -- 1.7.0.1