Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933517AbbFJIxx (ORCPT ); Wed, 10 Jun 2015 04:53:53 -0400 Received: from mga02.intel.com ([134.134.136.20]:45833 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754229AbbFJIxP (ORCPT ); Wed, 10 Jun 2015 04:53:15 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,586,1427785200"; d="scan'208";a="744153731" From: Jiang Liu To: Thomas Gleixner , "Rafael J . Wysocki" , Bjorn Helgaas Cc: Jiang Liu , LKML , linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, "x86 @ kernel . org" Subject: [Patch v3 4/4] PCI, MSI: Free legacy PCI IRQ when enabling MSI/MSI-X Date: Wed, 10 Jun 2015 16:55:01 +0800 Message-Id: <1433926501-22956-5-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1433926501-22956-1-git-send-email-jiang.liu@linux.intel.com> References: <1433926501-22956-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2040 Lines: 62 Once PCI MSI/MSI-X is enabled by the device driver, PCI device won't make use of legacy PCI IRQ until PCI MSI/MSI-X is disabled again. This patch enhances the PCI MSI core to call pcibios_free_irq() when enabling MSI/MSI-X and to call pcibios_alloc_irq() when disabling MSI/MSI-X. So legacy PCI IRQ will released when enabling MSI/MSI-X and reallocated when disabling MSI/MSI-X if pcibios_alloc_irq() and pcibios_free_irq() are implemented by arch specific PCI code. Signed-off-by: Jiang Liu Acked-by: Bjorn Helgaas --- drivers/pci/msi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index c3e7dfcf9ff5..47cf72c669f0 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -686,6 +686,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec) msi_set_enable(dev, 1); dev->msi_enabled = 1; + pcibios_free_irq(dev); dev->irq = entry->irq; return 0; } @@ -813,9 +814,10 @@ static int msix_capability_init(struct pci_dev *dev, /* Set MSI-X enabled bits and unmask the function */ pci_intx_for_msi(dev, 0); dev->msix_enabled = 1; - msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0); + pcibios_free_irq(dev); + return 0; out_avail: @@ -930,6 +932,7 @@ void pci_msi_shutdown(struct pci_dev *dev) /* Restore dev->irq to its default pin-assertion irq */ dev->irq = desc->msi_attrib.default_irq; + pcibios_alloc_irq(dev); } void pci_disable_msi(struct pci_dev *dev) @@ -1030,6 +1033,7 @@ void pci_msix_shutdown(struct pci_dev *dev) msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0); pci_intx_for_msi(dev, 1); dev->msix_enabled = 0; + pcibios_alloc_irq(dev); } void pci_disable_msix(struct pci_dev *dev) -- 1.7.10.4 -- 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/