Add MFW recovery and PCI Shutdown handler.
Subsystems (2)
Manish Rangankar
maintainercover Add MFW recovery and PCI Shutdown handler.
Hi Martin,
Please apply the following patches to the scsi tree at your earliest convenience.
Manish Rangankar (2):
qedi: Add MFW error recovery process.
qedi: Add PCI shutdown handler support.
drivers/scsi/qedi/qedi.h | 3 ++ drivers/scsi/qedi/qedi_gbl.h | 1 + drivers/scsi/qedi/qedi_iscsi.c | 18 +++++++ drivers/scsi/qedi/qedi_iscsi.h | 1 + drivers/scsi/qedi/qedi_main.c | 104 ++++++++++++++++++++++++++++++++--------- 5 files changed, 104 insertions(+), 23 deletions(-)
Signature · 1 line
1.8.3.1
Manish Rangankar
maintainerPATCH 1/2 qedi: Add MFW error recovery process.
This patch adds the mfw error recovery process in the qedi driver. The process includes a partial/customized driver unload and load to reset context by preserving active iSCSI session kernel state.
--- drivers/scsi/qedi/qedi.h | 1 + drivers/scsi/qedi/qedi_main.c | 87 ++++++++++++++++++++++++++++++++----------- 2 files changed, 66 insertions(+), 22 deletions(-)
drivers/scsi/qedi/qedi.h +1 -0
@@ -331,6 +331,7 @@ struct qedi_ctx {u16 ll2_mtu;struct workqueue_struct *dpc_wq; +struct delayed_work recovery_work;spinlock_t task_idx_lock;/* To protect gbl context */ s32 last_tidx_alloc;
drivers/scsi/qedi/qedi_main.c +65 -22
148 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Manish Rangankar
maintainerPATCH 2/2 qedi: Add PCI shutdown handler support.
In reply to Manish RangankarAdd PCI shutdown handler support for supporting
wake-on-lan feature.
--- drivers/scsi/qedi/qedi.h | 2 ++ drivers/scsi/qedi/qedi_gbl.h | 1 + drivers/scsi/qedi/qedi_iscsi.c | 18 ++++++++++++++++++ drivers/scsi/qedi/qedi_iscsi.h | 1 + drivers/scsi/qedi/qedi_main.c | 19 +++++++++++++++++-- 5 files changed, 39 insertions(+), 2 deletions(-)
drivers/scsi/qedi/qedi.h +2 -0
@@ -36,6 +36,7 @@*/ #define QEDI_MODE_NORMAL 0#define QEDI_MODE_RECOVERY 1 +#define QEDI_MODE_SHUTDOWN 2#define ISCSI_WQE_SET_PTU_INVALIDATE 1#define QEDI_MAX_ISCSI_TASK 4096
@@ -278,6 +279,7 @@ struct qedi_ctx {#define QEDI_IOTHREAD_WAKE 2#define QEDI_IN_RECOVERY 5#define QEDI_IN_OFFLINE 6 +#define QEDI_IN_SHUTDOWN 7u8 mac[ETH_ALEN ];u32 src_ip[4 ];
drivers/scsi/qedi/qedi_gbl.h +1 -0
@@ -73,5 +73,6 @@ void qedi_trace_io(struct qedi_ctx *qedi, struct iscsi_task *task,void qedi_clearsq (struct qedi_ctx *qedi,struct qedi_conn *qedi_conn,struct iscsi_task *task); +void qedi_clear_session_ctx (struct iscsi_cls_session *cls_sess);#endif
drivers/scsi/qedi/qedi_iscsi.c +18 -0
@@ -392,6 +392,7 @@ static int qedi_conn_bind(struct iscsi_cls_session *cls_session, qedi_ep->conn = qedi_conn; qedi_conn->ep = qedi_ep; + qedi_conn->iscsi_ep = ep; qedi_conn->iscsi_conn_id = qedi_ep->iscsi_cid; qedi_conn->fw_cid = qedi_ep->fw_cid; qedi_conn->cmd_cleanup_req =0 ;
@@ -782,6 +783,9 @@ static int qedi_task_xmit(struct iscsi_task *task)struct qedi_cmd *cmd = task->dd_data;struct scsi_cmnd *sc = task->sc; +if (test_bit (QEDI_IN_SHUTDOWN , &qedi_conn->qedi->flags)) +return -ENODEV ; + cmd->state =0 ; cmd->task =NULL ; cmd->use_slowpath = false;
@@ -1596,6 +1600,20 @@ void qedi_process_iscsi_error(struct qedi_endpoint *ep,qedi_start_conn_recovery (qedi_conn->qedi, qedi_conn); } +void qedi_clear_session_ctx (struct iscsi_cls_session *cls_sess) +{ +struct iscsi_session *session = cls_sess->dd_data; +struct iscsi_conn *conn = session->leadconn; +struct qedi_conn *qedi_conn = conn->dd_data; + +if (iscsi_is_session_online (cls_sess)) +qedi_ep_disconnect (qedi_conn->iscsi_ep); + +qedi_conn_destroy (qedi_conn->cls_conn); + +qedi_session_destroy (cls_sess); +} +void qedi_process_tcp_error (struct qedi_endpoint *ep,struct iscsi_eqe_data *data) {
drivers/scsi/qedi/qedi_iscsi.h +1 -0
@@ -149,6 +149,7 @@ struct qedi_conn {struct iscsi_cls_conn *cls_conn;struct qedi_ctx *qedi;struct qedi_endpoint *ep; +struct iscsi_endpoint *iscsi_ep;struct list_head active_cmd_list;spinlock_t list_lock;/* internal conn lock */ u32 active_cmd_count;
drivers/scsi/qedi/qedi_main.c +17 -2
@@ -2344,7 +2344,11 @@ static void __qedi_remove(struct pci_dev *pdev, int mode)struct qedi_ctx *qedi =pci_get_drvdata (pdev);int rval; -if (mode ==QEDI_MODE_NORMAL ) { +if (mode ==QEDI_MODE_SHUTDOWN ) +iscsi_host_for_each_session (qedi->shost, + qedi_clear_session_ctx); + +if (mode ==QEDI_MODE_NORMAL || mode ==QEDI_MODE_SHUTDOWN ) {if (qedi->tmf_thread) {flush_workqueue (qedi->tmf_thread);destroy_workqueue (qedi->tmf_thread);
@@ -2384,7 +2388,7 @@ static void __qedi_remove(struct pci_dev *pdev, int mode)qedi_destroy_fp (qedi); -if (mode ==QEDI_MODE_NORMAL ) { +if (mode ==QEDI_MODE_NORMAL || mode ==QEDI_MODE_SHUTDOWN ) {qedi_release_cid_que (qedi);qedi_cm_free_mem (qedi);qedi_free_uio (qedi->udev);
@@ -2404,6 +2408,16 @@ static void __qedi_remove(struct pci_dev *pdev, int mode) } } +static void qedi_shutdown (struct pci_dev *pdev) +{ +struct qedi_ctx *qedi =pci_get_drvdata (pdev); + +QEDI_ERR (&qedi->dbg_ctx,"%s: Shutdown qedi\n" , __func__); +if (test_and_set_bit (QEDI_IN_SHUTDOWN , &qedi->flags)) +return ; +__qedi_remove (pdev,QEDI_MODE_SHUTDOWN ); +} +static int __qedi_probe (struct pci_dev *pdev,int mode) {struct qedi_ctx *qedi;
@@ -2740,6 +2754,7 @@ static void qedi_remove(struct pci_dev *pdev) .id_table = qedi_pci_tbl, .probe = qedi_probe, .remove = qedi_remove, + .shutdown = qedi_shutdown, };static int __init qedi_init (void )
Signature · 1 line
1.8.3.1
Martin K. Petersen
AppliedManish,
Quoted 2 lines
Please apply the following patches to the scsi tree at your earliest convenience.
Applied to 5.7/scsi-queue. Thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering