Commit 6929ef38 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tejun Heo

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: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarMichael Marley <michael@michaelmarley.com>
Tested-by: default avatarMichael Marley <michael@michaelmarley.com>
Fixes: 0b9e2988 ("ahci: use pci_alloc_irq_vectors")
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent e0029dcb
...@@ -1436,13 +1436,6 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports, ...@@ -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"); "ahci: MRSM is on, fallback to single MSI\n");
pci_free_irq_vectors(pdev); 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;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment