scsi: mpt3sas: always use first reserved smid for ioctl passthrough

ioctl passthrough commands require a SCSIIO smid, but cannot easily
integrate with the block layer. But the driver already has reserved some
SCSIIO smids and we're only ever allowing one ioctl command at a time we
can use the first reserved smid for ioctl commands.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 1ea4232dbe22b8530ad6852c536b39bb4cd95b50..d4b32af48782457092c7835d59c320d1b4870db7 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -908,14 +908,18 @@ static u8
 _base_get_cb_idx(struct MPT3SAS_ADAPTER *ioc, u16 smid)
 {
        int i;
+       u16 ctl_smid = ioc->scsiio_depth - INTERNAL_SCSIIO_CMDS_COUNT + 1;
        u8 cb_idx = 0xFF;
 
        if (smid < ioc->hi_priority_smid) {
                struct scsiio_tracker *st;
 
-               st = mpt3sas_get_st_from_smid(ioc, smid);
-               if (st)
-                       cb_idx = st->cb_idx;
+               if (smid < ctl_smid) {
+                       st = mpt3sas_get_st_from_smid(ioc, smid);
+                       if (st)
+                               cb_idx = st->cb_idx;
+               } else if (smid == ctl_smid)
+                       cb_idx = ioc->ctl_cb_idx;
        } else if (smid < ioc->internal_smid) {
                i = smid - ioc->hi_priority_smid;
                cb_idx = ioc->hpr_lookup[i].cb_idx;
@@ -2922,7 +2926,9 @@ mpt3sas_base_free_smid(struct MPT3SAS_ADAPTER *ioc, u16 smid)
                ioc->scsi_lookup[i].cb_idx = 0xFF;
                ioc->scsi_lookup[i].scmd = NULL;
                ioc->scsi_lookup[i].direct_io = 0;
-               list_add(&ioc->scsi_lookup[i].tracker_list, &ioc->free_list);
+               if (i < ioc->scsiio_depth - INTERNAL_SCSIIO_CMDS_COUNT)
+                       list_add(&ioc->scsi_lookup[i].tracker_list,
+                                &ioc->free_list);
                spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
 
                _base_recovery_check(ioc);
@@ -5787,8 +5793,9 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc)
                ioc->scsi_lookup[i].smid = smid;
                ioc->scsi_lookup[i].scmd = NULL;
                ioc->scsi_lookup[i].direct_io = 0;
-               list_add_tail(&ioc->scsi_lookup[i].tracker_list,
-                   &ioc->free_list);
+               if (i < ioc->scsiio_depth - INTERNAL_SCSIIO_CMDS_COUNT)
+                       list_add_tail(&ioc->scsi_lookup[i].tracker_list,
+                                     &ioc->free_list);
        }
 
        /* hi-priority queue */

diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index b4c374b08e5e9be8d77543627ae05866a05af0f0..4f23498946ee200bb1fb465874ea4bb9681256aa 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -724,14 +724,8 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
                        goto out;
                }
        } else {
-
-               smid = mpt3sas_base_get_smid_scsiio(ioc, ioc->ctl_cb_idx, NULL);
-               if (!smid) {
-                       pr_err(MPT3SAS_FMT "%s: failed obtaining a smid\n",
-                           ioc->name, __func__);
-                       ret = -EAGAIN;
-                       goto out;
-               }
+               /* Use first reserved smid for passthrough ioctls */
+               smid = ioc->scsiio_depth - INTERNAL_SCSIIO_CMDS_COUNT + 1;
        }
 
        ret = 0;