aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message
diff options
context:
space:
mode:
authorKashyap, Desai <kashyap.desai@lsi.com>2009-08-05 03:22:58 -0400
committerJames Bottomley <James.Bottomley@suse.de>2009-08-22 18:52:26 -0400
commit79a3ec1ace2329d115ecd2445379b46aed3286b0 (patch)
tree4bc0a9d082afa0dbf1460ddf0664c22fd3fc997a /drivers/message
parent4b97650b555b1cd09b547104d98da0ff700187d9 (diff)
[SCSI] mptsas : set max_id to infinite value.
Do not set max_id value received from FW. Once SAS transport layer is introduced max_id value is missleading to SCSI mid layer. Use max_id to infinite value. logic of can queue of scsi host is changed. Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/message')
-rw-r--r--drivers/message/fusion/mptsas.c5
-rw-r--r--drivers/message/fusion/mptscsih.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 936e35ae88d4..21bd78e4f306 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -4761,10 +4761,9 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
4761 4761
4762 /* set 16 byte cdb's */ 4762 /* set 16 byte cdb's */
4763 sh->max_cmd_len = 16; 4763 sh->max_cmd_len = 16;
4764 4764 sh->can_queue = min_t(int, ioc->req_depth - 10, sh->can_queue);
4765 sh->max_id = ioc->pfacts[0].PortSCSIID; 4765 sh->max_id = -1;
4766 sh->max_lun = max_lun; 4766 sh->max_lun = max_lun;
4767
4768 sh->transportt = mptsas_transport_template; 4767 sh->transportt = mptsas_transport_template;
4769 4768
4770 /* Required entry. 4769 /* Required entry.
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 1466a5aed5f8..0e402eb95716 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2290,7 +2290,10 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth)
2290 else 2290 else
2291 max_depth = MPT_SCSI_CMD_PER_DEV_LOW; 2291 max_depth = MPT_SCSI_CMD_PER_DEV_LOW;
2292 } else 2292 } else
2293 max_depth = MPT_SCSI_CMD_PER_DEV_HIGH; 2293 max_depth = ioc->sh->can_queue;
2294
2295 if (!sdev->tagged_supported)
2296 max_depth = 1;
2294 2297
2295 if (qdepth > max_depth) 2298 if (qdepth > max_depth)
2296 qdepth = max_depth; 2299 qdepth = max_depth;