mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
scsi: Remove CONFIG_SCSI_MULTI_LUN
Obsolete; either use 'max_lun' if the host supports only a limited number of LUNs or BLIST_NOLUN if the target has problems addressing more than one LUN. Signed-off-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Ewan Milne <emilne@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
cc833acbee
commit
c309b35171
6 changed files with 2 additions and 35 deletions
|
@ -317,8 +317,6 @@ Each of the parameters is a number, containing the described information:
|
||||||
4 0x10 16 Immediate return on BIOS seek command. (Not used)
|
4 0x10 16 Immediate return on BIOS seek command. (Not used)
|
||||||
(*)5 0x20 32 Check for LUNs >= 1.
|
(*)5 0x20 32 Check for LUNs >= 1.
|
||||||
|
|
||||||
The default for LUN Check depends on CONFIG_SCSI_MULTI_LUN.
|
|
||||||
|
|
||||||
* TaggedCmnds is a number indicating the maximum number of Tagged Commands.
|
* TaggedCmnds is a number indicating the maximum number of Tagged Commands.
|
||||||
It is the binary logarithm - 1 of the actual number. Max is 4 (32).
|
It is the binary logarithm - 1 of the actual number. Max is 4 (32).
|
||||||
Value Number of Tagged Commands
|
Value Number of Tagged Commands
|
||||||
|
|
|
@ -197,20 +197,6 @@ config SCSI_ENCLOSURE
|
||||||
it has an enclosure device. Selecting this option will just allow
|
it has an enclosure device. Selecting this option will just allow
|
||||||
certain enclosure conditions to be reported and is not required.
|
certain enclosure conditions to be reported and is not required.
|
||||||
|
|
||||||
config SCSI_MULTI_LUN
|
|
||||||
bool "Probe all LUNs on each SCSI device"
|
|
||||||
depends on SCSI
|
|
||||||
help
|
|
||||||
Some devices support more than one LUN (Logical Unit Number) in order
|
|
||||||
to allow access to several media, e.g. CD jukebox, USB card reader,
|
|
||||||
mobile phone in mass storage mode. This option forces the kernel to
|
|
||||||
probe for all LUNs by default. This setting can be overridden by
|
|
||||||
max_luns boot/module parameter. Note that this option does not affect
|
|
||||||
devices conforming to SCSI-3 or higher as they can explicitly report
|
|
||||||
their number of LUNs. It is safe to say Y here unless you have one of
|
|
||||||
those rare devices which reacts in an unexpected way when probed for
|
|
||||||
multiple LUNs.
|
|
||||||
|
|
||||||
config SCSI_CONSTANTS
|
config SCSI_CONSTANTS
|
||||||
bool "Verbose SCSI error reporting (kernel size +=12K)"
|
bool "Verbose SCSI error reporting (kernel size +=12K)"
|
||||||
depends on SCSI
|
depends on SCSI
|
||||||
|
|
|
@ -519,9 +519,7 @@ static struct ParameterData cfg_data[] = {
|
||||||
CFG_PARAM_UNSET,
|
CFG_PARAM_UNSET,
|
||||||
0,
|
0,
|
||||||
0x2f,
|
0x2f,
|
||||||
#ifdef CONFIG_SCSI_MULTI_LUN
|
NAC_SCANLUN |
|
||||||
NAC_SCANLUN |
|
|
||||||
#endif
|
|
||||||
NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET
|
NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET
|
||||||
/*| NAC_ACTIVE_NEG*/,
|
/*| NAC_ACTIVE_NEG*/,
|
||||||
NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET | 0x08
|
NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET | 0x08
|
||||||
|
@ -4434,15 +4432,10 @@ static void adapter_init_scsi_host(struct Scsi_Host *host)
|
||||||
if (host->max_id - 1 == eeprom->scsi_id)
|
if (host->max_id - 1 == eeprom->scsi_id)
|
||||||
host->max_id--;
|
host->max_id--;
|
||||||
|
|
||||||
#ifdef CONFIG_SCSI_MULTI_LUN
|
|
||||||
if (eeprom->channel_cfg & NAC_SCANLUN)
|
if (eeprom->channel_cfg & NAC_SCANLUN)
|
||||||
host->max_lun = 8;
|
host->max_lun = 8;
|
||||||
else
|
else
|
||||||
host->max_lun = 1;
|
host->max_lun = 1;
|
||||||
#else
|
|
||||||
host->max_lun = 1;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -264,11 +264,7 @@
|
||||||
#define SCSI_NCR_SG_TABLESIZE (SCSI_NCR_MAX_SCATTER)
|
#define SCSI_NCR_SG_TABLESIZE (SCSI_NCR_MAX_SCATTER)
|
||||||
#define SCSI_NCR_TIMER_INTERVAL (HZ)
|
#define SCSI_NCR_TIMER_INTERVAL (HZ)
|
||||||
|
|
||||||
#if 1 /* defined CONFIG_SCSI_MULTI_LUN */
|
|
||||||
#define SCSI_NCR_MAX_LUN (16)
|
#define SCSI_NCR_MAX_LUN (16)
|
||||||
#else
|
|
||||||
#define SCSI_NCR_MAX_LUN (1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IO functions definition for big/little endian CPU support.
|
* IO functions definition for big/little endian CPU support.
|
||||||
|
|
|
@ -81,11 +81,7 @@ static const char *scsi_null_device_strs = "nullnullnullnull";
|
||||||
|
|
||||||
#define MAX_SCSI_LUNS 512
|
#define MAX_SCSI_LUNS 512
|
||||||
|
|
||||||
#ifdef CONFIG_SCSI_MULTI_LUN
|
|
||||||
static unsigned int max_scsi_luns = MAX_SCSI_LUNS;
|
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, uint, S_IRUGO|S_IWUSR);
|
module_param_named(max_luns, max_scsi_luns, uint, S_IRUGO|S_IWUSR);
|
||||||
MODULE_PARM_DESC(max_luns,
|
MODULE_PARM_DESC(max_luns,
|
||||||
|
|
|
@ -18,9 +18,7 @@ config USB_STORAGE
|
||||||
|
|
||||||
This option depends on 'SCSI' support being enabled, but you
|
This option depends on 'SCSI' support being enabled, but you
|
||||||
probably also need 'SCSI device support: SCSI disk support'
|
probably also need 'SCSI device support: SCSI disk support'
|
||||||
(BLK_DEV_SD) for most USB storage devices. Some devices also
|
(BLK_DEV_SD) for most USB storage devices.
|
||||||
will require 'Probe all LUNs on each SCSI device'
|
|
||||||
(SCSI_MULTI_LUN).
|
|
||||||
|
|
||||||
To compile this driver as a module, choose M here: the
|
To compile this driver as a module, choose M here: the
|
||||||
module will be called usb-storage.
|
module will be called usb-storage.
|
||||||
|
|
Loading…
Add table
Reference in a new issue