ahci: fix the single MSI-X case in ahci_init_one

Christoph Hellwig · htejun · commit 0ce57f8af178 · 2016-10-25T11:43:07.000-04:00
We need to make sure hpriv->irq is set properly if we don't use per-port vectors, so switch from blindly assigning pdev->irq to using pci_irq_vector, which handles all interrupt types correctly. Signed-off-by: Christoph Hellwig <hch@lst.de> Reported-by: Robert Richter <robert.richter@cavium.com> Tested-by: Robert Richter <robert.richter@cavium.com> Tested-by: David Daney <ddaney.cavm@gmail.com> Fixes: 0b9e298 ("ahci: use pci_alloc_irq_vectors") Signed-off-by: Tejun Heo <tj@kernel.org>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
@@ -1620,7 +1620,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		/* legacy intx interrupts */
 		pci_intx(pdev, 1);
 	}
-	hpriv->irq = pdev->irq;
+	hpriv->irq = pci_irq_vector(pdev, 0);
 
 	if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)
 		host->flags |= ATA_HOST_PARALLEL_SCAN;

Original file line number	Diff line number	Diff line change
`@@ -1620,7 +1620,7 @@ static int ahci_init_one(struct pci_dev pdev, const struct pci_device_id ent)`
`1620`	`1620`	`/* legacy intx interrupts */`
`1621`	`1621`	`pci_intx(pdev, 1);`
`1622`	`1622`	`}`
`1623`		`- hpriv->irq = pdev->irq;`
	`1623`	`+ hpriv->irq = pci_irq_vector(pdev, 0);`
`1624`	`1624`
`1625`	`1625`	`if (!(hpriv->cap & HOST_CAP_SSS) \|\| ahci_ignore_sss)`
`1626`	`1626`	`host->flags \|= ATA_HOST_PARALLEL_SCAN;`