diff options
| author | Michael Hernandez <michael.hernandez@qlogic.com> | 2010-03-19 16:59:18 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-03-27 15:11:32 -0400 |
| commit | d84a47c2e8d8880d068f23f3033f6f6987717b17 (patch) | |
| tree | 4f8a75f46db164ca9e6aa6ff8271e70365fb492b | |
| parent | 12cec63e40f9b9c2a4766a0f43404a9642062f35 (diff) | |
| download | op-kernel-dev-d84a47c2e8d8880d068f23f3033f6f6987717b17.zip op-kernel-dev-d84a47c2e8d8880d068f23f3033f6f6987717b17.tar.gz | |
[SCSI] qla2xxx: Check to make sure multique and CPU affinity support is not enabled at the same time.
The logic is changed to detect this condition based on following
1) both module parameters are off (ql2xmaxqueues and ql2xmultique_tag).
2) both module parameters are on (ql2xmaxqueues and ql2xmultique_tag).
3) The HBA does not support multi queue.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 46720b2..be3f1d3 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1676,9 +1676,11 @@ skip_pio: /* Determine queue resources */ ha->max_req_queues = ha->max_rsp_queues = 1; - if ((ql2xmaxqueues <= 1 || ql2xmultique_tag < 1) && + if ((ql2xmaxqueues <= 1 && !ql2xmultique_tag) || + (ql2xmaxqueues > 1 && ql2xmultique_tag) || (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))) goto mqiobase_exit; + ha->mqiobase = ioremap(pci_resource_start(ha->pdev, 3), pci_resource_len(ha->pdev, 3)); if (ha->mqiobase) { |
