Skip to content

Commit 6929ef3

Browse files
Christoph Hellwightejun
authored andcommitted
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: 0b9e298 ("ahci: use pci_alloc_irq_vectors") Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent e0029dc commit 6929ef3

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

drivers/ata/ahci.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,13 +1436,6 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports,
14361436
"ahci: MRSM is on, fallback to single MSI\n");
14371437
pci_free_irq_vectors(pdev);
14381438
}
1439-
1440-
/*
1441-
* -ENOSPC indicated we don't have enough vectors. Don't bother
1442-
* trying a single vectors for any other error:
1443-
*/
1444-
if (nvec < 0 && nvec != -ENOSPC)
1445-
return nvec;
14461439
}
14471440

14481441
/*

0 commit comments

Comments
 (0)