be2iscsi: Fix ExpStatSn in management tasks

Orabug: 22725588

Connection resets observed from some targets when NOP-Out with wrong
ExpStatSn is sent.

FW keeps track of StatSn and fills up ExpStatSn accordingly.  The header
filled up by the stack needs to be modified by driver to clear
ExpStatSn. If the field is not cleared, FW recalculates ExpStatSn and
wrong offset'ed ExpStatSn is seen in the wire trace.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index c1122c7cbd5446ad9d0669561dc4e781f48b7f49..aedd065bb270545b3d4cbcdc2903304e479d49e8 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -4912,7 +4912,6 @@ int beiscsi_iotask_v2(struct iscsi_task *task, struct scatterlist *sg,
 
        pwrb = io_task->pwrb_handle->pwrb;
 
-       io_task->cmd_bhs->iscsi_hdr.exp_statsn = 0;
        io_task->bhs_len = sizeof(struct be_cmd_bhs);
 
        if (writedir) {
@@ -4973,7 +4972,6 @@ static int beiscsi_iotask(struct iscsi_task *task, struct scatterlist *sg,
        unsigned int doorbell = 0;
 
        pwrb = io_task->pwrb_handle->pwrb;
-       io_task->cmd_bhs->iscsi_hdr.exp_statsn = 0;
        io_task->bhs_len = sizeof(struct be_cmd_bhs);
 
        if (writedir) {
@@ -5145,23 +5143,21 @@ static int beiscsi_task_xmit(struct iscsi_task *task)
 {
        struct beiscsi_io_task *io_task = task->dd_data;
        struct scsi_cmnd *sc = task->sc;
-       struct beiscsi_hba *phba = NULL;
+       struct beiscsi_hba *phba;
        struct scatterlist *sg;
        int num_sg;
        unsigned int  writedir = 0, xferlen = 0;
 
-       phba = ((struct beiscsi_conn *)task->conn->dd_data)->phba;
+       if (!io_task->conn->login_in_progress)
+               task->hdr->exp_statsn = 0;
 
        if (!sc)
                return beiscsi_mtask(task);
 
        io_task->scsi_cmnd = sc;
        num_sg = scsi_dma_map(sc);
+       phba = io_task->conn->phba;
        if (num_sg < 0) {
-               struct iscsi_conn *conn = task->conn;
-               struct beiscsi_hba *phba = NULL;
-
-               phba = ((struct beiscsi_conn *)conn->dd_data)->phba;
                beiscsi_log(phba, KERN_ERR,
                            BEISCSI_LOG_IO | BEISCSI_LOG_ISCSI,
                            "BM_%d : scsi_dma_map Failed "