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

Pull SCSI fixes from James Bottomley:
 "Nine changes, eight in drivers [ufs, target, lpfc x 2, qla2xxx x 4]
  and one core change in sd that fixes an I/O failure on DIF type 3
  devices"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: stop timer in shutdown path
  scsi: sd: define variable dif as unsigned int instead of bool
  scsi: target: cxgbit: Fix cxgbit_fw4_ack()
  scsi: qla2xxx: Fix partial flash write of MBI
  scsi: qla2xxx: Initialized mailbox to prevent driver load failure
  scsi: lpfc: Honor module parameter lpfc_use_adisc
  scsi: ufs-bsg: Wake the device before sending raw upiu commands
  scsi: lpfc: Check queue pointer before use
  scsi: qla2xxx: fixup incorrect usage of host_byte

diff --combined drivers/scsi/qla2xxx/qla_attr.c
index 30bafd9d21e984461b237651358196a26eb8d514,8705ca6395e40efc5ce92d1032c10e043420eb46..7259bce85e0e3e54be6ed45d8cd82593685c7390
--- 1/drivers/scsi/qla2xxx/qla_attr.c
--- 2/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@@ -440,9 -440,6 +440,6 @@@ qla2x00_sysfs_write_optrom_ctl(struct f
                valid = 0;
                if (ha->optrom_size == OPTROM_SIZE_2300 && start == 0)
                        valid = 1;
-               else if (start == (ha->flt_region_boot * 4) ||
-                   start == (ha->flt_region_fw * 4))
-                       valid = 1;
                else if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha))
                        valid = 1;
                if (!valid) {
@@@ -489,8 -486,10 +486,10 @@@
                    "Writing flash region -- 0x%x/0x%x.\n",
                    ha->optrom_region_start, ha->optrom_region_size);
  
-               ha->isp_ops->write_optrom(vha, ha->optrom_buffer,
+               rval = ha->isp_ops->write_optrom(vha, ha->optrom_buffer,
                    ha->optrom_region_start, ha->optrom_region_size);
+               if (rval)
+                       rval = -EIO;
                break;
        default:
                rval = -EINVAL;
@@@ -2958,8 -2957,6 +2957,8 @@@ qla24xx_vport_delete(struct fc_vport *f
        dma_free_coherent(&ha->pdev->dev, vha->gnl.size, vha->gnl.l,
            vha->gnl.ldma);
  
 +      vha->gnl.l = NULL;
 +
        vfree(vha->scan.l);
  
        if (vha->qpair && vha->qpair->vp_idx == vha->vp_idx) {

diff --combined drivers/scsi/qla2xxx/qla_os.c
index bcb1e8598888891796c1b486f83cb8049449ddcf,39f7782a133b94f3197c9a34590669f0a051ec8f..337162ac3a7716c46bc18774410f7a1796e2b33a
--- 1/drivers/scsi/qla2xxx/qla_os.c
--- 2/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@@ -3437,12 -3437,6 +3437,12 @@@ skip_dpc
        return 0;
  
  probe_failed:
 +      if (base_vha->gnl.l) {
 +              dma_free_coherent(&ha->pdev->dev, base_vha->gnl.size,
 +                              base_vha->gnl.l, base_vha->gnl.ldma);
 +              base_vha->gnl.l = NULL;
 +      }
 +
        if (base_vha->timer_active)
                qla2x00_stop_timer(base_vha);
        base_vha->flags.online = 0;
@@@ -3535,6 -3529,10 +3535,10 @@@ qla2x00_shutdown(struct pci_dev *pdev
                qla2x00_try_to_stop_firmware(vha);
        }
  
+       /* Disable timer */
+       if (vha->timer_active)
+               qla2x00_stop_timer(vha);
+ 
        /* Turn adapter off line */
        vha->flags.online = 0;
  
@@@ -3676,7 -3674,7 +3680,7 @@@ qla2x00_remove_one(struct pci_dev *pdev
        if (!atomic_read(&pdev->enable_cnt)) {
                dma_free_coherent(&ha->pdev->dev, base_vha->gnl.size,
                    base_vha->gnl.l, base_vha->gnl.ldma);
 -
 +              base_vha->gnl.l = NULL;
                scsi_host_put(base_vha->host);
                kfree(ha);
                pci_set_drvdata(pdev, NULL);
@@@ -3716,8 -3714,6 +3720,8 @@@
        dma_free_coherent(&ha->pdev->dev,
                base_vha->gnl.size, base_vha->gnl.l, base_vha->gnl.ldma);
  
 +      base_vha->gnl.l = NULL;
 +
        vfree(base_vha->scan.l);
  
        if (IS_QLAFX00(ha))
@@@ -4821,7 -4817,6 +4825,7 @@@ struct scsi_qla_host *qla2x00_create_ho
                    "Alloc failed for scan database.\n");
                dma_free_coherent(&ha->pdev->dev, vha->gnl.size,
                    vha->gnl.l, vha->gnl.ldma);
 +              vha->gnl.l = NULL;
                scsi_host_put(vha->host);
                return NULL;
        }

diff --combined drivers/scsi/sd.c
index 03163ac5fe9583362491efa831275c77a59e6122,fe05475ce5dc5dc0f022bd228863a17c5ce2f606..ebb40160539f52e1c6ee65802fb9dd731868ed89
--- 1/drivers/scsi/sd.c
--- 2/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1166,11 -1166,12 +1166,12 @@@ static blk_status_t sd_setup_read_write
        sector_t lba = sectors_to_logical(sdp, blk_rq_pos(rq));
        sector_t threshold;
        unsigned int nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
-       bool dif, dix;
        unsigned int mask = logical_to_sectors(sdp, 1) - 1;
        bool write = rq_data_dir(rq) == WRITE;
        unsigned char protect, fua;
        blk_status_t ret;
+       unsigned int dif;
+       bool dix;
  
        ret = scsi_init_io(cmd);
        if (ret != BLK_STS_OK)
@@@ -1211,6 -1212,9 +1212,6 @@@
        dix = scsi_prot_sg_count(cmd);
        dif = scsi_host_dif_capable(cmd->device->host, sdkp->protection_type);
  
 -      if (write && dix)
 -              t10_pi_prepare(cmd->request, sdkp->protection_type);
 -
        if (dif || dix)
                protect = sd_setup_protect_cmnd(cmd, dix, dif);
        else
@@@ -1290,9 -1294,7 +1291,9 @@@ static blk_status_t sd_init_command(str
        case REQ_OP_WRITE:
                return sd_setup_read_write_cmnd(cmd);
        case REQ_OP_ZONE_RESET:
 -              return sd_zbc_setup_reset_cmnd(cmd);
 +              return sd_zbc_setup_reset_cmnd(cmd, false);
 +      case REQ_OP_ZONE_RESET_ALL:
 +              return sd_zbc_setup_reset_cmnd(cmd, true);
        default:
                WARN_ON_ONCE(1);
                return BLK_STS_NOTSUPP;
@@@ -1959,7 -1961,6 +1960,7 @@@ static int sd_done(struct scsi_cmnd *SC
        case REQ_OP_WRITE_ZEROES:
        case REQ_OP_WRITE_SAME:
        case REQ_OP_ZONE_RESET:
 +      case REQ_OP_ZONE_RESET_ALL:
                if (!result) {
                        good_bytes = blk_rq_bytes(req);
                        scsi_set_resid(SCpnt, 0);
@@@ -2053,6 -2054,11 +2054,6 @@@
                                           "sd_done: completed %d of %d bytes\n",
                                           good_bytes, scsi_bufflen(SCpnt)));
  
 -      if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt) &&
 -          good_bytes)
 -              t10_pi_complete(SCpnt->request, sdkp->protection_type,
 -                              good_bytes / scsi_prot_interval(SCpnt));
 -
        return good_bytes;
  }
  

diff --combined drivers/target/iscsi/cxgbit/cxgbit_cm.c
index c70caf4ea49012006c3a8ac754ff9e1c16399ec7,23a90c685dc65abe7fefd210fa4da0027feee2f5..a2b5c796bbc4a5dfee4513bd93a6449e57d4dbc4
--- 1/drivers/target/iscsi/cxgbit/cxgbit_cm.c
--- 2/drivers/target/iscsi/cxgbit/cxgbit_cm.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_cm.c
@@@ -875,12 -875,10 +875,12 @@@ static u8 cxgbit_get_iscsi_dcb_priority
                return 0;
  
        if (caps & DCB_CAP_DCBX_VER_IEEE) {
 -              iscsi_dcb_app.selector = IEEE_8021QAZ_APP_SEL_ANY;
 -
 +              iscsi_dcb_app.selector = IEEE_8021QAZ_APP_SEL_STREAM;
                ret = dcb_ieee_getapp_mask(ndev, &iscsi_dcb_app);
 -
 +              if (!ret) {
 +                      iscsi_dcb_app.selector = IEEE_8021QAZ_APP_SEL_ANY;
 +                      ret = dcb_ieee_getapp_mask(ndev, &iscsi_dcb_app);
 +              }
        } else if (caps & DCB_CAP_DCBX_VER_CEE) {
                iscsi_dcb_app.selector = DCB_APP_IDTYPE_PORTNUM;
  
@@@ -1831,7 -1829,7 +1831,7 @@@ static void cxgbit_fw4_ack(struct cxgbi
  
        while (credits) {
                struct sk_buff *p = cxgbit_sock_peek_wr(csk);
-               const u32 csum = (__force u32)p->csum;
+               u32 csum;
  
                if (unlikely(!p)) {
                        pr_err("csk 0x%p,%u, cr %u,%u+%u, empty.\n",
@@@ -1840,6 -1838,7 +1840,7 @@@
                        break;
                }
  
+               csum = (__force u32)p->csum;
                if (unlikely(credits < csum)) {
                        pr_warn("csk 0x%p,%u, cr %u,%u+%u, < %u.\n",
                                csk,  csk->tid,