iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] qla2xxx: Correct MSI-X vector allocation for single queue mode.

Browse Source 
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Lalit Chandivade 2009-01-22 09:45:33 -08:00 committed by James Bottomley
parent eaac30be26
commit ad038fa824
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/qla2xxx/qla_isr.c
View File

@ -1868,6 +1868,7 @@ qla24xx_disable_msix(struct qla_hw_data *ha)
static int static int
qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
{ {
#define MIN_MSIX_COUNT 2
int i, ret; int i, ret;
struct msix_entry *entries; struct msix_entry *entries;
struct qla_msix_entry *qentry; struct qla_msix_entry *qentry;
@ -1883,12 +1884,16 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
ret = pci_enable_msix(ha->pdev, entries, ha->msix_count); ret = pci_enable_msix(ha->pdev, entries, ha->msix_count);
if (ret) { if (ret) {
if (ret < MIN_MSIX_COUNT)
goto msix_failed;
qla_printk(KERN_WARNING, ha, qla_printk(KERN_WARNING, ha,
"MSI-X: Failed to enable support -- %d/%d\n" "MSI-X: Failed to enable support -- %d/%d\n"
" Retry with %d vectors\n", ha->msix_count, ret, ret); " Retry with %d vectors\n", ha->msix_count, ret, ret);
ha->msix_count = ret; ha->msix_count = ret;
ret = pci_enable_msix(ha->pdev, entries, ha->msix_count); ret = pci_enable_msix(ha->pdev, entries, ha->msix_count);
if (ret) { if (ret) {
msix_failed:
qla_printk(KERN_WARNING, ha, "MSI-X: Failed to enable" qla_printk(KERN_WARNING, ha, "MSI-X: Failed to enable"
" support, giving up -- %d/%d\n", " support, giving up -- %d/%d\n",
ha->msix_count, ret); ha->msix_count, ret);