diff options
author | Anil Ravindranath <anil_ravindranath@pmc-sierra.com> | 2010-11-16 13:43:41 -0800 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-09 09:41:15 -0600 |
commit | 5da61410054d125e63aeab9cc7a11874a69465c0 (patch) | |
tree | 376d4b77c3d980ed772ba495d370f6bfc6a86a28 /drivers/scsi/pmcraid.c | |
parent | c7a841f3aca469187db76842676951a672fd27d1 (diff) | |
download | blackbird-op-linux-5da61410054d125e63aeab9cc7a11874a69465c0.tar.gz blackbird-op-linux-5da61410054d125e63aeab9cc7a11874a69465c0.zip |
[SCSI] pmcraid: disable msix and expand device config entry
Firmware requires a larger configuration entry size than the driver
currently allows, and MSI-X pretty much doesn't work with current FW,
so disable it for now.
Signed-off-by: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/pmcraid.c')
-rw-r--r-- | drivers/scsi/pmcraid.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 5e76a624cb08..300d59f389da 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -62,6 +62,7 @@ static unsigned int pmcraid_debug_log; static unsigned int pmcraid_disable_aen; static unsigned int pmcraid_log_level = IOASC_LOG_LEVEL_MUST; +static unsigned int pmcraid_enable_msix; /* * Data structures to support multiple adapters by the LLD. @@ -4691,7 +4692,8 @@ pmcraid_register_interrupt_handler(struct pmcraid_instance *pinstance) int rc; struct pci_dev *pdev = pinstance->pdev; - if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) { + if ((pmcraid_enable_msix) && + (pci_find_capability(pdev, PCI_CAP_ID_MSIX))) { int num_hrrq = PMCRAID_NUM_MSIX_VECTORS; struct msix_entry entries[PMCRAID_NUM_MSIX_VECTORS]; int i; |