Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f83e148a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8194c28e d3566abb

drivers/scsi/lpfc/lpfc_nportdisc.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);