scsi: qla2xxx: Recheck session state after RSCN

When RSCN is delivered for specific remote port. Use ADISC to verify the
session is still valid or not.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 3aada5dd597fdb4fd148cfe319d80f6c7074f1b8..0b219b3ca6532fdffca96c4c985693fbfaf332b9 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -106,7 +106,7 @@ int qla24xx_post_newsess_work(struct scsi_qla_host *, port_id_t *, u8 *,
     void *);
 int qla24xx_fcport_handle_login(struct scsi_qla_host *, fc_port_t *);
 int qla24xx_detect_sfp(scsi_qla_host_t *vha);
-
+int qla24xx_post_gpdb_work(struct scsi_qla_host *, fc_port_t *, u8);
 /*
  * Global Data in qla_os.c source file.
  */

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 0ec250993e93c3a5464f4c75d85028aae6bf2dfd..bc3db6abc9a0ba3985befc378ae8dd2cb452652a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -2816,13 +2816,19 @@ void qla24xx_handle_gidpn_event(scsi_qla_host_t *vha, struct event_arg *ea)
                                case MODE_INITIATOR:
                                case MODE_DUAL:
                                default:
+                                       ql_dbg(ql_dbg_disc, vha, 0x201f,
+                                           "%s %d %8phC post %s\n", __func__,
+                                           __LINE__, fcport->port_name,
+                                           (atomic_read(&fcport->state) ==
+                                           FCS_ONLINE) ? "gpdb" : "gnl");
+
                                        if (atomic_read(&fcport->state) ==
                                            FCS_ONLINE)
-                                               break;
-                                       ql_dbg(ql_dbg_disc, vha, 0x201f,
-                                           "%s %d %8phC post gnl\n",
-                                           __func__, __LINE__, fcport->port_name);
-                                       qla24xx_post_gnl_work(vha, fcport);
+                                               qla24xx_post_gpdb_work(vha,
+                                                   fcport, PDO_FORCE_ADISC);
+                                       else
+                                               qla24xx_post_gnl_work(vha,
+                                                   fcport);
                                        break;
                                }
                        } else { /* fcport->d_id.b24 != ea->id.b24 */

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index fe2d196833aa3a0420e5f2cbce2a51725d838bd2..30b3acacbfca9edfde8793cfdec9fb3475e6dd43 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -36,7 +36,6 @@ static int qla2x00_restart_isp(scsi_qla_host_t *);
 static struct qla_chip_state_84xx *qla84xx_get_chip(struct scsi_qla_host *);
 static int qla84xx_init_chip(scsi_qla_host_t *);
 static int qla25xx_init_queues(struct qla_hw_data *);
-static int qla24xx_post_gpdb_work(struct scsi_qla_host *, fc_port_t *, u8);
 static int qla24xx_post_prli_work(struct scsi_qla_host*, fc_port_t *);
 static void qla24xx_handle_plogi_done_event(struct scsi_qla_host *,
     struct event_arg *);
@@ -774,8 +773,7 @@ done_free_sp:
        return rval;
 }
 
-static int qla24xx_post_gpdb_work(struct scsi_qla_host *vha, fc_port_t *fcport,
-    u8 opt)
+int qla24xx_post_gpdb_work(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt)
 {
        struct qla_work_evt *e;