remove MULTI_LUN config option

PATCH In review Anton Blanchard 3 participants 4 messages Sep 2, 2003 – Sep 3, 2003

Subsystems (3)

SCSI LSI Logic/symbios/ncr 53C8XX and 53C1010 PCI-SCSI drivers DC395x SCSI driver

lore

Share & tools

lore

Anton Blanchard

author

2003-09-02 02:12 UTC #0 lore raw

PATCH 1/1 remove MULTI_LUN config option

Hi,

We already have a module_param to limit how many LUNs we scan, so I think we can remove the config option. It means one less config option to worry about.

Anton

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1407 -> 1.1408
# drivers/scsi/ibmmca.c 1.22 -> 1.23
# drivers/scsi/dc395x.c 1.20 -> 1.21
# drivers/scsi/sym53c8xx_defs.h 1.9 -> 1.10
# drivers/scsi/scsi_scan.c 1.103 -> 1.104
# drivers/scsi/Kconfig 1.25 -> 1.26
# drivers/scsi/sym53c8xx_2/sym53c8xx.h 1.9 -> 1.10
# drivers/scsi/tmscsim.c 1.24 -> 1.25
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/02 [email protected] 1.1408

# remove CONFIG_SCSI_MULTI_LUN
# --------------------------------------------
#
diff -Nru a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
--- a/drivers/scsi/Kconfig	Tue Sep  2 10:20:06 2003
+++ b/drivers/scsi/Kconfig	Tue Sep  2 10:20:06 2003
@@ -139,18 +139,6 @@
 comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
 	depends on SCSI

-config SCSI_MULTI_LUN
- bool "Probe all LUNs on each SCSI device"
- depends on SCSI
- help

-	  If you have a SCSI device that supports more than one LUN (Logical
-	  Unit Number), e.g. a CD jukebox, and only one LUN is detected, you
-	  can say Y here to force the SCSI driver to probe for multiple LUNs.
-	  A SCSI device with multiple LUNs acts logically like multiple SCSI
-	  devices. The vast majority of SCSI devices have only one LUN, and
-	  so most people can say N here and should in fact do so, because it
-	  is safer.

-
config SCSI_REPORT_LUNS
bool "Build with SCSI REPORT LUNS support" depends on SCSI

drivers/scsi/dc395x.c +0 -6

diff -Nru a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
@@ -633,9 +633,7 @@
 		CFG_PARAM_UNSET,
 		0,
 		0x2f,
-#ifdef CONFIG_SCSI_MULTI_LUN
 			NAC_SCANLUN |
-#endif
 		NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET
 			/*| NAC_ACTIVE_NEG*/,
 		NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET | 0x08

@@ -4922,14 +4920,10 @@
 	host->max_id = 16;
 	if (host->max_id - 1 == eeprom->scsi_id)
 		host->max_id--;
-#ifdef	CONFIG_SCSI_MULTI_LUN
 	if (eeprom->channel_cfg & NAC_SCANLUN)
 		host->max_lun = 8;
 	else
 		host->max_lun = 1;
-#else
-	host->max_lun = 1;
-#endif
 	/*
 	 ********************************
 	 */

drivers/scsi/ibmmca.c +0 ~~-10~~

diff -Nru a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
@@ -1192,9 +1192,7 @@
 	printk("\nIBM MCA SCSI: Scanning SCSI-devices.");
 #endif
 	for (id = 0; id < max_pun; id++)
-#ifdef CONFIG_SCSI_MULTI_LUN
 		for (lun = 0; lun < 8; lun++)
-#endif
 		{
 			probe_display(1);
 #ifdef IM_DEBUG_PROBE

@@ -1223,9 +1221,7 @@
 #endif
 	ldn = 0;
 	lun = 0;
-#ifdef CONFIG_SCSI_MULTI_LUN
 	for (lun = 0; lun < 8 && ldn < MAX_LOG_DEV; lun++)
-#endif
 		for (id = 0; id < max_pun && ldn < MAX_LOG_DEV; id++) {
 			probe_display(1);
 #ifdef IM_DEBUG_PROBE

@@ -1900,9 +1896,7 @@
 			immediate_assign(host_index, 0, 0, 0, REMOVE_LDN);
 			/* remap all ldns, as written in the pun/lun table */
 			lun = 0;
-#ifdef CONFIG_SCSI_MULTI_LUN
 			for (lun = 0; lun < 8; lun++)
-#endif
 				for (id = 0; id < max_pun; id++) {
 					if (get_ldn(host_index)[id][lun] <= MAX_LOG_DEV)
 						immediate_assign(host_index, id, lun, get_ldn(host_index)[id][lun], SET_LDN);

@@ -2396,11 +2390,7 @@
 	len += sprintf(buffer + len, "\n             IBM-SCSI-Subsystem-Linux-Driver, Version %s\n\n\n", IBMMCA_SCSI_DRIVER_VERSION);
 	len += sprintf(buffer + len, " SCSI Access-Statistics:\n");
 	len += sprintf(buffer + len, "               Device Scanning Order....: %s\n", (ibm_ansi_order) ? "IBM/ANSI" : "New Industry Standard");
-#ifdef CONFIG_SCSI_MULTI_LUN
 	len += sprintf(buffer + len, "               Multiple LUN probing.....: Yes\n");
-#else
-	len += sprintf(buffer + len, "               Multiple LUN probing.....: No\n");
-#endif
 	len += sprintf(buffer + len, "               This Hostnumber..........: %d\n", shpnt->host_no);
 	len += sprintf(buffer + len, "               Base I/O-Port............: 0x%x\n", (unsigned int) (IM_CMD_REG(host_index)));
 	len += sprintf(buffer + len, "               (Shared) IRQ.............: %d\n", IM_IRQ);

drivers/scsi/scsi_scan.c +0 -4

diff -Nru a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
@@ -68,11 +68,7 @@
 
 #define MAX_SCSI_LUNS	512
 
-#ifdef CONFIG_SCSI_MULTI_LUN
 static unsigned int max_scsi_luns = MAX_SCSI_LUNS;
-#else
-static unsigned int max_scsi_luns = 1;
-#endif
 
 module_param_named(max_luns, max_scsi_luns, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(max_luns,

drivers/scsi/sym53c8xx_2/sym53c8xx.h +0 -4

diff -Nru a/drivers/scsi/sym53c8xx_2/sym53c8xx.h b/drivers/scsi/sym53c8xx_2/sym53c8xx.h
@@ -189,11 +189,7 @@
 /*
  *  Max number of LUNs per target.
  */
-#if 1 /* defined CONFIG_SCSI_MULTI_LUN */
 #define	CONFIG_SCSI_SYM53C8XX_MAX_LUN	(16)
-#else
-#define	CONFIG_SCSI_SYM53C8XX_MAX_LUN	(1)
-#endif
 
 /*
  *  Driver setup structure.

drivers/scsi/sym53c8xx_defs.h +0 -4

diff -Nru a/drivers/scsi/sym53c8xx_defs.h b/drivers/scsi/sym53c8xx_defs.h
@@ -346,11 +346,7 @@
 #define SCSI_NCR_SG_TABLESIZE	(SCSI_NCR_MAX_SCATTER)
 #define SCSI_NCR_TIMER_INTERVAL	(HZ)
 
-#if 1 /* defined CONFIG_SCSI_MULTI_LUN */
 #define SCSI_NCR_MAX_LUN	(16)
-#else
-#define SCSI_NCR_MAX_LUN	(1)
-#endif
 
 #ifndef HOSTS_C

drivers/scsi/tmscsim.c +0 -2

diff -Nru a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
@@ -631,9 +631,7 @@
 		| SYNC_NEGO_ | TAG_QUEUEING_,
 		MORE2_DRV | GREATER_1G | RST_SCSI_BUS | ACTIVE_NEGATION
 		/* | NO_SEEK */
-# ifdef CONFIG_SCSI_MULTI_LUN
 		| LUN_CHECK
-# endif
 		, 3 /* 16 Tags per LUN */, 1 /* s delay after Reset */ };
 
 /* Copy defaults over set values where missing */

Jeff Garzik

2003-09-02 02:31 UTC #1 lore raw

drivers/scsi/dc395x.c line 639

Quoted 13 lines · Anton Blanchard

diff -Nru a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c

drivers/scsi/dc395x.c +0 -2

@@ -633,9 +633,7 @@
 		CFG_PARAM_UNSET,
 		0,
 		0x2f,
-#ifdef CONFIG_SCSI_MULTI_LUN
 			NAC_SCANLUN |
-#endif
 		NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET
 			/*| NAC_ACTIVE_NEG*/,
 		NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET | 0x08

I like the patch, but I worry about the above piece. I would think that a better patch might make NAC_SCANLUN, LUN_CHECK (tmscsim.c), and similar bits conditional on the module_param you mention? Ditto for the loops which are now unconditionally executed. They would still need to be conditional on a runtime variable, right?

As a tangent, I always build with CONFIG_SCSI_MULTI_LUN=y, so I definitely support this idea behind this patch...

Jeff

Anton Blanchard

author

2003-09-02 18:20 UTC #2 lore raw

Hi,

Quoted 5 lines

I like the patch, but I worry about the above piece. I would think that a better patch might make NAC_SCANLUN, LUN_CHECK (tmscsim.c), and similar bits conditional on the module_param you mention? Ditto for the loops which are now unconditionally executed. They would still need to be conditional on a runtime variable, right?

Yep, we should be able to use max_scsi_luns to select these things. Im wondering why these #ifdefs were there in the first place and if it was the result of a copy from another driver or there really is a need to do this.

Anton
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi,

Quoted 5 lines

I like the patch, but I worry about the above piece. I would think that a better patch might make NAC_SCANLUN, LUN_CHECK (tmscsim.c), and similar bits conditional on the module_param you mention? Ditto for the loops which are now unconditionally executed. They would still need to be conditional on a runtime variable, right?

Anton

Patrick Mansfield

2003-09-03 21:21 UTC #3 lore raw

In reply to Anton Blanchard

Anton -

Quoted 13 lines · Anton Blanchard

Hi,
We already have a module_param to limit how many LUNs we scan, so I think we can remove the config option. It means one less config option to worry about.
Anton
diff -Nru a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c

drivers/scsi/scsi_scan.c line 75

Quoted 8 lines

drivers/scsi/scsi_scan.c +0 -4

@@ -68,11 +68,7 @@
 
 #define MAX_SCSI_LUNS	512
 
-#ifdef CONFIG_SCSI_MULTI_LUN
 static unsigned int max_scsi_luns = MAX_SCSI_LUNS;
-#else
-static unsigned int max_scsi_luns = 1;
-#endif

The above defaulted to 1 because there are broken devices (unknown what vendors and models) that hang when anything other than LUN 0 is probed. Defaulting to 1 means such systems might no longer boot.

There was a post from Alan (or Doug L?) about this some time back.

-- Patrick Mansfield