diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-11-18 14:09:06 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-11-21 17:06:57 +0100 |
| commit | 6929ef385e09c0065b87fda3e7b872a5070ac783 (patch) | |
| tree | 84f6b678d92409233aefde692da6db665d547d1b | |
| parent | libata-scsi: Fixup ata_gen_passthru_sense() (diff) | |
| download | linux-6929ef385e09c0065b87fda3e7b872a5070ac783.tar.xz linux-6929ef385e09c0065b87fda3e7b872a5070ac783.zip | |
ahci: always fall back to single-MSI mode
Don't try to guess what the errors from pci_irq_alloc_vectors mean, as
that's too fragile. Instead always try allocating a single vector
when multi-MSI mode fails. This makes various intel Desktop and
Laptop CPUs use MSI again.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Michael Marley <michael@michaelmarley.com>
Tested-by: Michael Marley <michael@michaelmarley.com>
Fixes: 0b9e2988ab22 ("ahci: use pci_alloc_irq_vectors")
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | drivers/ata/ahci.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 9669fc7c19df..74f4c662f776 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1436,13 +1436,6 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports, "ahci: MRSM is on, fallback to single MSI\n"); pci_free_irq_vectors(pdev); } - - /* - * -ENOSPC indicated we don't have enough vectors. Don't bother - * trying a single vectors for any other error: - */ - if (nvec < 0 && nvec != -ENOSPC) - return nvec; } /* |