queue-5.0/scsi-qla2xxx-fix-fc-al-connection-target-discovery.patch

   1 From 4705f10e82c63924bd84a9b31d15839ec9ba3d06 Mon Sep 17 00:00:00 2001
   2 From: Quinn Tran <qtran@marvell.com>
   3 Date: Fri, 15 Mar 2019 15:04:18 -0700
   4 Subject: scsi: qla2xxx: Fix FC-AL connection target discovery
   5
   6 From: Quinn Tran <qtran@marvell.com>
   7
   8 commit 4705f10e82c63924bd84a9b31d15839ec9ba3d06 upstream.
   9
  10 Commit 7f147f9bfd44 ("scsi: qla2xxx: Fix N2N target discovery with Local
  11 loop") fixed N2N target discovery for local loop.  However, same code is
  12 used for FC-AL discovery as well. Added check to make sure we are bypassing
  13 area and domain check only in N2N topology for target discovery.
  14
  15 Fixes: 7f147f9bfd44 ("scsi: qla2xxx: Fix N2N target discovery with Local loop")
  16 Cc: stable@vger.kernel.org # 5.0+
  17 Signed-off-by: Quinn Tran <qtran@marvell.com>
  18 Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
  19 Reviewed-by: Ewan D. Milne <emilne@redhat.com>
  20 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  22
  23 ---
  24  drivers/scsi/qla2xxx/qla_init.c |    7 +++++++
  25  1 file changed, 7 insertions(+)
  26
  27 --- a/drivers/scsi/qla2xxx/qla_init.c
  28 +++ b/drivers/scsi/qla2xxx/qla_init.c
  29 @@ -4968,6 +4968,13 @@ qla2x00_configure_local_loop(scsi_qla_ho
  30                     (area != vha->d_id.b.area || domain != vha->d_id.b.domain))
  31                         continue;
  32
  33 +               /* Bypass if not same domain and area of adapter. */
  34 +               if (area && domain && ((area != vha->d_id.b.area) ||
  35 +                   (domain != vha->d_id.b.domain)) &&
  36 +                   (ha->current_topology == ISP_CFG_NL))
  37 +                       continue;
  38 +
  39 +
  40                 /* Bypass invalid local loop ID. */
  41                 if (loop_id > LAST_LOCAL_LOOP_ID)
  42                         continue;