瀏覽代碼

[SCSI] qla2xxx: Add module parameter to enable/disable GFF_ID device type check.

Add the module parameter ql2xgffidenable to disable/enable the use of the
GFF_ID name server command to prevent non FCP SCSI devices from being added to
the driver's internal fc_port database.

Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Chad Dupuis 14 年之前
父節點
當前提交
4da26e162b
共有 3 個文件被更改,包括 9 次插入2 次删除
  1. 1 0
      drivers/scsi/qla2xxx/qla_gbl.h
  2. 3 2
      drivers/scsi/qla2xxx/qla_init.c
  3. 5 0
      drivers/scsi/qla2xxx/qla_os.c

+ 1 - 0
drivers/scsi/qla2xxx/qla_gbl.h

@@ -92,6 +92,7 @@ extern int ql2xshiftctondsd;
 extern int ql2xdbwr;
 extern int ql2xdbwr;
 extern int ql2xdontresethba;
 extern int ql2xdontresethba;
 extern int ql2xasynctmfenable;
 extern int ql2xasynctmfenable;
+extern int ql2xgffidenable;
 extern int ql2xenabledif;
 extern int ql2xenabledif;
 extern int ql2xenablehba_err_chk;
 extern int ql2xenablehba_err_chk;
 extern int ql2xtargetreset;
 extern int ql2xtargetreset;

+ 3 - 2
drivers/scsi/qla2xxx/qla_init.c

@@ -3284,8 +3284,9 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
 			continue;
 			continue;
 
 
 		/* Bypass ports whose FCP-4 type is not FCP_SCSI */
 		/* 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)
+		if (ql2xgffidenable &&
+		    (new_fcport->fc4_type != FC4_TYPE_FCP_SCSI &&
+		    new_fcport->fc4_type != FC4_TYPE_UNKNOWN))
 			continue;
 			continue;
 
 
 		/* Locate matching device in database. */
 		/* Locate matching device in database. */

+ 5 - 0
drivers/scsi/qla2xxx/qla_os.c

@@ -160,6 +160,11 @@ MODULE_PARM_DESC(ql2xtargetreset,
 		 "Enable target reset."
 		 "Enable target reset."
 		 "Default is 1 - use hw defaults.");
 		 "Default is 1 - use hw defaults.");
 
 
+int ql2xgffidenable;
+module_param(ql2xgffidenable, int, S_IRUGO|S_IRUSR);
+MODULE_PARM_DESC(ql2xgffidenable,
+		"Enables GFF_ID checks of port type. "
+		"Default is 0 - Do not use GFF_ID information.");
 
 
 int ql2xasynctmfenable;
 int ql2xasynctmfenable;
 module_param(ql2xasynctmfenable, int, S_IRUGO|S_IRUSR);
 module_param(ql2xasynctmfenable, int, S_IRUGO|S_IRUSR);