[SCSI] qla2xxx: Use GFF_ID to check FCP-SCSI FC4 type before logging into Nx_Ports

The default method that qla2xxx uses is the GID_PT nameserver command to
get a list of Nx_Ports. This patch adds a GFF_ID call for each port
returned by GID_PT to get the FC4 type. If the FC4 type is not FCP SCSI
then the qla2xxx driver will not record that port in it's port database.
For switches that do not support the GFF_ID command, the behavior will be
for qla2xxx to store that port anyways.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index cea491bf0fc0..685c350007b0 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -3078,7 +3078,6 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
         return (rval);
 }
 
-
 /*
  * qla2x00_find_all_fabric_devs
  *
@@ -3131,6 +3130,10 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                     qla2x00_gfpn_id(vha, swl) == QLA_SUCCESS) {
                         qla2x00_gpsc(vha, swl);
                 }
+
+                /* If other queries succeeded probe for FC-4 type */
+                if (swl)
+                        qla2x00_gff_id(vha, swl);
         }
         swl_idx = 0;
 
@@ -3172,6 +3175,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                                 memcpy(new_fcport->fabric_port_name,
                                     swl[swl_idx].fabric_port_name, WWN_SIZE);
                                 new_fcport->fp_speed = swl[swl_idx].fp_speed;
+                                new_fcport->fc4_type = swl[swl_idx].fc4_type;
 
                                 if (swl[swl_idx].d_id.b.rsvd_1 != 0) {
                                         last_dev = 1;
@@ -3233,6 +3237,11 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                 if ((new_fcport->d_id.b.domain & 0xf0) == 0xf0)
                         continue;
 
+                /* Bypass ports whose FCP-4 type is not FCP_SCSI */
+                if (new_fcport->fc4_type != FC4_TYPE_FCP_SCSI &&
+                    new_fcport->fc4_type != FC4_TYPE_UNKNOWN)
+                        continue;
+
                 /* Locate matching device in database. */
                 found = 0;
                 list_for_each_entry(fcport, &vha->vp_fcports, list) {