diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-08-11 07:11:05 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-08-18 08:02:40 -0500 |
| commit | 5d0bdf2867825a92c0a563957a2fb059149ab0d4 (patch) | |
| tree | d48f58105d771aef446de3f032d124d348477d95 /drivers/pci/msi.c | |
| parent | 4fe0d154880bb6eb833cbe84fa6f385f400f0b9c (diff) | |
| download | linux-5d0bdf2867825a92c0a563957a2fb059149ab0d4.tar.gz linux-5d0bdf2867825a92c0a563957a2fb059149ab0d4.tar.bz2 linux-5d0bdf2867825a92c0a563957a2fb059149ab0d4.zip | |
PCI: Call pci_intx() when using legacy interrupts in pci_alloc_irq_vectors()
ahci currently insists on an explicit call to pci_intx() before falling
back from MSI or MSI-X to legacy IRQs. As pci_intx() is a no-op if the
command register already contains the right value it seems safe and useful
to add this call to pci_alloc_irq_vectors() so that ahci can just use
pci_alloc_irq_vectors().
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/msi.c')
| -rw-r--r-- | drivers/pci/msi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 9233e7f62f47..593698e11f96 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1200,8 +1200,11 @@ int pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, } /* use legacy irq if allowed */ - if ((flags & PCI_IRQ_LEGACY) && min_vecs == 1) + if ((flags & PCI_IRQ_LEGACY) && min_vecs == 1) { + pci_intx(dev, 1); return 1; + } + return vecs; } EXPORT_SYMBOL(pci_alloc_irq_vectors); |