Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This is mostly updates to the usual drivers: mpt3sas, lpfc, qla2xxx,
  hisi_sas, smartpqi, megaraid_sas, arcmsr.

  In addition, with the continuing absence of Nic we have target updates
  for tcmu and target core (all with reviews and acks).

  The biggest observable change is going to be that we're (again) trying
  to switch to mulitqueue as the default (a user can still override the
  setting on the kernel command line).

  Other major core stuff is the removal of the remaining Microchannel
  drivers, an update of the internal timers and some reworks of
  completion and result handling"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (203 commits)
  scsi: core: use blk_mq_run_hw_queues in scsi_kick_queue
  scsi: ufs: remove unnecessary query(DM) UPIU trace
  scsi: qla2xxx: Fix issue reported by static checker for qla2x00_els_dcmd2_sp_done()
  scsi: aacraid: Spelling fix in comment
  scsi: mpt3sas: Fix calltrace observed while running IO & reset
  scsi: aic94xx: fix an error code in aic94xx_init()
  scsi: st: remove redundant pointer STbuffer
  scsi: qla2xxx: Update driver version to 10.00.00.08-k
  scsi: qla2xxx: Migrate NVME N2N handling into state machine
  scsi: qla2xxx: Save frame payload size from ICB
  scsi: qla2xxx: Fix stalled relogin
  scsi: qla2xxx: Fix race between switch cmd completion and timeout
  scsi: qla2xxx: Fix Management Server NPort handle reservation logic
  scsi: qla2xxx: Flush mailbox commands on chip reset
  scsi: qla2xxx: Fix unintended Logout
  scsi: qla2xxx: Fix session state stuck in Get Port DB
  scsi: qla2xxx: Fix redundant fc_rport registration
  scsi: qla2xxx: Silent erroneous message
  scsi: qla2xxx: Prevent sysfs access when chip is down
  scsi: qla2xxx: Add longer window for chip reset
  ...

2 files changed, 17 insertions, 15 deletions

diff --git a/drivers/scsi/qedi/qedi_fw_api.c b/drivers/scsi/qedi/qedi_fw_api.c
index a269da1a6c75..387dc87e4d22 100644
--- a/drivers/scsi/qedi/qedi_fw_api.c
+++ b/drivers/scsi/qedi/qedi_fw_api.c
@@ -126,22 +126,24 @@ static void init_sqe(struct iscsi_task_params *task_params,
                                                      sgl_task_params,
                                                      dif_task_params);
 
-                if (scsi_is_slow_sgl(sgl_task_params->num_sges,
-                                     sgl_task_params->small_mid_sge))
-                        num_sges = ISCSI_WQE_NUM_SGES_SLOWIO;
-                else
-                        num_sges = min(sgl_task_params->num_sges,
-                                       (u16)SCSI_NUM_SGES_SLOW_SGL_THR);
-        }
+                        if (scsi_is_slow_sgl(sgl_task_params->num_sges,
+                                             sgl_task_params->small_mid_sge))
+                                num_sges = ISCSI_WQE_NUM_SGES_SLOWIO;
+                        else
+                                num_sges = min(sgl_task_params->num_sges,
+                                               (u16)SCSI_NUM_SGES_SLOW_SGL_THR);
+                }
 
-        SET_FIELD(task_params->sqe->flags, ISCSI_WQE_NUM_SGES, num_sges);
-        SET_FIELD(task_params->sqe->contlen_cdbsize, ISCSI_WQE_CONT_LEN,
-                  buf_size);
+                SET_FIELD(task_params->sqe->flags, ISCSI_WQE_NUM_SGES,
+                          num_sges);
+                SET_FIELD(task_params->sqe->contlen_cdbsize, ISCSI_WQE_CONT_LEN,
+                          buf_size);
 
-        if (GET_FIELD(pdu_header->hdr_second_dword,
-                      ISCSI_CMD_HDR_TOTAL_AHS_LEN))
-                SET_FIELD(task_params->sqe->contlen_cdbsize, ISCSI_WQE_CDB_SIZE,
-                          cmd_params->extended_cdb_sge.sge_len);
+                if (GET_FIELD(pdu_header->hdr_second_dword,
+                              ISCSI_CMD_HDR_TOTAL_AHS_LEN))
+                        SET_FIELD(task_params->sqe->contlen_cdbsize,
+                                  ISCSI_WQE_CDB_SIZE,
+                                  cmd_params->extended_cdb_sge.sge_len);
         }
                 break;
         case ISCSI_TASK_TYPE_INITIATOR_READ:
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index cff83b9457f7..aa96bccb5a96 100644
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -524,7 +524,7 @@ static int qedi_init_id_tbl(struct qedi_portid_tbl *id_tbl, u16 size,
         id_tbl->max = size;
         id_tbl->next = next;
         spin_lock_init(&id_tbl->lock);
-        id_tbl->table = kcalloc(DIV_ROUND_UP(size, 32), 4, GFP_KERNEL);
+        id_tbl->table = kcalloc(BITS_TO_LONGS(size), sizeof(long), GFP_KERNEL);
         if (!id_tbl->table)
                 return -ENOMEM;