summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx
diff options
context:
space:
mode:
authorAndrew Vasquez2008-01-17 18:02:11 +0100
committerJames Bottomley2008-01-23 18:29:31 +0100
commitda7429f9ab5ba939cec37d07ef7f6a630fe48421 (patch)
tree3143a6ffdfece1d03ae957762e9e1b79782deaec /drivers/scsi/qla2xxx
parent[SCSI] qla2xxx: Wait for FLASH write-protection to complete after a write. (diff)
downloadkernel-qcow2-linux-da7429f9ab5ba939cec37d07ef7f6a630fe48421.tar.gz
kernel-qcow2-linux-da7429f9ab5ba939cec37d07ef7f6a630fe48421.tar.xz
kernel-qcow2-linux-da7429f9ab5ba939cec37d07ef7f6a630fe48421.zip
[SCSI] qla2xxx: Restrict MSI/MSI-X enablement on select ISP2432-type HBAs.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 5d2dc92f7d9d..22216fe76059 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1829,6 +1829,18 @@ qla2x00_request_irqs(scsi_qla_host_t *ha)
goto skip_msix;
}
+ if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_HP &&
+ (ha->pdev->subsystem_device == 0x7040 ||
+ ha->pdev->subsystem_device == 0x7041 ||
+ ha->pdev->subsystem_device == 0x1705)) {
+ DEBUG2(qla_printk(KERN_WARNING, ha,
+ "MSI-X: Unsupported ISP2432 SSVID/SSDID (0x%X, 0x%X).\n",
+ ha->pdev->subsystem_vendor,
+ ha->pdev->subsystem_device));
+
+ goto skip_msi;
+ }
+
ret = qla24xx_enable_msix(ha);
if (!ret) {
DEBUG2(qla_printk(KERN_INFO, ha,