SCSI fixes for 5.9-rc1
Subsystems (6)
James Bottomley
maintainer23 fixes in 5 drivers (qla2xxx, ufs, scsi_debug, fcoe, zfcp). The bulk of the changes are in qla2xxx and ufs and all are mostly small and definitely don't impact the core.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Adrian Hunter (3):
scsi: ufs: Improve interrupt handling for shared interrupts
scsi: ufs: Fix interrupt error message for shared interrupts
scsi: ufs-pci: Add quirk for broken auto-hibernate for Intel EHL
Arun Easi (2):
scsi: qla2xxx: Fix WARN_ON in qla_nvme_register_hba
scsi: qla2xxx: Allow ql2xextended_error_logging special value 1 to be set anytime
Bean Huo (1):
scsi: ufs: No need to send Abort Task if the task in DB was cleared
Douglas Gilbert (1):
scsi: scsi_debug: Fix scp is NULL errors
Enzo Matsumiya (1):
scsi: qla2xxx: Use MBX_TOV_SECONDS for mailbox command timeout values
Jing Xiangfeng (1):
scsi: ufs: ti-j721e-ufs: Fix error return in ti_j721e_ufs_probe()
Mike Christie (1):
scsi: fcoe: Fix I/O path allocation
Quinn Tran (7):
Revert "scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe"
scsi: qla2xxx: Fix null pointer access during disconnect from subsystem
scsi: qla2xxx: Reduce noisy debug message
scsi: qla2xxx: Fix login timeout
scsi: qla2xxx: Indicate correct supported speeds for Mezz card
scsi: qla2xxx: Flush I/O on zone disable
scsi: qla2xxx: Flush all sessions on zone disable
Saurav Kashyap (2):
Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command"
scsi: qla2xxx: Check if FW supports MQ before enabling
Stanley Chu (3):
scsi: ufs: Clean up completed request without interrupt notification
scsi: ufs-mediatek: Fix incorrect time to wait link status
scsi: ufs: Fix possible infinite loop in ufshcd_hold
Steffen Maier (1):
scsi: zfcp: Fix use-after-free in request timeout handlers
And the diffstat:
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/s390/scsi/zfcp_fsf.c | 4 +-- drivers/scsi/qla2xxx/qla_dbg.h | 3 ++ drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_gs.c | 48 ++++++++++++++++++++++----- drivers/scsi/qla2xxx/qla_isr.c | 4 +-- drivers/scsi/qla2xxx/qla_mbx.c | 22 ++++-------- drivers/scsi/qla2xxx/qla_nvme.c | 15 ++++++++- drivers/scsi/qla2xxx/qla_os.c | 9 ++--- drivers/scsi/qla2xxx/qla_target.c | 2 +- drivers/scsi/scsi_debug.c | 2 ++ drivers/scsi/ufs/ti-j721e-ufs.c | 1 + drivers/scsi/ufs/ufs-mediatek.c | 2 +- drivers/scsi/ufs/ufshcd-pci.c | 16 +++++++-- drivers/scsi/ufs/ufshcd.c | 31 +++++++++-------- drivers/scsi/ufs/ufshcd.h | 9 ++++- 16 files changed, 119 insertions(+), 52 deletions(-)
With full diff below.
James
---
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +1 -1
@@ -193,7 +193,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, }/* alloc the udl from per cpu ddp pool */ - ddp->udl =dma_pool_alloc (ddp_pool->pool,GFP_KERNEL , &ddp->udp); + ddp->udl =dma_pool_alloc (ddp_pool->pool,GFP_ATOMIC , &ddp->udp);if (!ddp->udl) {e_err (drv,"failed allocated ddp context\n" ); goto out_noddp_unmap;
drivers/s390/scsi/zfcp_fsf.c +2 -2
@@ -434,7 +434,7 @@ static void zfcp_fsf_req_complete(struct zfcp_fsf_req *req)return ; } -del_timer (&req->timer); +del_timer_sync (&req->timer);zfcp_fsf_protstatus_eval (req);zfcp_fsf_fsfstatus_eval (req); req->handler (req);
@@ -867,7 +867,7 @@ static int zfcp_fsf_req_send(struct zfcp_fsf_req *req) req->qdio_req.qdio_outb_usage =atomic_read (&qdio->req_q_free); req->issued =get_tod_clock ();if (zfcp_qdio_send (qdio, &req->qdio_req)) { -del_timer (&req->timer); +del_timer_sync (&req->timer);/* lookup request again, list might have changed */ zfcp_reqlist_find_rm (adapter->req_list, req_id);zfcp_erp_adapter_reopen (adapter,0 ,"fsrs__1" );
drivers/scsi/qla2xxx/qla_dbg.h +3 -0
@@ -380,5 +380,8 @@ extern int qla24xx_soft_reset(struct qla_hw_data *);static inline int ql_mask_match (uint level) { +if (ql2xextended_error_logging ==1 ) + ql2xextended_error_logging =QL_DBG_DEFAULT1_MASK ; +return (level & ql2xextended_error_logging) == level; }
drivers/scsi/qla2xxx/qla_def.h +1 -0
@@ -3880,6 +3880,7 @@ struct qla_hw_data { uint32_t scm_supported_f:1;/* Enabled in Driver */ uint32_t scm_enabled:1; + uint32_t max_req_queue_warned:1; } flags;uint16_t max_exchg;
drivers/scsi/qla2xxx/qla_gs.c +39 -9
82 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_isr.c +2 -2
@@ -2024,8 +2024,8 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req, res =DID_ERROR <<16 ; } } -ql_dbg (ql_dbg_user, vha,0x503f , -"ELS IOCB Done -%s error hdl=%x comp_status=0x%x error subcode 1=0x%x error subcode 2=0x%x total_byte=0x%x\n" , +ql_dbg (ql_dbg_disc, vha,0x503f , +"ELS IOCB Done -%s hdl=%x comp_status=0x%x error subcode 1=0x%x error subcode 2=0x%x total_byte=0x%x\n" , type, sp->handle, comp_status, fw_status[1 ], fw_status[2 ],le32_to_cpu (ese->total_byte_count)); goto els_ct_done;
drivers/scsi/qla2xxx/qla_mbx.c +7 -15
@@ -334,14 +334,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)if (time_after (jiffies, wait_time))break ; -/* -* Check if it's UNLOADING, cause we cannot poll in -* this case, or else a NULL pointer dereference -* is triggered. -*/ -if (unlikely (test_bit (UNLOADING , &base_vha->dpc_flags))) -return QLA_FUNCTION_TIMEOUT ; -/* Check for pending interrupts. */ qla2x00_poll (ha->rsp_q_map[0 ]);
@@ -5240,7 +5232,7 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data) mcp->mb[8 ] =MSW (risc_addr); mcp->out_mb =MBX_8 |MBX_1 |MBX_0 ; mcp->in_mb =MBX_3 |MBX_2 |MBX_0 ; - mcp->tov =30 ; + mcp->tov =MBX_TOV_SECONDS ; mcp->flags =0 ; rval =qla2x00_mailbox_command (vha, mcp);if (rval !=QLA_SUCCESS ) {
@@ -5428,7 +5420,7 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data) mcp->mb[8 ] =MSW (risc_addr); mcp->out_mb =MBX_8 |MBX_3 |MBX_2 |MBX_1 |MBX_0 ; mcp->in_mb =MBX_1 |MBX_0 ; - mcp->tov =30 ; + mcp->tov =MBX_TOV_SECONDS ; mcp->flags =0 ; rval =qla2x00_mailbox_command (vha, mcp);if (rval !=QLA_SUCCESS ) {
@@ -5700,7 +5692,7 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority, mcp->mb[9 ] = vha->vp_idx; mcp->out_mb =MBX_9 |MBX_4 |MBX_3 |MBX_2 |MBX_1 |MBX_0 ; mcp->in_mb =MBX_4 |MBX_3 |MBX_1 |MBX_0 ; - mcp->tov =30 ; + mcp->tov =MBX_TOV_SECONDS ; mcp->flags =0 ; rval =qla2x00_mailbox_command (vha, mcp);if (mb !=NULL ) {
@@ -5787,7 +5779,7 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha) mcp->out_mb =MBX_1 |MBX_0 ; mcp->in_mb =MBX_0 ; - mcp->tov =30 ; + mcp->tov =MBX_TOV_SECONDS ; mcp->flags =0 ; rval =qla2x00_mailbox_command (vha, mcp);
@@ -5822,7 +5814,7 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha) mcp->out_mb =MBX_1 |MBX_0 ; mcp->in_mb =MBX_0 ; - mcp->tov =30 ; + mcp->tov =MBX_TOV_SECONDS ; mcp->flags =0 ; rval =qla2x00_mailbox_command (vha, mcp);
@@ -6014,7 +6006,7 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)if (IS_QLA8031 (ha)) mcp->out_mb |=MBX_6 |MBX_5 |MBX_4 |MBX_3 ; mcp->in_mb =MBX_0 ; - mcp->tov =30 ; + mcp->tov =MBX_TOV_SECONDS ; mcp->flags =0 ; rval =qla2x00_mailbox_command (vha, mcp);
@@ -6050,7 +6042,7 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg) mcp->in_mb =MBX_2 |MBX_1 |MBX_0 ;if (IS_QLA8031 (ha)) mcp->in_mb |=MBX_6 |MBX_5 |MBX_4 |MBX_3 ; - mcp->tov =30 ; + mcp->tov =MBX_TOV_SECONDS ; mcp->flags =0 ; rval =qla2x00_mailbox_command (vha, mcp);
drivers/scsi/qla2xxx/qla_nvme.c +14 -1
@@ -536,6 +536,11 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,struct nvme_private *priv = fd->private;struct qla_nvme_rport *qla_rport = rport->private; +if (!priv) { +/* nvme association has been torn down */ +return rval; + } + fcport = qla_rport->fcport; if (!qpair || !fcport || (qpair && !qpair->fw_started) ||
@@ -687,7 +692,15 @@ int qla_nvme_register_hba(struct scsi_qla_host *vha) tmpl = &qla_nvme_fc_transport;WARN_ON (vha->nvme_local_port); -WARN_ON (ha->max_req_queues <3 ); + +if (ha->max_req_queues <3 ) { +if (!ha->flags.max_req_queue_warned) +ql_log (ql_log_info, vha,0x2120 , +"%s: Disabling FC-NVME due to lack of free queue pairs (%d).\n" , + __func__, ha->max_req_queues); + ha->flags.max_req_queue_warned =1 ; +return ret; + } qla_nvme_fc_transport.max_hw_queues = min((uint8_t)(qla_nvme_fc_transport.max_hw_queues),
drivers/scsi/qla2xxx/qla_os.c +5 -4
@@ -2017,6 +2017,11 @@ qla2x00_iospace_config(struct qla_hw_data *ha)/* Determine queue resources */ ha->max_req_queues = ha->max_rsp_queues =1 ; ha->msix_count =QLA_BASE_VECTORS ; + +/* Check if FW supports MQ or not */ +if (!(ha->fw_attributes &BIT_6 )) + goto mqiobase_exit; +if (!ql2xmqsupport || !ql2xnvmeenable || (!IS_QLA25XX (ha) && !IS_QLA81XX (ha))) goto mqiobase_exit;
@@ -2829,10 +2834,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)/* This may fail but that's ok */ pci_enable_pcie_error_reporting (pdev); -/* Turn off T10-DIF when FC-NVMe is enabled */ -if (ql2xnvmeenable) - ql2xenabledif =0 ; - ha =kzalloc (sizeof (struct qla_hw_data ),GFP_KERNEL );if (!ha) { ql_log_pci(ql_log_fatal, pdev, 0x0009,
drivers/scsi/qla2xxx/qla_target.c +1 -1
@@ -1270,7 +1270,7 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)qla24xx_chk_fcp_state (sess); -ql_dbg (ql_dbg_tgt, sess->vha,0xe001 , +ql_dbg (ql_dbg_disc, sess->vha,0xe001 ,"Scheduling sess %p for deletion %8phC\n" , sess, sess->port_name);
drivers/scsi/scsi_debug.c +2 -0
@@ -5490,9 +5490,11 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,u64 d =ktime_get_boottime_ns () - ns_from_boot;if (kt <= d) {/* elapsed duration >= kt */ +spin_lock_irqsave (&sqp->qc_lock, iflags); sqcp->a_cmnd =NULL ;atomic_dec (&devip->num_in_q);clear_bit (k, sqp->in_use_bm); +spin_unlock_irqrestore (&sqp->qc_lock, iflags);if (new_sd_dp)kfree (sd_dp);/* call scsi_done() from this thread */
drivers/scsi/ufs/ti-j721e-ufs.c +1 -0
@@ -38,6 +38,7 @@ static int ti_j721e_ufs_probe(struct platform_device *pdev)/* Select MPHY refclk frequency */ clk =devm_clk_get (dev,NULL );if (IS_ERR (clk)) { + ret =PTR_ERR (clk);dev_err (dev,"Cannot claim MPHY clock.\n" ); goto clk_err; }
drivers/scsi/ufs/ufs-mediatek.c +1 -1
@@ -212,7 +212,7 @@ static int ufs_mtk_wait_link_state(struct ufs_hba *hba, u32 state,ktime_t timeout, time_checked;u32 val; - timeout =ktime_add_us (ktime_get (),ms_to_ktime (max_wait_ms)); + timeout =ktime_add_ms (ktime_get (), max_wait_ms); do { time_checked = ktime_get(); ufshcd_writel(hba, 0x20, REG_UFS_DEBUG_SEL);
drivers/scsi/ufs/ufshcd-pci.c +14 -2
@@ -44,11 +44,23 @@ static int ufs_intel_link_startup_notify(struct ufs_hba *hba,return err; } +static int ufs_intel_ehl_init (struct ufs_hba *hba) +{ + hba->quirks |=UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8 ; +return 0 ; +} +static struct ufs_hba_variant_ops ufs_intel_cnl_hba_vops = { .name ="intel-pci" , .link_startup_notify = ufs_intel_link_startup_notify, }; +static struct ufs_hba_variant_ops ufs_intel_ehl_hba_vops = { + .name ="intel-pci" , + .init = ufs_intel_ehl_init, + .link_startup_notify = ufs_intel_link_startup_notify, +}; +#ifdef CONFIG_PM_SLEEP /** * ufshcd_pci_suspend - suspend power management function
@@ -177,8 +189,8 @@ static const struct dev_pm_ops ufshcd_pci_pm_ops = {static const struct pci_device_id ufshcd_pci_tbl[] = { {PCI_VENDOR_ID_SAMSUNG ,0xC00C ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VDEVICE (INTEL ,0x9DFA ), (kernel_ulong_t)&ufs_intel_cnl_hba_vops }, - {PCI_VDEVICE (INTEL ,0x4B41 ), (kernel_ulong_t)&ufs_intel_cnl_hba_vops }, - {PCI_VDEVICE (INTEL ,0x4B43 ), (kernel_ulong_t)&ufs_intel_cnl_hba_vops }, + {PCI_VDEVICE (INTEL ,0x4B41 ), (kernel_ulong_t)&ufs_intel_ehl_hba_vops }, + {PCI_VDEVICE (INTEL ,0x4B43 ), (kernel_ulong_t)&ufs_intel_ehl_hba_vops }, { }/* terminate list */ };
drivers/scsi/ufs/ufshcd.c +18 -13
@@ -1561,6 +1561,7 @@ static void ufshcd_ungate_work(struct work_struct *work)int ufshcd_hold (struct ufs_hba *hba,bool async) {int rc =0 ; +bool flush_result;unsigned long flags;if (!ufshcd_is_clkgating_allowed (hba))
@@ -1592,7 +1593,9 @@ int ufshcd_hold(struct ufs_hba *hba, bool async)break ; }spin_unlock_irqrestore (hba->host->host_lock, flags); -flush_work (&hba->clk_gating.ungate_work); + flush_result =flush_work (&hba->clk_gating.ungate_work); +if (hba->clk_gating.is_suspended && !flush_result) + goto out;spin_lock_irqsave (hba->host->host_lock, flags); goto start; }
@@ -5941,7 +5944,7 @@ static irqreturn_t ufshcd_sl_intr(struct ufs_hba *hba, u32 intr_status)*/ static irqreturn_t ufshcd_intr (int irq,void *__hba) { -u32 intr_status, enabled_intr_status; +u32 intr_status, enabled_intr_status =0 ;irqreturn_t retval =IRQ_NONE ;struct ufs_hba *hba = __hba;int retries = hba->nutrs;
@@ -5955,7 +5958,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba)* read, make sure we handle them by checking the interrupt status * again in a loop until we process all of the reqs before returning. */ - do { +while (intr_status && retries--) { enabled_intr_status = intr_status &ufshcd_readl (hba,REG_INTERRUPT_ENABLE );if (intr_status)
@@ -5964,9 +5967,9 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) retval |=ufshcd_sl_intr (hba, enabled_intr_status); intr_status =ufshcd_readl (hba,REG_INTERRUPT_STATUS ); - }while (intr_status && --retries); + } -if (retval ==IRQ_NONE ) { +if (enabled_intr_status && retval ==IRQ_NONE ) {dev_err (hba->dev,"%s: Unhandled interrupt 0x%08x\n" , __func__, intr_status);ufshcd_dump_regs (hba,0 ,UFSHCI_REG_SPACE_SIZE ,"host_regs: " );
@@ -6434,14 +6437,8 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto out; } -if (!(reg & (1 << tag))) { -dev_err (hba->dev, -"%s: cmd was completed, but without a notifying intr, tag = %d" , - __func__, tag); - } -/* Print Transfer Request of aborted task */ -dev_err (hba->dev,"%s: Device abort task at tag %d\n" , __func__, tag); +dev_info (hba->dev,"%s: Device abort task at tag %d\n" , __func__, tag);/* * Print detailed info about aborted request.
@@ -6462,6 +6459,13 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) } hba->req_abort_count++; +if (!(reg & (1 << tag))) { +dev_err (hba->dev, +"%s: cmd was completed, but without a notifying intr, tag = %d" , + __func__, tag); + goto cleanup; + } +/* Skip task abort in case previous aborts failed and report failure */ if (lrbp->req_abort_skip) { err = -EIO ;
@@ -6492,7 +6496,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)/* command completed already */ dev_err (hba->dev,"%s: cmd at tag %d successfully cleared from DB.\n" , __func__, tag); - goto out; + goto cleanup; }else { dev_err(hba->dev, "%s: no response from device. tag = %d, err %d\n",
@@ -6526,6 +6530,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto out; } +cleanup:scsi_dma_unmap (cmd);spin_lock_irqsave (host->host_lock, flags);
drivers/scsi/ufs/ufshcd.h +8 -1
@@ -520,6 +520,12 @@ enum ufshcd_quirks {* OCS FATAL ERROR with device error through sense data */ UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR =1 <<10 , + +/* +* This quirk needs to be enabled if the host controller has +* auto-hibernate capability but it doesn't work. +*/ + UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8 = 1 << 11, }; enum ufshcd_caps {
@@ -803,7 +809,8 @@ return true;static inline bool ufshcd_is_auto_hibern8_supported (struct ufs_hba *hba) { -return (hba->capabilities &MASK_AUTO_HIBERN8_SUPPORT ); +return (hba->capabilities &MASK_AUTO_HIBERN8_SUPPORT ) && + !(hba->quirks &UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8 ); }static inline bool ufshcd_is_auto_hibern8_enabled (struct ufs_hba *hba)
The pull request you sent on Fri, 21 Aug 2020 22:48:24 -0700:
The pull request you sent on Fri, 21 Aug 2020 22:48:24 -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/9e574b74b781f14fa7348ba8b980b19a250a9c83
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html