SCSI fixes on 20191101
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. Signed-off-by: James E.J. Bottomley <jejb@linux.ibm.com> -----BEGIN PGP SIGNATURE----- iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCXbzO+iYcamFtZXMuYm90 dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pishYOpAP9/BCSY 2TAFlli2rVQe+ZNjhHcE4Gj92HNPO7ZgvDQvWgD9F184tjG+1pntYGFutoso7Ak6 QimtBw4AuYg9eDKJDKU= =bQRX -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
f83e148a41
@ -851,9 +851,9 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
|
|||||||
|
|
||||||
if (!(vport->fc_flag & FC_PT2PT)) {
|
if (!(vport->fc_flag & FC_PT2PT)) {
|
||||||
/* Check config parameter use-adisc or FCP-2 */
|
/* 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_fcp_info & NLP_FCP_2_DEVICE) &&
|
||||||
(ndlp->nlp_type & NLP_FCP_TARGET))) {
|
(ndlp->nlp_type & NLP_FCP_TARGET)))) {
|
||||||
spin_lock_irq(shost->host_lock);
|
spin_lock_irq(shost->host_lock);
|
||||||
ndlp->nlp_flag |= NLP_NPR_ADISC;
|
ndlp->nlp_flag |= NLP_NPR_ADISC;
|
||||||
spin_unlock_irq(shost->host_lock);
|
spin_unlock_irq(shost->host_lock);
|
||||||
|
@ -7866,7 +7866,7 @@ lpfc_sli4_process_missed_mbox_completions(struct lpfc_hba *phba)
|
|||||||
if (sli4_hba->hdwq) {
|
if (sli4_hba->hdwq) {
|
||||||
for (eqidx = 0; eqidx < phba->cfg_irq_chann; eqidx++) {
|
for (eqidx = 0; eqidx < phba->cfg_irq_chann; eqidx++) {
|
||||||
eq = phba->sli4_hba.hba_eq_hdl[eqidx].eq;
|
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;
|
fpeq = eq;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -440,9 +440,6 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
|
|||||||
valid = 0;
|
valid = 0;
|
||||||
if (ha->optrom_size == OPTROM_SIZE_2300 && start == 0)
|
if (ha->optrom_size == OPTROM_SIZE_2300 && start == 0)
|
||||||
valid = 1;
|
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))
|
else if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha))
|
||||||
valid = 1;
|
valid = 1;
|
||||||
if (!valid) {
|
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",
|
"Writing flash region -- 0x%x/0x%x.\n",
|
||||||
ha->optrom_region_start, ha->optrom_region_size);
|
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);
|
ha->optrom_region_start, ha->optrom_region_size);
|
||||||
|
if (rval)
|
||||||
|
rval = -EIO;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
rval = -EINVAL;
|
rval = -EINVAL;
|
||||||
|
@ -253,7 +253,7 @@ qla2x00_process_els(struct bsg_job *bsg_job)
|
|||||||
srb_t *sp;
|
srb_t *sp;
|
||||||
const char *type;
|
const char *type;
|
||||||
int req_sg_cnt, rsp_sg_cnt;
|
int req_sg_cnt, rsp_sg_cnt;
|
||||||
int rval = (DRIVER_ERROR << 16);
|
int rval = (DID_ERROR << 16);
|
||||||
uint16_t nextlid = 0;
|
uint16_t nextlid = 0;
|
||||||
|
|
||||||
if (bsg_request->msgcode == FC_BSG_RPT_ELS) {
|
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);
|
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
|
||||||
scsi_qla_host_t *vha = shost_priv(host);
|
scsi_qla_host_t *vha = shost_priv(host);
|
||||||
struct qla_hw_data *ha = vha->hw;
|
struct qla_hw_data *ha = vha->hw;
|
||||||
int rval = (DRIVER_ERROR << 16);
|
int rval = (DID_ERROR << 16);
|
||||||
int req_sg_cnt, rsp_sg_cnt;
|
int req_sg_cnt, rsp_sg_cnt;
|
||||||
uint16_t loop_id;
|
uint16_t loop_id;
|
||||||
struct fc_port *fcport;
|
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);
|
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
|
||||||
scsi_qla_host_t *vha = shost_priv(host);
|
scsi_qla_host_t *vha = shost_priv(host);
|
||||||
struct qla_hw_data *ha = vha->hw;
|
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;
|
struct qla_mt_iocb_rqst_fx00 *piocb_rqst;
|
||||||
srb_t *sp;
|
srb_t *sp;
|
||||||
int req_sg_cnt = 0, rsp_sg_cnt = 0;
|
int req_sg_cnt = 0, rsp_sg_cnt = 0;
|
||||||
|
@ -702,6 +702,7 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
|
|||||||
mcp->mb[2] = LSW(risc_addr);
|
mcp->mb[2] = LSW(risc_addr);
|
||||||
mcp->mb[3] = 0;
|
mcp->mb[3] = 0;
|
||||||
mcp->mb[4] = 0;
|
mcp->mb[4] = 0;
|
||||||
|
mcp->mb[11] = 0;
|
||||||
ha->flags.using_lr_setting = 0;
|
ha->flags.using_lr_setting = 0;
|
||||||
if (IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) ||
|
if (IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) ||
|
||||||
IS_QLA27XX(ha) || IS_QLA28XX(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)
|
if (ha->flags.exchoffld_enabled)
|
||||||
mcp->mb[4] |= ENABLE_EXCHANGE_OFFLD;
|
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;
|
mcp->in_mb |= MBX_3 | MBX_2 | MBX_1;
|
||||||
} else {
|
} else {
|
||||||
mcp->mb[1] = LSW(risc_addr);
|
mcp->mb[1] = LSW(risc_addr);
|
||||||
|
@ -3535,6 +3535,10 @@ qla2x00_shutdown(struct pci_dev *pdev)
|
|||||||
qla2x00_try_to_stop_firmware(vha);
|
qla2x00_try_to_stop_firmware(vha);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Disable timer */
|
||||||
|
if (vha->timer_active)
|
||||||
|
qla2x00_stop_timer(vha);
|
||||||
|
|
||||||
/* Turn adapter off line */
|
/* Turn adapter off line */
|
||||||
vha->flags.online = 0;
|
vha->flags.online = 0;
|
||||||
|
|
||||||
|
@ -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 lba = sectors_to_logical(sdp, blk_rq_pos(rq));
|
||||||
sector_t threshold;
|
sector_t threshold;
|
||||||
unsigned int nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
|
unsigned int nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
|
||||||
bool dif, dix;
|
|
||||||
unsigned int mask = logical_to_sectors(sdp, 1) - 1;
|
unsigned int mask = logical_to_sectors(sdp, 1) - 1;
|
||||||
bool write = rq_data_dir(rq) == WRITE;
|
bool write = rq_data_dir(rq) == WRITE;
|
||||||
unsigned char protect, fua;
|
unsigned char protect, fua;
|
||||||
blk_status_t ret;
|
blk_status_t ret;
|
||||||
|
unsigned int dif;
|
||||||
|
bool dix;
|
||||||
|
|
||||||
ret = scsi_init_io(cmd);
|
ret = scsi_init_io(cmd);
|
||||||
if (ret != BLK_STS_OK)
|
if (ret != BLK_STS_OK)
|
||||||
|
@ -98,6 +98,8 @@ static int ufs_bsg_request(struct bsg_job *job)
|
|||||||
|
|
||||||
bsg_reply->reply_payload_rcv_len = 0;
|
bsg_reply->reply_payload_rcv_len = 0;
|
||||||
|
|
||||||
|
pm_runtime_get_sync(hba->dev);
|
||||||
|
|
||||||
msgcode = bsg_request->msgcode;
|
msgcode = bsg_request->msgcode;
|
||||||
switch (msgcode) {
|
switch (msgcode) {
|
||||||
case UPIU_TRANSACTION_QUERY_REQ:
|
case UPIU_TRANSACTION_QUERY_REQ:
|
||||||
@ -135,6 +137,8 @@ static int ufs_bsg_request(struct bsg_job *job)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pm_runtime_put_sync(hba->dev);
|
||||||
|
|
||||||
if (!desc_buff)
|
if (!desc_buff)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -1831,7 +1831,7 @@ static void cxgbit_fw4_ack(struct cxgbit_sock *csk, struct sk_buff *skb)
|
|||||||
|
|
||||||
while (credits) {
|
while (credits) {
|
||||||
struct sk_buff *p = cxgbit_sock_peek_wr(csk);
|
struct sk_buff *p = cxgbit_sock_peek_wr(csk);
|
||||||
const u32 csum = (__force u32)p->csum;
|
u32 csum;
|
||||||
|
|
||||||
if (unlikely(!p)) {
|
if (unlikely(!p)) {
|
||||||
pr_err("csk 0x%p,%u, cr %u,%u+%u, empty.\n",
|
pr_err("csk 0x%p,%u, cr %u,%u+%u, empty.\n",
|
||||||
@ -1840,6 +1840,7 @@ static void cxgbit_fw4_ack(struct cxgbit_sock *csk, struct sk_buff *skb)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
csum = (__force u32)p->csum;
|
||||||
if (unlikely(credits < csum)) {
|
if (unlikely(credits < csum)) {
|
||||||
pr_warn("csk 0x%p,%u, cr %u,%u+%u, < %u.\n",
|
pr_warn("csk 0x%p,%u, cr %u,%u+%u, < %u.\n",
|
||||||
csk, csk->tid,
|
csk, csk->tid,
|
||||||
|
Loading…
Reference in New Issue
Block a user