[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>

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)
 
         /* set 16 byte cdb's */
         sh->max_cmd_len = 16;
-
-        sh->max_id = ioc->pfacts[0].PortSCSIID;
+        sh->can_queue = min_t(int, ioc->req_depth - 10, sh->can_queue);
+        sh->max_id = -1;
         sh->max_lun = max_lun;
-
         sh->transportt = mptsas_transport_template;
 
         /* 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)
                 else
                         max_depth = MPT_SCSI_CMD_PER_DEV_LOW;
         } else
-                max_depth = MPT_SCSI_CMD_PER_DEV_HIGH;
+                 max_depth = ioc->sh->can_queue;
+
+        if (!sdev->tagged_supported)
+                max_depth = 1;
 
         if (qdepth > max_depth)
                 qdepth = max_depth;