scsi: qedf: Initiate cleanup for ELS commands as well

Initiate cleanup for ELS commands as well.

Link: https://lore.kernel.org/r/20200807110656.19965-6-jhasan@marvell.com
Signed-off-by: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: Javed Hasan <jhasan@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c
index 26d11cc91608d76b9424813d574a2c81f4641817..7969f3aa8b61c32b417763d2f9504a26984a4ca7 100644 (file)
--- a/drivers/scsi/qedf/qedf_io.c
+++ b/drivers/scsi/qedf/qedf_io.c
@@ -1704,8 +1704,10 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun)
                                    io_req, io_req->xid);
                                continue;
                        }
+                       qedf_initiate_cleanup(io_req, false);
                        flush_cnt++;
                        qedf_flush_els_req(qedf, io_req);
+
                        /*
                         * Release the kref and go back to the top of the
                         * loop.
@@ -2169,6 +2171,10 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,
                return SUCCESS;
        }
 
+       if (io_req->cmd_type == QEDF_ELS) {
+               goto process_els;
+       }
+
        if (!test_bit(QEDF_CMD_OUTSTANDING, &io_req->flags) ||
            test_and_set_bit(QEDF_CMD_IN_CLEANUP, &io_req->flags)) {
                QEDF_ERR(&(qedf->dbg_ctx), "io_req xid=0x%x already in "
@@ -2178,6 +2184,7 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,
        }
        set_bit(QEDF_CMD_IN_CLEANUP, &io_req->flags);
 
+process_els:
        /* Ensure room on SQ */
        if (!atomic_read(&fcport->free_sqes)) {
                QEDF_ERR(&(qedf->dbg_ctx), "No SQ entries available\n");