[PATCH RFC 31/77] hpsa: Update MSI/MSI-X interrupts enablement code
From: Alexander Gordeev <hidden>
Date: 2013-10-02 17:11:04
Also in:
linux-ide, linux-mips, linux-pci, linux-rdma, linux-s390, linux-scsi, linuxppc-dev, lkml
Subsystem:
hewlett-packard smart array raid driver (hpsa), scsi subsystem, the rest · Maintainers:
Don Brace, "James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
As result of recent re-design of the MSI/MSI-X interrupts enabling pattern this driver has to be updated to use the new technique to obtain a optimal number of MSI/MSI-X interrupts required. Signed-off-by: Alexander Gordeev <redacted> --- drivers/scsi/hpsa.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 393c8db..eb17b3d 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c@@ -4103,34 +4103,32 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) int err, i; struct msix_entry hpsa_msix_entries[MAX_REPLY_QUEUES]; - for (i = 0; i < MAX_REPLY_QUEUES; i++) { - hpsa_msix_entries[i].vector = 0; - hpsa_msix_entries[i].entry = i; - } - /* Some boards advertise MSI but don't really support it */ if ((h->board_id == 0x40700E11) || (h->board_id == 0x40800E11) || (h->board_id == 0x40820E11) || (h->board_id == 0x40830E11)) goto default_int_mode; if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) { dev_info(&h->pdev->dev, "MSIX\n"); + + err = pci_msix_table_size(h->pdev); + if (err < ARRAY_SIZE(hpsa_msix_entries)) + goto default_int_mode; + + for (i = 0; i < ARRAY_SIZE(hpsa_msix_entries); i++) { + hpsa_msix_entries[i].vector = 0; + hpsa_msix_entries[i].entry = i; + } + err = pci_enable_msix(h->pdev, hpsa_msix_entries, - MAX_REPLY_QUEUES); + ARRAY_SIZE(hpsa_msix_entries)); if (!err) { for (i = 0; i < MAX_REPLY_QUEUES; i++) h->intr[i] = hpsa_msix_entries[i].vector; h->msix_vector = 1; return; } - if (err > 0) { - dev_warn(&h->pdev->dev, "only %d MSI-X vectors " - "available\n", err); - goto default_int_mode; - } else { - dev_warn(&h->pdev->dev, "MSI-X init failed %d\n", - err); - goto default_int_mode; - } + dev_warn(&h->pdev->dev, "MSI-X init failed %d\n", err); + goto default_int_mode; } if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) { dev_info(&h->pdev->dev, "MSI\n");
--
1.7.7.6