> On Aug 5, 2021, at 5:19 AM, Nilesh Javali <njavali@xxxxxxxxxxx> wrote:
>
> From: Saurav Kashyap <skashyap@xxxxxxxxxxx>
>
> Add changes to support FCP2 Target.
>
> Signed-off-by: Saurav Kashyap <skashyap@xxxxxxxxxxx>
> Signed-off-by: Nilesh Javali <njavali@xxxxxxxxxxx>
> ---
> drivers/scsi/qla2xxx/qla_dbg.c | 3 +--
> drivers/scsi/qla2xxx/qla_init.c | 6 ++++++
> drivers/scsi/qla2xxx/qla_os.c | 11 +++++++++++
> 3 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
> index f2d05592c1e2..25549a8a2d72 100644
> --- a/drivers/scsi/qla2xxx/qla_dbg.c
> +++ b/drivers/scsi/qla2xxx/qla_dbg.c
> @@ -12,8 +12,7 @@
> * ----------------------------------------------------------------------
> * | Module Init and Probe | 0x0199 | |
> * | Mailbox commands | 0x1206 | 0x11a5-0x11ff |
> - * | Device Discovery | 0x2134 | 0x210e-0x2116 |
> - * | | | 0x211a |
> + * | Device Discovery | 0x2134 | 0x210e-0x2115 |
> * | | | 0x211c-0x2128 |
> * | | | 0x212c-0x2134 |
> * | Queue Command and IO tracing | 0x3074 | 0x300b |
> diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
> index 24683ac1a620..be09dc4b3bf2 100644
> --- a/drivers/scsi/qla2xxx/qla_init.c
> +++ b/drivers/scsi/qla2xxx/qla_init.c
> @@ -1787,6 +1787,12 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea)
>
> fcport = qla2x00_find_fcport_by_nportid(vha, &ea->id, 1);
> if (fcport) {
> + if (fcport->flags & FCF_FCP2_DEVICE) {
> + ql_dbg(ql_dbg_disc, vha, 0x2115,
> + "Delaying session delete for FCP2 portid=%06x "
> + "%8phC ", fcport->d_id.b24, fcport->port_name);
Do not split Log message across lines…
> + return;
> + }
> fcport->scan_needed = 1;
> fcport->rscn_gen++;
> }
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index 921bd4d127f4..61ae8cbba670 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -3981,6 +3981,17 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha)
> "Mark all dev lost\n");
>
> list_for_each_entry(fcport, &vha->vp_fcports, list) {
> + if (fcport->loop_id != FC_NO_LOOP_ID &&
> + (fcport->flags & FCF_FCP2_DEVICE) &&
> + fcport->port_type == FCT_TARGET &&
> + !qla2x00_reset_active(vha)) {
> + ql_dbg(ql_dbg_disc, vha, 0x211a,
> + "Delaying session delete for FCP2 flags 0x%x "
> + "port_type = 0x%x port_id=%06x %phC", fcport->flags,
Ditto here.. no need to split log message
> + fcport->port_type, fcport->d_id.b24,
> + fcport->port_name);
> + continue;
> + }
> fcport->scan_state = 0;
> qlt_schedule_sess_for_deletion(fcport);
> }
> --
> 2.19.0.rc0
>
Once you fix it.. you can add
Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
--
Himanshu Madhani Oracle Linux Engineering
