[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, 20 insertions, 0 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 7f9f86b8140b..02c7480c99c3 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1652,8 +1652,14 @@ typedef struct {
         uint8_t port_name[WWN_SIZE];
         uint8_t fabric_port_name[WWN_SIZE];
         uint16_t fp_speed;
+        uint8_t fc4_type;
 } sw_info_t;
 
+/* FCP-4 types */
+#define FC4_TYPE_FCP_SCSI       0x08
+#define FC4_TYPE_OTHER          0x0
+#define FC4_TYPE_UNKNOWN        0xff
+
 /*
  * Fibre channel port type.
  */
@@ -1697,6 +1703,7 @@ typedef struct fc_port {
         u32 supported_classes;
 
         uint16_t vp_idx;
+        uint8_t fc4_type;
 } fc_port_t;
 
 /*
@@ -1779,6 +1786,9 @@ typedef struct fc_port {
 #define GPSC_REQ_SIZE   (16 + 8)
 #define GPSC_RSP_SIZE   (16 + 2 + 2)
 
+#define GFF_ID_CMD      0x011F
+#define GFF_ID_REQ_SIZE (16 + 4)
+#define GFF_ID_RSP_SIZE (16 + 128)
 
 /*
  * HBA attribute types.
@@ -1980,6 +1990,11 @@ struct ct_sns_req {
                 struct {
                         uint8_t port_name[8];
                 } gpsc;
+
+                struct {
+                        uint8_t reserved;
+                        uint8_t port_name[3];
+                } gff_id;
         } req;
 };
 
@@ -2052,6 +2067,11 @@ struct ct_sns_rsp {
                         uint16_t speeds;
                         uint16_t speed;
                 } gpsc;
+
+#define GFF_FCP_SCSI_OFFSET     7
+                struct {
+                        uint8_t fc4_features[128];
+                } gff_id;
         } rsp;
 };