Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next

James Bottomley
2 parents cbf67842c3 0213436a2c
Showing 4 changed files Side-by-side Diff
drivers/scsi/scsi.c
drivers/scsi/scsi_devinfo.c
drivers/scsi/scsi_scan.c
include/scsi/scsi_devinfo.h
@@ -365,8 +365,8 @@
 	if (!pool)
 		return NULL;
  
-	pool->cmd_name = kasprintf(GFP_KERNEL, "%s_cmd", hostt->name);
-	pool->sense_name = kasprintf(GFP_KERNEL, "%s_sense", hostt->name);
+	pool->cmd_name = kasprintf(GFP_KERNEL, "%s_cmd", hostt->proc_name);
+	pool->sense_name = kasprintf(GFP_KERNEL, "%s_sense", hostt->proc_name);
 	if (!pool->cmd_name || !pool->sense_name) {
 		scsi_free_host_cmd_pool(pool);
 		return NULL;
@@ -222,6 +222,7 @@
 	{"PIONEER", "CD-ROM DRM-602X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
 	{"PIONEER", "CD-ROM DRM-604X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
 	{"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
+	{"Promise", "VTrak E610f", NULL, BLIST_SPARSELUN | BLIST_NO_RSOC},
 	{"Promise", "", NULL, BLIST_SPARSELUN},
 	{"QUANTUM", "XP34301", "1071", BLIST_NOTQ},
 	{"REGAL", "CDC-4X", NULL, BLIST_MAX5LUN | BLIST_SINGLELUN},
@@ -900,6 +900,12 @@
 	if (*bflags & BLIST_USE_10_BYTE_MS)
 		sdev->use_10_for_ms = 1;
  
+	/* some devices don't like REPORT SUPPORTED OPERATION CODES
+	 * and will simply timeout causing sd_mod init to take a very
+	 * very long time */
+	if (*bflags & BLIST_NO_RSOC)
+		sdev->no_report_opcodes = 1;
+
 	/* set the device running here so that slave configure
 	 * may do I/O */
 	ret = scsi_device_set_state(sdev, SDEV_RUNNING);
@@ -35,5 +35,7 @@
 #define BLIST_SCSI3LUN		0x8000000 /* Scan more than 256 LUNs
 					     for sequential scan */
 #define BLIST_TRY_VPD_PAGES	0x10000000 /* Attempt to read VPD pages */
+#define BLIST_NO_RSOC		0x20000000 /* don't try to issue RSOC */
+
 #endif
...	...	@@ -365,8 +365,8 @@
365	365	if (!pool)
366	366	return NULL;
367	367
368		- pool->cmd_name = kasprintf(GFP_KERNEL, "%s_cmd", hostt->name);
369		- pool->sense_name = kasprintf(GFP_KERNEL, "%s_sense", hostt->name);
	368	+ pool->cmd_name = kasprintf(GFP_KERNEL, "%s_cmd", hostt->proc_name);
	369	+ pool->sense_name = kasprintf(GFP_KERNEL, "%s_sense", hostt->proc_name);
370	370	if (!pool->cmd_name \|\| !pool->sense_name) {
371	371	scsi_free_host_cmd_pool(pool);
372	372	return NULL;
...	...	@@ -222,6 +222,7 @@
222	222	{"PIONEER", "CD-ROM DRM-602X", NULL, BLIST_FORCELUN \| BLIST_SINGLELUN},
223	223	{"PIONEER", "CD-ROM DRM-604X", NULL, BLIST_FORCELUN \| BLIST_SINGLELUN},
224	224	{"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN \| BLIST_SINGLELUN},
	225	+ {"Promise", "VTrak E610f", NULL, BLIST_SPARSELUN \| BLIST_NO_RSOC},
225	226	{"Promise", "", NULL, BLIST_SPARSELUN},
226	227	{"QUANTUM", "XP34301", "1071", BLIST_NOTQ},
227	228	{"REGAL", "CDC-4X", NULL, BLIST_MAX5LUN \| BLIST_SINGLELUN},
...	...	@@ -900,6 +900,12 @@
900	900	if (*bflags & BLIST_USE_10_BYTE_MS)
901	901	sdev->use_10_for_ms = 1;
902	902
	903	+ /* some devices don't like REPORT SUPPORTED OPERATION CODES
	904	+ * and will simply timeout causing sd_mod init to take a very
	905	+ * very long time */
	906	+ if (*bflags & BLIST_NO_RSOC)
	907	+ sdev->no_report_opcodes = 1;
	908	+
903	909	/* set the device running here so that slave configure
904	910	* may do I/O */
905	911	ret = scsi_device_set_state(sdev, SDEV_RUNNING);
...	...	@@ -35,5 +35,7 @@
35	35	#define BLIST_SCSI3LUN 0x8000000 /* Scan more than 256 LUNs
36	36	for sequential scan */
37	37	#define BLIST_TRY_VPD_PAGES 0x10000000 /* Attempt to read VPD pages */
	38	+#define BLIST_NO_RSOC 0x20000000 /* don't try to issue RSOC */
	39	+
38	40	#endif