qla2xxx driver enhancements
Subsystems (2)
Nilesh Javali
maintainercover qla2xxx driver enhancements
Martin,
Please apply the qla2xxx driver enhancements to the scsi tree at your earliest convenience.
Thanks,
Nilesh
Bikash Hazarika (1):
qla2xxx: Wait for ABTS response on I/O timeouts for NVMe
Nilesh Javali (1):
qla2xxx: Update version to 10.02.00.105-k
Quinn Tran (1):
qla2xxx: Fix mailbox Ch erroneous error
Saurav Kashyap (4):
qla2xxx: Implementation to get and manage host, target stats and
initiator port
qla2xxx: Add error counters to debugfs node
qla2xxx: Move some messages from debug to normal log level
qla2xxx: Enable NVME CONF (BIT_7) when enabling SLER
drivers/scsi/qla2xxx/qla_attr.c | 9 + drivers/scsi/qla2xxx/qla_bsg.c | 342 +++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_bsg.h | 5 + drivers/scsi/qla2xxx/qla_dbg.c | 1 + drivers/scsi/qla2xxx/qla_def.h | 83 +++++++ drivers/scsi/qla2xxx/qla_dfs.c | 28 +++ drivers/scsi/qla2xxx/qla_fw.h | 27 ++- drivers/scsi/qla2xxx/qla_gbl.h | 29 +++ drivers/scsi/qla2xxx/qla_gs.c | 1 + drivers/scsi/qla2xxx/qla_init.c | 230 ++++++++++++++++++- drivers/scsi/qla2xxx/qla_iocb.c | 8 + drivers/scsi/qla2xxx/qla_isr.c | 82 ++++--- drivers/scsi/qla2xxx/qla_mbx.c | 18 +- drivers/scsi/qla2xxx/qla_nvme.c | 90 +++++++- drivers/scsi/qla2xxx/qla_os.c | 25 +++ drivers/scsi/qla2xxx/qla_version.h | 4 +- 16 files changed, 942 insertions(+), 40 deletions(-)
base-commit: be1b500212541a70006887bae558ff834d7365d0
Signature · 1 line
2.19.0.rc0
Nilesh Javali
maintainerPATCH 1/7 qla2xxx: Implementation to get and manage host, target stats and initiator port
From: Saurav Kashyap <[email protected]>
This statistics will help in debugging process and checking specific error counts.
--- drivers/scsi/qla2xxx/qla_attr.c | 9 + drivers/scsi/qla2xxx/qla_bsg.c | 342 ++++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_bsg.h | 5 + drivers/scsi/qla2xxx/qla_def.h | 71 +++++++ drivers/scsi/qla2xxx/qla_gbl.h | 23 +++ drivers/scsi/qla2xxx/qla_gs.c | 1 + drivers/scsi/qla2xxx/qla_init.c | 216 ++++++++++++++++++++ drivers/scsi/qla2xxx/qla_isr.c | 22 ++ drivers/scsi/qla2xxx/qla_mbx.c | 9 + drivers/scsi/qla2xxx/qla_os.c | 20 ++ 10 files changed, 718 insertions(+)
drivers/scsi/qla2xxx/qla_attr.c +9 -0
@@ -710,6 +710,12 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,ql_log (ql_log_info, vha,0x706e ,"Issuing ISP reset.\n" ); +if (vha->hw->flags.port_isolated) { +ql_log (ql_log_info, vha,0x706e , +"Port is isolated, returning.\n" ); +return -EINVAL ; + } +scsi_block_requests (vha->host);if (IS_QLA82XX (ha)) { ha->flags.isp82xx_no_md_cap =1 ;
@@ -2717,6 +2723,9 @@ qla2x00_issue_lip(struct Scsi_Host *shost)if (IS_QLAFX00 (vha->hw))return 0 ; +if (vha->hw->flags.port_isolated) +return 0 ; +qla2x00_loop_reset (vha);return 0 ; }
drivers/scsi/qla2xxx/qla_bsg.c +342 -0
372 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_bsg.h +5 -0
@@ -31,6 +31,10 @@#define QL_VND_DPORT_DIAGNOSTICS 0x19#define QL_VND_GET_PRIV_STATS_EX 0x1A#define QL_VND_SS_GET_FLASH_IMAGE_STATUS 0x1E +#define QL_VND_MANAGE_HOST_STATS 0x23 +#define QL_VND_GET_HOST_STATS 0x24 +#define QL_VND_GET_TGT_STATS 0x25 +#define QL_VND_MANAGE_HOST_PORT 0x26/* BSG Vendor specific subcode returns */ #define EXT_STATUS_OK 0
@@ -40,6 +44,7 @@#define EXT_STATUS_DATA_OVERRUN 7#define EXT_STATUS_DATA_UNDERRUN 8#define EXT_STATUS_MAILBOX 11 +#define EXT_STATUS_BUFFER_TOO_SMALL 16#define EXT_STATUS_NO_MEMORY 17#define EXT_STATUS_DEVICE_OFFLINE 22
drivers/scsi/qla2xxx/qla_def.h +71 -0
95 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_gbl.h +23 -0
@@ -945,4 +945,27 @@ extern void qla2x00_dfs_remove_rport(scsi_qla_host_t *vha, struct fc_port *fp);/* nvme.c */ void qla_nvme_unregister_remote_port (struct fc_port *fcport);void qla_handle_els_plogi_done (scsi_qla_host_t *vha,struct event_arg *ea); + +#define QLA2XX_HW_ERROR BIT_0 +#define QLA2XX_SHT_LNK_DWN BIT_1 +#define QLA2XX_INT_ERR BIT_2 +#define QLA2XX_CMD_TIMEOUT BIT_3 +#define QLA2XX_RESET_CMD_ERR BIT_4 +#define QLA2XX_TGT_SHT_LNK_DOWN BIT_17 + +#define QLA2XX_MAX_LINK_DOWN_TIME 100 + +int qla2xxx_start_stats (struct Scsi_Host *shost,u32 flags); +int qla2xxx_stop_stats (struct Scsi_Host *shost,u32 flags); +int qla2xxx_reset_stats (struct Scsi_Host *shost,u32 flags); + +int qla2xxx_get_ini_stats (struct Scsi_Host *shost,u32 flags,void *data,u64 size); +int qla2xxx_get_tgt_stats (struct Scsi_Host *shost,u32 flags, +struct fc_rport *rport,void *data,u64 size); +int qla2xxx_disable_port (struct Scsi_Host *shost); +int qla2xxx_enable_port (struct Scsi_Host *shost); + +uint64_t qla2x00_get_num_tgts (scsi_qla_host_t *vha); +uint64_t qla2x00_count_set_bits (u32 num); +#endif /* _QLA_GBL_H */
drivers/scsi/qla2xxx/qla_gs.c +1 -0
@@ -3563,6 +3563,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) __func__, __LINE__, fcport->port_name); + fcport->tgt_link_down_time =0 ;qlt_schedule_sess_for_deletion (fcport);continue ; }
drivers/scsi/qla2xxx/qla_init.c +216 -0
249 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_isr.c +22 -0
@@ -1059,6 +1059,9 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)case MBA_SYSTEM_ERR :/* System Error */ mbx =0 ; + + vha->hw_err_cnt++; +if (IS_QLA81XX (ha) ||IS_QLA83XX (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) {u16 m[4 ];
@@ -1112,6 +1115,8 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)ql_log (ql_log_warn, vha,0x5006 ,"ISP Request Transfer Error (%x).\n" , mb[1 ]); + vha->hw_err_cnt++; +set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);break ;
@@ -1119,6 +1124,8 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)ql_log (ql_log_warn, vha,0x5007 ,"ISP Response Transfer Error (%x).\n" , mb[1 ]); + vha->hw_err_cnt++; +set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);break ;
@@ -1176,12 +1183,18 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) vha->flags.management_server_logged_in =0 ;qla2x00_post_aen_work (vha,FCH_EVT_LINKUP , ha->link_data_rate); +if (vha->link_down_time < vha->hw->port_down_retry_count) { + vha->short_link_down_cnt++; + vha->link_down_time =QLA2XX_MAX_LINK_DOWN_TIME ; + } +break ;case MBA_LOOP_DOWN :/* Loop Down Event */ SAVE_TOPO (ha); ha->flags.lip_ae =0 ; ha->current_topology =0 ; + vha->link_down_time =0 ; mbx = (IS_QLA81XX (ha) ||IS_QLA8031 (ha)) ?rd_reg_word (®24->mailbox4) :0 ;
@@ -1503,6 +1516,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)ql_dbg (ql_dbg_async, vha,0x5016 ,"Discard RND Frame -- %04x %04x %04x.\n" , mb[1 ], mb[2 ], mb[3 ]); + vha->interface_err_cnt++;break ;case MBA_TRACE_NOTIFICATION :
@@ -1592,6 +1606,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)case MBA_IDC_AEN :if (IS_QLA27XX (ha) ||IS_QLA28XX (ha)) { + vha->hw_err_cnt++;qla27xx_handle_8200_aen (vha, mb); }else if (IS_QLA83XX (ha)) { mb[4 ] =rd_reg_word (®24->mailbox4);
@@ -3101,6 +3116,8 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)"Dropped frame(s) detected (0x%x of 0x%x bytes).\n" , resid, scsi_bufflen(cp)); + vha->interface_err_cnt++; + res =DID_ERROR <<16 | lscsi_status; goto check_scsi_status; }
@@ -3126,6 +3143,8 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)"Dropped frame(s) detected (0x%x of 0x%x bytes).\n" , resid, scsi_bufflen(cp)); + vha->interface_err_cnt++; + res =DID_ERROR <<16 | lscsi_status; goto check_scsi_status; }else {
@@ -3208,6 +3227,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)case CS_TRANSPORT : res =DID_ERROR <<16 ; + vha->hw_err_cnt++;if (!IS_PI_SPLIT_DET_CAPABLE (ha))break ;
@@ -3228,6 +3248,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)ql_dump_buffer (ql_dbg_tgt + ql_dbg_verbose, vha,0xe0ee , pkt,sizeof (*sts24)); res =DID_ERROR <<16 ; + vha->hw_err_cnt++;break ;default : res =DID_ERROR <<16 ;
@@ -3839,6 +3860,7 @@ qla24xx_msix_default(int irq, void *dev_id) hccr);qla2xxx_check_risc_status (vha); + vha->hw_err_cnt++; ha->isp_ops->fw_dump (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);
drivers/scsi/qla2xxx/qla_mbx.c +9 -0
@@ -180,6 +180,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)ql_log (ql_log_warn, vha,0xd035 ,"Cmd access timeout, cmd=0x%x, Exiting.\n" , mcp->mb[0 ]); + vha->hw_err_cnt++;atomic_dec (&ha->num_pend_mbx_stage1);return QLA_FUNCTION_TIMEOUT ; }
@@ -307,6 +308,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)atomic_dec (&ha->num_pend_mbx_stage2);ql_dbg (ql_dbg_mbx, vha,0x1012 ,"Pending mailbox timeout, exiting.\n" ); + vha->hw_err_cnt++; rval =QLA_FUNCTION_TIMEOUT ; goto premature_exit; }
@@ -418,6 +420,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)"mb[0-3]=[0x%x 0x%x 0x%x 0x%x] mb7 0x%x host_status 0x%x hccr 0x%x\n" , command, ictrl, jiffies, mb[0 ], mb[1 ], mb[2 ], mb[3 ], mb[7], host_status, hccr); + vha->hw_err_cnt++; }else { mb[0 ] =RD_MAILBOX_REG (ha, ®->isp,0 );
@@ -425,6 +428,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)ql_dbg (ql_dbg_mbx + ql_dbg_buffer, vha,0x1119 ,"MBX Command timeout for cmd %x, iocontrol=%x jiffies=%lx " "mb[0]=0x%x\n" , command, ictrl, jiffies, mb[0 ]); + vha->hw_err_cnt++; }ql_dump_regs (ql_dbg_mbx + ql_dbg_buffer, vha,0x1019 );
@@ -497,6 +501,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)"mb[0]=0x%x, eeh_busy=0x%x. Scheduling ISP " "abort.\n" , command, mcp->mb[0 ], ha->flags.eeh_busy); + vha->hw_err_cnt++;set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);qla2xxx_wake_dpc (vha); }
@@ -521,6 +526,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)"Mailbox cmd timeout occurred, cmd=0x%x, " "mb[0]=0x%x. Scheduling ISP abort " , command, mcp->mb[0]); + vha->hw_err_cnt++;set_bit (ABORT_ISP_ACTIVE , &vha->dpc_flags);clear_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);/* Allow next mbx cmd to come in. */
@@ -625,6 +631,7 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,ql_dbg (ql_dbg_mbx, vha,0x1023 ,"Failed=%x mb[0]=%x mb[1]=%x.\n" , rval, mcp->mb[0 ], mcp->mb[1 ]); + vha->hw_err_cnt++; }else {ql_dbg (ql_dbg_mbx + ql_dbg_verbose, vha,0x1024 ,"Done %s.\n" , __func__);
@@ -736,6 +743,7 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)ql_dbg (ql_dbg_mbx, vha,0x1026 ,"Failed=%x mb[0]=%x.\n" , rval, mcp->mb[0 ]); + vha->hw_err_cnt++;return rval; }
@@ -1313,6 +1321,7 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)if (rval !=QLA_SUCCESS ) {/*EMPTY*/ ql_dbg (ql_dbg_mbx, vha,0x1033 ,"Failed=%x.\n" , rval); + vha->hw_err_cnt++; }else {/*EMPTY*/ ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1034,
drivers/scsi/qla2xxx/qla_os.c +20 -0
@@ -1274,6 +1274,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) sp =scsi_cmd_priv (cmd); qpair = sp->qpair; + vha->cmd_timeout_cnt++; +if ((sp->fcport && sp->fcport->deleted) || !qpair)return SUCCESS ;
@@ -1442,6 +1444,7 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,"%s RESET FAILED: %s nexus=%ld:%d:%llu cmd=%p.\n" , name, reset_errors[err], vha->host_no, cmd->device->id, cmd->device->lun, cmd); + vha->reset_cmd_err_cnt++;return FAILED ; }
@@ -3141,6 +3144,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ha->mr.fcport.supported_classes =FC_COS_UNSPECIFIED ; ha->mr.fcport.scan_state =1 ; +qla2xxx_reset_stats (host,QLA2XX_HW_ERROR |QLA2XX_SHT_LNK_DWN | +QLA2XX_INT_ERR |QLA2XX_CMD_TIMEOUT | +QLA2XX_RESET_CMD_ERR |QLA2XX_TGT_SHT_LNK_DOWN ); +/* Set the SG table size based on ISP type */ if (!IS_FWI2_CAPABLE (ha)) {if (IS_QLA2100 (ha))
@@ -5090,6 +5097,7 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e) fcport->d_id = e->u.new_sess.id; fcport->flags |=FCF_FABRIC_DEVICE ; fcport->fw_login_state =DSC_LS_PLOGI_PEND ; + fcport->tgt_short_link_down_cnt =0 ;memcpy (fcport->port_name, e->u.new_sess.port_name,WWN_SIZE );
@@ -7061,6 +7069,8 @@ qla2x00_timer(struct timer_list *t)uint16_t w;struct qla_hw_data *ha = vha->hw;struct req_que *req; +unsigned long flags; +fc_port_t *fcport =NULL ;if (ha->flags.eeh_busy) { ql_dbg(ql_dbg_timer, vha, 0x6000,
@@ -7092,6 +7102,16 @@ qla2x00_timer(struct timer_list *t)if (!vha->vp_idx &&IS_QLAFX00 (ha))qlafx00_timer_routine (vha); +if (vha->link_down_time <QLA2XX_MAX_LINK_DOWN_TIME ) + vha->link_down_time++; + +spin_lock_irqsave (&vha->hw->tgt.sess_lock, flags); +list_for_each_entry (fcport, &vha->vp_fcports, list) { +if (fcport->tgt_link_down_time <QLA2XX_MAX_LINK_DOWN_TIME ) + fcport->tgt_link_down_time++; + } +spin_unlock_irqrestore (&vha->hw->tgt.sess_lock, flags); +/* Loop down handler. */ if (atomic_read(&vha->loop_down_timer) > 0 && !(test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags)) &&
Signature · 1 line
2.19.0.rc0
kernel test robot
build botRe: [PATCH 1/7] qla2xxx: Implementation to get and manage host, target stats and initiator port
I love your patch! Perhaps something to improve:
Hi Nilesh,
I love your patch! Perhaps something to improve:
[auto build test WARNING on be1b500212541a70006887bae558ff834d7365d0]
url: https://github.com/0day-ci/linux/commits/Nilesh-Javali/qla2xxx-driver-enhancements/20201223-171449 base: be1b500212541a70006887bae558ff834d7365d0 config: arm-randconfig-r003-20201229 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project cee1e7d14f4628d6174b33640d502bff3b54ae45)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/0day-ci/linux/commit/91215cb3603060400922e6d25eebb732dc0e4e7a
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Nilesh-Javali/qla2xxx-driver-enhancements/20201223-171449 git checkout 91215cb3603060400922e6d25eebb732dc0e4e7a
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/scsi/qla2xxx/qla_bsg.c:2657:3: warning: variable 'data' is uninitialized when used here [-Wuninitialized]
data->status = EXT_STATUS_BUFFER_TOO_SMALL;
^~~~
drivers/scsi/qla2xxx/qla_bsg.c:2627:36: note: initialize the variable 'data' to silence this warning
struct ql_vnd_tgt_stats_resp *data;
^
= NULL1 warning generated.
vim +/data +2657 drivers/scsi/qla2xxx/qla_bsg.c
2617
2618 static int
2619 qla2x00_get_tgt_stats(struct bsg_job *bsg_job)
2620 {
2621 scsi_qla_host_t *vha = shost_priv(fc_bsg_to_shost(bsg_job));
2622 struct fc_bsg_reply *bsg_reply = bsg_job->reply;
2623 struct ql_vnd_tgt_stats_param *req_data;
2624 u32 req_data_len;
2625 int ret = 0;
2626 u64 response_len = 0;
2627 struct ql_vnd_tgt_stats_resp *data;
2628 struct fc_rport *rport = NULL;
2629
2630 if (!vha->flags.online) {
2631 ql_log(ql_log_warn, vha, 0x0000, "Host is not online.\n");
2632 return -EIO;
2633 }
2634
2635 req_data_len = bsg_job->request_payload.payload_len;
2636
2637 if (req_data_len != sizeof(struct ql_vnd_stat_entry)) {
2638 ql_log(ql_log_warn, vha, 0x0000, "req_data_len invalid.\n");
2639 return -EIO;
2640 }
2641
2642 req_data = kzalloc(sizeof(*req_data), GFP_KERNEL);
2643 if (!req_data) {
2644 ql_log(ql_log_warn, vha, 0x0000, "req_data memory allocation failure.\n");
2645 return -ENOMEM;
2646 }
2647
2648 /* Copy the request buffer in req_data */
2649 sg_copy_to_buffer(bsg_job->request_payload.sg_list,
2650 bsg_job->request_payload.sg_cnt,
2651 req_data, req_data_len);
2652
2653 response_len = sizeof(struct ql_vnd_tgt_stats_resp) +
2654 sizeof(struct ql_vnd_stat_entry);
2655
2656 if (response_len > bsg_job->reply_payload.payload_len) {
> 2657 data->status = EXT_STATUS_BUFFER_TOO_SMALL;
2658 bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = EXT_STATUS_BUFFER_TOO_SMALL;
2659 bsg_job->reply_payload.payload_len = sizeof(struct ql_vnd_mng_host_stats_resp);
2660
2661 bsg_reply->reply_payload_rcv_len =
2662 sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
2663 bsg_job->reply_payload.sg_cnt, &data,
2664 sizeof(struct ql_vnd_tgt_stats_resp));
2665
2666 bsg_reply->result = DID_OK;
2667 bsg_job_done(bsg_job, bsg_reply->result,
2668 bsg_reply->reply_payload_rcv_len);
2669 goto tgt_stat_out;
2670 }
2671
2672 /* structure + size for one entry */
2673 data = kzalloc(response_len, GFP_KERNEL);
2674 if (!data) {
2675 kfree(req_data);
2676 return -ENOMEM;
2677 }
2678
2679 rport = qla2xxx_find_rport(vha, req_data->tgt_id);
2680 if (!rport) {
2681 ql_log(ql_log_warn, vha, 0x0000, "target %d not found.\n", req_data->tgt_id);
2682 ret = EXT_STATUS_INVALID_PARAM;
2683 data->status = EXT_STATUS_INVALID_PARAM;
2684 goto reply;
2685 }
2686
2687 ret = qla2xxx_get_tgt_stats(fc_bsg_to_shost(bsg_job), req_data->stat_type,
2688 rport, (void *)data, response_len);
2689
2690 bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = EXT_STATUS_OK;
2691 reply:
2692 bsg_reply->reply_payload_rcv_len =
2693 sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
2694 bsg_job->reply_payload.sg_cnt, data,
2695 response_len);
2696 bsg_reply->result = DID_OK;
2697 bsg_job_done(bsg_job, bsg_reply->result,
2698 bsg_reply->reply_payload_rcv_len);
2699
2700 kfree(data);
2701 tgt_stat_out:
2702 kfree(req_data);
2703
2704 return ret;
2705 }
2706
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Nilesh Javali
maintainerPATCH 2/7 qla2xxx: Add error counters to debugfs node
In reply to Nilesh JavaliFrom: Saurav Kashyap <[email protected]>
Display error counters via debugfs node.
--- drivers/scsi/qla2xxx/qla_dfs.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/scsi/qla2xxx/qla_dfs.c +28 -0
@@ -286,6 +286,10 @@ qla_dfs_tgt_counters_show(struct seq_file *s, void *unused) core_qla_snd_status, qla_core_ret_sta_ctio, core_qla_free_cmd, num_q_full_sent, num_alloc_iocb_failed, num_term_xchg_sent;u16 i; +fc_port_t *fcport =NULL ; + +if (qla2x00_chip_is_down (vha)) +return 0 ; qla_core_sbt_cmd = qpair->tgt_counters.qla_core_sbt_cmd; core_qla_que_buf = qpair->tgt_counters.core_qla_que_buf;
@@ -349,6 +353,30 @@ qla_dfs_tgt_counters_show(struct seq_file *s, void *unused) vha->qla_stats.qla_dif_stats.dif_ref_tag_err);seq_printf (s,"DIF App tag err = %d\n" , vha->qla_stats.qla_dif_stats.dif_app_tag_err); + +seq_puts (s,"\n" ); +seq_puts (s,"Initiator Error Counters\n" ); +seq_printf (s,"HW Error Count = %14lld\n" , + vha->hw_err_cnt); +seq_printf (s,"Link Down Count = %14lld\n" , + vha->short_link_down_cnt); +seq_printf (s,"Interface Err Count = %14lld\n" , + vha->interface_err_cnt); +seq_printf (s,"Cmd Timeout Count = %14lld\n" , + vha->cmd_timeout_cnt); +seq_printf (s,"Reset Count = %14lld\n" , + vha->reset_cmd_err_cnt); +seq_puts (s,"\n" ); + +list_for_each_entry (fcport, &vha->vp_fcports, list) { +if (!fcport || !fcport->rport) +continue ; + +seq_printf (s,"Target Num = %7d Link Down Count = %14lld\n" , + fcport->rport->number, fcport->tgt_short_link_down_cnt); + } +seq_puts (s,"\n" ); +return 0 ; }
Signature · 1 line
2.19.0.rc0
Nilesh Javali
maintainerPATCH 3/7 qla2xxx: Move some messages from debug to normal log level
In reply to Nilesh JavaliFrom: Saurav Kashyap <[email protected]>
This change will aid in debugging issues where debug level is not set.
--- drivers/scsi/qla2xxx/qla_init.c | 10 +++---- drivers/scsi/qla2xxx/qla_isr.c | 52 ++++++++++++++++----------------- 2 files changed, 30 insertions(+), 32 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +5 -5
@@ -347,11 +347,11 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport,if (NVME_TARGET (vha->hw, fcport)) lio->u.logio.flags |=SRB_LOGIN_SKIP_PRLI ; -ql_dbg (ql_dbg_disc, vha,0x2072 , -"Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x " -"retries=%d.\n" , fcport->port_name, sp->handle, fcport->loop_id, - fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa, - fcport->login_retry); +ql_log (ql_log_warn, vha,0x2072 , +"Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x retries=%d.\n" , + fcport->port_name, sp->handle, fcport->loop_id, + fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa, + fcport->login_retry); rval =qla2x00_start_sp (sp);if (rval !=QLA_SUCCESS ) {
drivers/scsi/qla2xxx/qla_isr.c +25 -27
88 lines not on this page · raw message
Signature · 1 line
2.19.0.rc0
Nilesh Javali
maintainerPATCH 4/7 qla2xxx: Wait for ABTS response on I/O timeouts for NVMe
In reply to Nilesh JavaliFrom: Bikash Hazarika <[email protected]>
FW needs to wait for an ABTS response before completing the I/O
--- drivers/scsi/qla2xxx/qla_def.h | 12 +++++ drivers/scsi/qla2xxx/qla_fw.h | 27 ++++++++-- drivers/scsi/qla2xxx/qla_gbl.h | 6 +++ drivers/scsi/qla2xxx/qla_init.c | 4 ++ drivers/scsi/qla2xxx/qla_iocb.c | 6 +++ drivers/scsi/qla2xxx/qla_isr.c | 8 +++ drivers/scsi/qla2xxx/qla_mbx.c | 6 +++ drivers/scsi/qla2xxx/qla_nvme.c | 90 ++++++++++++++++++++++++++++++++- drivers/scsi/qla2xxx/qla_os.c | 5 ++ 9 files changed, 159 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +12 -0
@@ -2101,6 +2101,7 @@ typedef struct {#define CS_COMPLETE_CHKCOND 0x30/* Error? */ #define CS_IOCB_ERROR 0x31/* Generic error for IOCB request failure */ +#define CS_REJECT_RECEIVED 0x4E/* Reject received */ #define CS_BAD_PAYLOAD 0x80/* Driver defined */ #define CS_UNKNOWN 0x81/* Driver defined */ #define CS_RETRY 0x82/* Driver defined */
@@ -4150,6 +4151,17 @@ struct qla_hw_data {/* Bit 21 of fw_attributes decides the MCTP capabilities */ #define IS_MCTP_CAPABLE (ha) (IS_QLA2031(ha) && \ ((ha)->fw_attributes_ext[0] & BIT_0)) +#define QLA_ABTS_FW_ENABLED (_ha) ((_ha)->fw_attributes_ext[0] & BIT_14) +#define QLA_SRB_NVME_LS (_sp) ((_sp)->type == SRB_NVME_LS) +#define QLA_SRB_NVME_CMD (_sp) ((_sp)->type == SRB_NVME_CMD) +#define QLA_NVME_IOS (_sp) (QLA_SRB_NVME_CMD(_sp) || QLA_SRB_NVME_LS(_sp)) +#define QLA_LS_ABTS_WAIT_ENABLED (_sp) \ + (QLA_SRB_NVME_LS(_sp) && QLA_ABTS_FW_ENABLED(_sp->fcport->vha->hw)) +#define QLA_CMD_ABTS_WAIT_ENABLED (_sp) \ + (QLA_SRB_NVME_CMD(_sp) && QLA_ABTS_FW_ENABLED(_sp->fcport->vha->hw)) +#define QLA_ABTS_WAIT_ENABLED (_sp) \ + (QLA_NVME_IOS(_sp) && QLA_ABTS_FW_ENABLED(_sp->fcport->vha->hw)) +#define IS_PI_UNINIT_CAPABLE (ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))#define IS_PI_IPGUARD_CAPABLE (ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))#define IS_PI_DIFB_DIX0_CAPABLE (ha) (0)
drivers/scsi/qla2xxx/qla_fw.h +23 -4
@@ -982,11 +982,18 @@ struct abort_entry_24xx {uint32_t handle;/* System handle. */ -__le16 nport_handle;/* N_PORT handle. */ -/* or Completion status. */ +union { +__le16 nport_handle;/* N_PORT handle. */ +__le16 comp_status;/* Completion status. */ + };__le16 options;/* Options. */ #define AOF_NO_ABTS BIT_0/* Do not send any ABTS. */ +#define AOF_NO_RRQ BIT_1/* Do not send RRQ. */ +#define AOF_ABTS_TIMEOUT BIT_2/* Disable logout on ABTS timeout. */ +#define AOF_ABTS_RTY_CNT BIT_3/* Use driver specified retry count. */ +#define AOF_RSP_TIMEOUT BIT_4/* Use specified response timeout. */ +uint32_t handle_to_abort;/* System handle to abort. */
@@ -995,8 +1002,20 @@ struct abort_entry_24xx {uint8_t port_id[3 ];/* PortID of destination port. */ uint8_t vp_index; - -uint8_t reserved_2[12 ]; +u8 reserved_2[4 ]; +union { +struct { +__le16 abts_rty_cnt; +__le16 rsp_timeout; + } drv; +struct { +u8 ba_rjt_vendorUnique; +u8 ba_rjt_reasonCodeExpl; +u8 ba_rjt_reasonCode; +u8 reserved_3; + } fw; + }; +u8 reserved_4[4 ]; };#define ABTS_RCV_TYPE 0x54
drivers/scsi/qla2xxx/qla_gbl.h +6 -0
@@ -177,6 +177,7 @@ extern int ql2xexlogins;extern int ql2xdifbundlinginternalbuffers;extern int ql2xfulldump_on_mpifail;extern int ql2xenforce_iocb_limit; +extern int ql2xabts_wait_nvme;extern int qla2x00_loop_reset (scsi_qla_host_t *);extern void qla2x00_abort_all_cmds (scsi_qla_host_t *,int );
@@ -941,6 +942,11 @@ int qla2x00_set_data_rate(scsi_qla_host_t *vha, uint16_t mode);extern void qla24xx_process_purex_list (struct purex_list *);extern void qla2x00_dfs_create_rport (scsi_qla_host_t *vha,struct fc_port *fp);extern void qla2x00_dfs_remove_rport (scsi_qla_host_t *vha,struct fc_port *fp); +extern void qla_wait_nvme_release_cmd_kref (srb_t *sp); +extern void qla_nvme_abort_set_option + (struct abort_entry_24xx *abt,srb_t *sp); +extern void qla_nvme_abort_process_comp_status + (struct abort_entry_24xx *abt,srb_t *sp);/* nvme.c */ void qla_nvme_unregister_remote_port (struct fc_port *fcport);
drivers/scsi/qla2xxx/qla_init.c +4 -0
@@ -136,6 +136,10 @@ static void qla24xx_abort_iocb_timeout(void *data)static void qla24xx_abort_sp_done (srb_t *sp,int res) {struct srb_iocb *abt = &sp->u.iocb_cmd; +srb_t *orig_sp = sp->cmd_sp; + +if (orig_sp) +qla_wait_nvme_release_cmd_kref (orig_sp);del_timer (&sp->u.iocb_cmd.timer);if (sp->flags &SRB_WAKEUP_ON_COMP )
drivers/scsi/qla2xxx/qla_iocb.c +6 -0
@@ -3571,6 +3571,7 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb)struct srb_iocb *aio = &sp->u.iocb_cmd;scsi_qla_host_t *vha = sp->vha;struct req_que *req = sp->qpair->req; +srb_t *orig_sp = sp->cmd_sp;memset (abt_iocb,0 ,sizeof (struct abort_entry_24xx )); abt_iocb->entry_type =ABORT_IOCB_TYPE ;
@@ -3587,6 +3588,11 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb) aio->u.abt.cmd_hndl); abt_iocb->vp_index = vha->vp_idx; abt_iocb->req_que_no = aio->u.abt.req_que_no; + +/* need to pass original sp */ +if (orig_sp) +qla_nvme_abort_set_option (abt_iocb, orig_sp); +/* Send the command to the firmware */ wmb (); }
drivers/scsi/qla2xxx/qla_isr.c +8 -0
@@ -5,6 +5,7 @@*/ #include "qla_def.h" #include "qla_target.h" +#include "qla_gbl.h" #include <linux/delay.h> #include <linux/slab.h>
@@ -3431,6 +3432,7 @@ qla24xx_abort_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, {const char func[] ="ABT_IOCB" ;srb_t *sp; +srb_t *orig_sp =NULL ;struct srb_iocb *abt; sp =qla2x00_get_sp_from_handle (vha, func, req, pkt);
@@ -3439,6 +3441,12 @@ qla24xx_abort_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, abt = &sp->u.iocb_cmd; abt->u.abt.comp_status = pkt->nport_handle; + abt->u.abt.comp_status =le16_to_cpu (pkt->comp_status); + orig_sp = sp->cmd_sp; +/* Need to pass original sp */ +if (orig_sp) +qla_nvme_abort_process_comp_status (pkt, orig_sp); + sp->done (sp,0 ); }
drivers/scsi/qla2xxx/qla_mbx.c +6 -0
@@ -3243,6 +3243,8 @@ qla24xx_abort_command(srb_t *sp) abt->vp_index = fcport->vha->vp_idx; abt->req_que_no =cpu_to_le16 (req->id); +/* Need to pass original sp */ +qla_nvme_abort_set_option (abt, sp); rval =qla2x00_issue_iocb (vha, abt, abt_dma,0 );if (rval !=QLA_SUCCESS ) {
@@ -3265,6 +3267,10 @@ qla24xx_abort_command(srb_t *sp)ql_dbg (ql_dbg_mbx + ql_dbg_verbose, vha,0x1091 ,"Done %s.\n" , __func__); } +if (rval ==QLA_SUCCESS ) +qla_nvme_abort_process_comp_status (abt, sp); + +qla_wait_nvme_release_cmd_kref (sp);dma_pool_free (ha->s_dma_pool, abt, abt_dma);
drivers/scsi/qla2xxx/qla_nvme.c +89 -1
111 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_os.c +5 -0
@@ -327,6 +327,11 @@ MODULE_PARM_DESC(ql2xrdpenable,"Enables RDP responses. " "0 - no RDP responses (default). " "1 - provide RDP responses."); +int ql2xabts_wait_nvme =1 ; +module_param (ql2xabts_wait_nvme, int,0444 ); +MODULE_PARM_DESC (ql2xabts_wait_nvme, +"To wait for ABTS response on I/O timeouts for NVMe. (default: 1)" ); +static void qla2x00_clear_drv_active (struct qla_hw_data *);static void qla2x00_free_device (scsi_qla_host_t *);
Signature · 1 line
2.19.0.rc0
Nilesh Javali
maintainerPATCH 5/7 qla2xxx: Fix mailbox Ch erroneous error
In reply to Nilesh JavaliFrom: Quinn Tran <[email protected]>
Mailbox Ch/dump ram extend expects mb register 10 to be set. If not set/clear, firmware can pick up garbage from previous invocation of this mailbox. Example: mctp dump can set mb10. On subsequent flash read which use mailbox cmd Ch, mb10 can retain previous value.
--- drivers/scsi/qla2xxx/qla_dbg.c | 1 + drivers/scsi/qla2xxx/qla_mbx.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_dbg.c +1 -0
@@ -202,6 +202,7 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram,wrt_reg_word (®->mailbox0,MBC_DUMP_RISC_RAM_EXTENDED );wrt_reg_word (®->mailbox1,LSW (addr));wrt_reg_word (®->mailbox8,MSW (addr)); +wrt_reg_word (®->mailbox10,0 );wrt_reg_word (®->mailbox2,MSW (LSD (dump_dma)));wrt_reg_word (®->mailbox3,LSW (LSD (dump_dma)));
drivers/scsi/qla2xxx/qla_mbx.c +2 -1
@@ -4291,7 +4291,8 @@ qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,if (MSW (addr) ||IS_FWI2_CAPABLE (vha->hw)) { mcp->mb[0 ] =MBC_DUMP_RISC_RAM_EXTENDED ; mcp->mb[8 ] =MSW (addr); - mcp->out_mb =MBX_8 |MBX_0 ; + mcp->mb[10 ] =0 ; + mcp->out_mb =MBX_10 |MBX_8 |MBX_0 ; }else { mcp->mb[0 ] =MBC_DUMP_RISC_RAM ; mcp->out_mb =MBX_0 ;
Signature · 1 line
2.19.0.rc0
Nilesh Javali
maintainerPATCH 6/7 qla2xxx: Enable NVME CONF (BIT_7) when enabling SLER
In reply to Nilesh JavaliFrom: Saurav Kashyap <[email protected]>
Enable NVME confirmation bit in PRLI.
--- drivers/scsi/qla2xxx/qla_iocb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla2xxx/qla_iocb.c +2 -0
@@ -2378,6 +2378,8 @@ qla24xx_prli_iocb(srb_t *sp, struct logio_entry_24xx *logio) logio->io_parameter[0 ] =cpu_to_le32 (NVME_PRLI_SP_FIRST_BURST );if (sp->vha->flags.nvme2_enabled) { +/* Set service parameter BIT_7 for NVME CONF support */ + logio->io_parameter[0 ] |=NVME_PRLI_SP_CONF ;/* Set service parameter BIT_8 for SLER support */ logio->io_parameter[0 ] |=cpu_to_le32 (NVME_PRLI_SP_SLER );
Signature · 1 line
2.19.0.rc0
Nilesh Javali
maintainerPATCH 7/7 qla2xxx: Update version to 10.02.00.105-k
In reply to Nilesh Javali--- drivers/scsi/qla2xxx/qla_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_version.h +2 -2
@@ -6,9 +6,9 @@/* * Driver version */ -#define QLA2XXX_VERSION "10.02.00.104-k" +#define QLA2XXX_VERSION "10.02.00.105-k"#define QLA_DRIVER_MAJOR_VER 10#define QLA_DRIVER_MINOR_VER 2#define QLA_DRIVER_PATCH_VER 0 -#define QLA_DRIVER_BETA_VER 104 +#define QLA_DRIVER_BETA_VER 105
Signature · 1 line
2.19.0.rc0