SCSI fixes for 5.4-rc5
Subsystems (4)
James Bottomley
maintainerNine 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.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Avri Altman (1):
scsi: ufs-bsg: Wake the device before sending raw upiu commands
Bart Van Assche (1):
scsi: target: cxgbit: Fix cxgbit_fw4_ack()
Daniel Wagner (2):
scsi: lpfc: Honor module parameter lpfc_use_adisc
scsi: lpfc: Check queue pointer before use
Hannes Reinecke (1):
scsi: qla2xxx: fixup incorrect usage of host_byte
Himanshu Madhani (1):
scsi: qla2xxx: Initialized mailbox to prevent driver load failure
Nicholas Piggin (1):
scsi: qla2xxx: stop timer in shutdown path
Quinn Tran (1):
scsi: qla2xxx: Fix partial flash write of MBI
Xiang Chen (1):
scsi: sd: define variable dif as unsigned int instead of bool
And the diffstat:
drivers/scsi/lpfc/lpfc_nportdisc.c | 4 ++-- drivers/scsi/lpfc/lpfc_sli.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 7 +++---- drivers/scsi/qla2xxx/qla_bsg.c | 6 +++--- drivers/scsi/qla2xxx/qla_mbx.c | 3 ++- drivers/scsi/qla2xxx/qla_os.c | 4 ++++ drivers/scsi/sd.c | 3 ++- drivers/scsi/ufs/ufs_bsg.c | 4 ++++ drivers/target/iscsi/cxgbit/cxgbit_cm.c | 3 ++- 9 files changed, 23 insertions(+), 13 deletions(-)
With full diff below.
James
---
drivers/scsi/lpfc/lpfc_nportdisc.c +2 -2
@@ -851,9 +851,9 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)if (!(vport->fc_flag &FC_PT2PT )) {/* Check config parameter use-adisc or FCP-2 */ -if ((vport->cfg_use_adisc && (vport->fc_flag &FC_RSCN_MODE )) || +if (vport->cfg_use_adisc && ((vport->fc_flag &FC_RSCN_MODE ) || ((ndlp->nlp_fcp_info &NLP_FCP_2_DEVICE ) && - (ndlp->nlp_type &NLP_FCP_TARGET ))) { + (ndlp->nlp_type &NLP_FCP_TARGET )))) {spin_lock_irq (shost->host_lock); ndlp->nlp_flag |=NLP_NPR_ADISC ;spin_unlock_irq (shost->host_lock);
drivers/scsi/lpfc/lpfc_sli.c +1 -1
@@ -7866,7 +7866,7 @@ lpfc_sli4_process_missed_mbox_completions(struct lpfc_hba *phba)if (sli4_hba->hdwq) {for (eqidx =0 ; eqidx < phba->cfg_irq_chann; eqidx++) { eq = phba->sli4_hba.hba_eq_hdl[eqidx].eq; -if (eq->queue_id == sli4_hba->mbx_cq->assoc_qid) { +if (eq && eq->queue_id == sli4_hba->mbx_cq->assoc_qid) { fpeq = eq;break ; }
drivers/scsi/qla2xxx/qla_attr.c +3 -4
@@ -440,9 +440,6 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj, 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 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,"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 ;
drivers/scsi/qla2xxx/qla_bsg.c +3 -3
@@ -253,7 +253,7 @@ qla2x00_process_els(struct bsg_job *bsg_job)srb_t *sp;const char *type;int req_sg_cnt, rsp_sg_cnt; -int rval = (DRIVER_ERROR <<16 ); +int rval = (DID_ERROR <<16 );uint16_t nextlid =0 ;if (bsg_request->msgcode ==FC_BSG_RPT_ELS ) {
@@ -432,7 +432,7 @@ qla2x00_process_ct(struct bsg_job *bsg_job)struct Scsi_Host *host =fc_bsg_to_shost (bsg_job);scsi_qla_host_t *vha =shost_priv (host);struct qla_hw_data *ha = vha->hw; -int rval = (DRIVER_ERROR <<16 ); +int rval = (DID_ERROR <<16 );int req_sg_cnt, rsp_sg_cnt;uint16_t loop_id;struct fc_port *fcport;
@@ -1950,7 +1950,7 @@ qlafx00_mgmt_cmd(struct bsg_job *bsg_job)struct Scsi_Host *host =fc_bsg_to_shost (bsg_job);scsi_qla_host_t *vha =shost_priv (host);struct qla_hw_data *ha = vha->hw; -int rval = (DRIVER_ERROR <<16 ); +int rval = (DID_ERROR <<16 );struct qla_mt_iocb_rqst_fx00 *piocb_rqst;srb_t *sp;int req_sg_cnt =0 , rsp_sg_cnt =0 ;
drivers/scsi/qla2xxx/qla_mbx.c +2 -1
@@ -702,6 +702,7 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr) mcp->mb[2 ] =LSW (risc_addr); mcp->mb[3 ] =0 ; mcp->mb[4 ] =0 ; + mcp->mb[11 ] =0 ; ha->flags.using_lr_setting =0 ;if (IS_QLA25XX (ha) ||IS_QLA81XX (ha) ||IS_QLA83XX (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) {
@@ -746,7 +747,7 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)if (ha->flags.exchoffld_enabled) mcp->mb[4 ] |=ENABLE_EXCHANGE_OFFLD ; - mcp->out_mb |=MBX_4 |MBX_3 |MBX_2 |MBX_1 ; + mcp->out_mb |=MBX_4 |MBX_3 |MBX_2 |MBX_1 |MBX_11 ; mcp->in_mb |=MBX_3 |MBX_2 |MBX_1 ; }else { mcp->mb[1 ] =LSW (risc_addr);
drivers/scsi/qla2xxx/qla_os.c +4 -0
@@ -3529,6 +3529,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 ;
drivers/scsi/sd.c +2 -1
@@ -1166,11 +1166,12 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd)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 )
drivers/scsi/ufs/ufs_bsg.c +4 -0
@@ -98,6 +98,8 @@ static int ufs_bsg_request(struct bsg_job *job) bsg_reply->reply_payload_rcv_len =0 ; +pm_runtime_get_sync (hba->dev); + msgcode = bsg_request->msgcode;switch (msgcode) {case UPIU_TRANSACTION_QUERY_REQ :
@@ -135,6 +137,8 @@ static int ufs_bsg_request(struct bsg_job *job)break ; } +pm_runtime_put_sync (hba->dev); +if (!desc_buff) goto out;
drivers/target/iscsi/cxgbit/cxgbit_cm.c +2 -1
@@ -1829,7 +1829,7 @@ static void cxgbit_fw4_ack(struct cxgbit_sock *csk, struct sk_buff *skb)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",
@@ -1838,6 +1838,7 @@ static void cxgbit_fw4_ack(struct cxgbit_sock *csk, struct sk_buff *skb)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,
The pull request you sent on Fri, 01 Nov 2019 18:07:07 -0700:
The pull request you sent on Fri, 01 Nov 2019 18:07:07 -0700:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f83e148a410006397f01e96570e73038a3a261fa
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker