iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: use 64-bit value for 'max_luns'

Browse Source 
Now that we're using 64-bit LUNs internally we need to increase
the size of max_luns to 64 bits, too.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@infradead.org>
Reviewed-by: Ewan Milne <emilne@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Hannes Reinecke 2014-06-25 15:27:38 +02:00 committed by Christoph Hellwig
parent b4210b810e
commit 1abf635d2f
14 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/message/i2o/i2o_scsi.c
View File

@ -287,7 +287,7 @@ static int i2o_scsi_probe(struct device *dev)
} }
if (le64_to_cpu(lun) >= scsi_host->max_lun) { if (le64_to_cpu(lun) >= scsi_host->max_lun) {
osm_warn("SCSI device lun (%llu) >= max_lun of I2O host (%d)", osm_warn("SCSI device lun (%llu) >= max_lun of I2O host (%llu)",
le64_to_cpu(lun), scsi_host->max_lun); le64_to_cpu(lun), scsi_host->max_lun);
return -EFAULT; return -EFAULT;
} }

2
drivers/scsi/advansys.c
View File

@ -3345,7 +3345,7 @@ static void asc_prt_driver_conf(struct seq_file *m, struct Scsi_Host *shost)
shost->host_no); shost->host_no);
seq_printf(m, seq_printf(m,
" host_busy %u, max_id %u, max_lun %u, max_channel %u\n", " host_busy %u, max_id %u, max_lun %llu, max_channel %u\n",
shost->host_busy, shost->max_id, shost->host_busy, shost->max_id,
shost->max_lun, shost->max_channel); shost->max_lun, shost->max_channel);

2
drivers/scsi/cxgbi/libcxgbi.c
View File

@ -245,7 +245,7 @@ void cxgbi_hbas_remove(struct cxgbi_device *cdev)
} }
EXPORT_SYMBOL_GPL(cxgbi_hbas_remove); EXPORT_SYMBOL_GPL(cxgbi_hbas_remove);
int cxgbi_hbas_add(struct cxgbi_device *cdev, unsigned int max_lun, int cxgbi_hbas_add(struct cxgbi_device *cdev, u64 max_lun,
unsigned int max_id, struct scsi_host_template *sht, unsigned int max_id, struct scsi_host_template *sht,
struct scsi_transport_template *stt) struct scsi_transport_template *stt)
{ {

2
drivers/scsi/cxgbi/libcxgbi.h
View File

@ -692,7 +692,7 @@ struct cxgbi_device *cxgbi_device_register(unsigned int, unsigned int);
void cxgbi_device_unregister(struct cxgbi_device *); void cxgbi_device_unregister(struct cxgbi_device *);
void cxgbi_device_unregister_all(unsigned int flag); void cxgbi_device_unregister_all(unsigned int flag);
struct cxgbi_device *cxgbi_device_find_by_lldev(void *); struct cxgbi_device *cxgbi_device_find_by_lldev(void *);
int cxgbi_hbas_add(struct cxgbi_device *, unsigned int, unsigned int, int cxgbi_hbas_add(struct cxgbi_device *, u64, unsigned int,
struct scsi_host_template *, struct scsi_host_template *,
struct scsi_transport_template *); struct scsi_transport_template *);
void cxgbi_hbas_remove(struct cxgbi_device *); void cxgbi_hbas_remove(struct cxgbi_device *);

2
drivers/scsi/dc395x.c
View File

@ -4638,7 +4638,7 @@ static int dc395x_show_info(struct seq_file *m, struct Scsi_Host *host)
SPRINTF("irq_level 0x%04x, ", acb->irq_level); SPRINTF("irq_level 0x%04x, ", acb->irq_level);
SPRINTF(" SelTimeout %ims\n", (1638 * acb->sel_timeout) / 1000); SPRINTF(" SelTimeout %ims\n", (1638 * acb->sel_timeout) / 1000);
SPRINTF("MaxID %i, MaxLUN %i, ", host->max_id, host->max_lun); SPRINTF("MaxID %i, MaxLUN %llu, ", host->max_id, host->max_lun);
SPRINTF("AdapterID %i\n", host->this_id); SPRINTF("AdapterID %i\n", host->this_id);
SPRINTF("tag_max_num %i", acb->tag_max_num); SPRINTF("tag_max_num %i", acb->tag_max_num);

2
drivers/scsi/eata.c
View File

@ -1399,7 +1399,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
if (shost->max_id > 8 || shost->max_lun > 8) if (shost->max_id > 8 || shost->max_lun > 8)
printk printk
("%s: wide SCSI support enabled, max_id %u, max_lun %u.\n", ("%s: wide SCSI support enabled, max_id %u, max_lun %llu.\n",
ha->board_name, shost->max_id, shost->max_lun); ha->board_name, shost->max_id, shost->max_lun);
for (i = 0; i <= shost->max_channel; i++) for (i = 0; i <= shost->max_channel; i++)

4
drivers/scsi/ibmvscsi/ibmvfc.c
View File

@ -46,7 +46,7 @@
static unsigned int init_timeout = IBMVFC_INIT_TIMEOUT; static unsigned int init_timeout = IBMVFC_INIT_TIMEOUT;
static unsigned int default_timeout = IBMVFC_DEFAULT_TIMEOUT; static unsigned int default_timeout = IBMVFC_DEFAULT_TIMEOUT;
static unsigned int max_lun = IBMVFC_MAX_LUN; static u64 max_lun = IBMVFC_MAX_LUN;
static unsigned int max_targets = IBMVFC_MAX_TARGETS; static unsigned int max_targets = IBMVFC_MAX_TARGETS;
static unsigned int max_requests = IBMVFC_MAX_REQUESTS_DEFAULT; static unsigned int max_requests = IBMVFC_MAX_REQUESTS_DEFAULT;
static unsigned int disc_threads = IBMVFC_MAX_DISC_THREADS; static unsigned int disc_threads = IBMVFC_MAX_DISC_THREADS;
@ -71,7 +71,7 @@ MODULE_PARM_DESC(default_timeout,
module_param_named(max_requests, max_requests, uint, S_IRUGO); module_param_named(max_requests, max_requests, uint, S_IRUGO);
MODULE_PARM_DESC(max_requests, "Maximum requests for this adapter. " MODULE_PARM_DESC(max_requests, "Maximum requests for this adapter. "
"[Default=" __stringify(IBMVFC_MAX_REQUESTS_DEFAULT) "]"); "[Default=" __stringify(IBMVFC_MAX_REQUESTS_DEFAULT) "]");
module_param_named(max_lun, max_lun, uint, S_IRUGO); module_param_named(max_lun, max_lun, ullong, S_IRUGO);
MODULE_PARM_DESC(max_lun, "Maximum allowed LUN. " MODULE_PARM_DESC(max_lun, "Maximum allowed LUN. "
"[Default=" __stringify(IBMVFC_MAX_LUN) "]"); "[Default=" __stringify(IBMVFC_MAX_LUN) "]");
module_param_named(max_targets, max_targets, uint, S_IRUGO); module_param_named(max_targets, max_targets, uint, S_IRUGO);

10
drivers/scsi/lpfc/lpfc_attr.c
View File

@ -1998,6 +1998,14 @@ lpfc_vport_param_show(name)\
lpfc_vport_param_init(name, defval, minval, maxval)\ lpfc_vport_param_init(name, defval, minval, maxval)\
static DEVICE_ATTR(lpfc_##name, S_IRUGO , lpfc_##name##_show, NULL) static DEVICE_ATTR(lpfc_##name, S_IRUGO , lpfc_##name##_show, NULL)
#define LPFC_VPORT_ULL_ATTR_R(name, defval, minval, maxval, desc) \
static uint64_t lpfc_##name = defval;\
module_param(lpfc_##name, ullong, S_IRUGO);\
MODULE_PARM_DESC(lpfc_##name, desc);\
lpfc_vport_param_show(name)\
lpfc_vport_param_init(name, defval, minval, maxval)\
static DEVICE_ATTR(lpfc_##name, S_IRUGO , lpfc_##name##_show, NULL)
#define LPFC_VPORT_ATTR_RW(name, defval, minval, maxval, desc) \ #define LPFC_VPORT_ATTR_RW(name, defval, minval, maxval, desc) \
static uint lpfc_##name = defval;\ static uint lpfc_##name = defval;\
module_param(lpfc_##name, uint, S_IRUGO);\ module_param(lpfc_##name, uint, S_IRUGO);\
@ -4596,7 +4604,7 @@ LPFC_VPORT_ATTR(discovery_threads, 32, 1, 64, "Maximum number of ELS commands "
# Value range is [0,65535]. Default value is 255. # Value range is [0,65535]. Default value is 255.
# NOTE: The SCSI layer might probe all allowed LUN on some old targets. # NOTE: The SCSI layer might probe all allowed LUN on some old targets.
*/ */
LPFC_VPORT_ATTR_R(max_luns, 255, 0, 65535, "Maximum allowed LUN ID"); LPFC_VPORT_ULL_ATTR_R(max_luns, 255, 0, 65535, "Maximum allowed LUN ID");
/* /*
# lpfc_poll_tmo: .Milliseconds driver will wait between polling FCP ring. # lpfc_poll_tmo: .Milliseconds driver will wait between polling FCP ring.

2
drivers/scsi/megaraid.c
View File

@ -1860,7 +1860,7 @@ megaraid_info(struct Scsi_Host *host)
"LSI Logic MegaRAID %s %d commands %d targs %d chans %d luns", "LSI Logic MegaRAID %s %d commands %d targs %d chans %d luns",
adapter->fw_version, adapter->product_info.max_commands, adapter->fw_version, adapter->product_info.max_commands,
adapter->host->max_id, adapter->host->max_channel, adapter->host->max_id, adapter->host->max_channel,
adapter->host->max_lun); (u32)adapter->host->max_lun);
return buffer; return buffer;
} }

4
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View File

@ -112,8 +112,8 @@ MODULE_PARM_DESC(missing_delay, " device missing delay , io missing delay");
/* scsi-mid layer global parmeter is max_report_luns, which is 511 */ /* scsi-mid layer global parmeter is max_report_luns, which is 511 */
#define MPT3SAS_MAX_LUN (16895) #define MPT3SAS_MAX_LUN (16895)
static int max_lun = MPT3SAS_MAX_LUN; static u64 max_lun = MPT3SAS_MAX_LUN;
module_param(max_lun, int, 0); module_param(max_lun, ullong, 0);
MODULE_PARM_DESC(max_lun, " max lun, default=16895 "); MODULE_PARM_DESC(max_lun, " max lun, default=16895 ");

2
drivers/scsi/qla2xxx/qla_gbl.h
View File

@ -113,7 +113,7 @@ extern int ql2xenabledif;
extern int ql2xenablehba_err_chk; extern int ql2xenablehba_err_chk;
extern int ql2xtargetreset; extern int ql2xtargetreset;
extern int ql2xdontresethba; extern int ql2xdontresethba;
extern unsigned int ql2xmaxlun; extern uint64_t ql2xmaxlun;
extern int ql2xmdcapmask; extern int ql2xmdcapmask;
extern int ql2xmdenable; extern int ql2xmdenable;

6
drivers/scsi/qla2xxx/qla_os.c
View File

@ -202,8 +202,8 @@ MODULE_PARM_DESC(ql2xdontresethba,
" 0 (Default) -- Reset on failure.\n" " 0 (Default) -- Reset on failure.\n"
" 1 -- Do not reset on failure.\n"); " 1 -- Do not reset on failure.\n");
uint ql2xmaxlun = MAX_LUNS; uint64_t ql2xmaxlun = MAX_LUNS;
module_param(ql2xmaxlun, uint, S_IRUGO); module_param(ql2xmaxlun, ullong, S_IRUGO);
MODULE_PARM_DESC(ql2xmaxlun, MODULE_PARM_DESC(ql2xmaxlun,
"Defines the maximum LU number to register with the SCSI " "Defines the maximum LU number to register with the SCSI "
"midlayer. Default is 65535."); "midlayer. Default is 65535.");
@ -2676,7 +2676,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
ql_dbg(ql_dbg_init, base_vha, 0x0033, ql_dbg(ql_dbg_init, base_vha, 0x0033,
"max_id=%d this_id=%d " "max_id=%d this_id=%d "
"cmd_per_len=%d unique_id=%d max_cmd_len=%d max_channel=%d " "cmd_per_len=%d unique_id=%d max_cmd_len=%d max_channel=%d "
"max_lun=%d transportt=%p, vendor_id=%llu.\n", host->max_id, "max_lun=%llu transportt=%p, vendor_id=%llu.\n", host->max_id,
host->this_id, host->cmd_per_lun, host->unique_id, host->this_id, host->cmd_per_lun, host->unique_id,
host->max_cmd_len, host->max_channel, host->max_lun, host->max_cmd_len, host->max_channel, host->max_lun,
host->transportt, sht->vendor_id); host->transportt, sht->vendor_id);

6
drivers/scsi/scsi_scan.c
View File

@ -81,11 +81,11 @@ static const char *scsi_null_device_strs = "nullnullnullnull";
#define MAX_SCSI_LUNS 512 #define MAX_SCSI_LUNS 512
static unsigned int max_scsi_luns = MAX_SCSI_LUNS; static u64 max_scsi_luns = MAX_SCSI_LUNS;
module_param_named(max_luns, max_scsi_luns, uint, S_IRUGO|S_IWUSR); module_param_named(max_luns, max_scsi_luns, ullong, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(max_luns, MODULE_PARM_DESC(max_luns,
"last scsi LUN (should be between 1 and 2^32-1)"); "last scsi LUN (should be between 1 and 2^64-1)");
#ifdef CONFIG_SCSI_SCAN_ASYNC #ifdef CONFIG_SCSI_SCAN_ASYNC
#define SCSI_SCAN_TYPE_DEFAULT "async" #define SCSI_SCAN_TYPE_DEFAULT "async"

6
include/scsi/scsi_host.h
View File

@ -623,11 +623,11 @@ struct Scsi_Host {
* These three parameters can be used to allow for wide scsi, * These three parameters can be used to allow for wide scsi,
* and for host adapters that support multiple busses * and for host adapters that support multiple busses
* The first two should be set to 1 more than the actual max id * The first two should be set to 1 more than the actual max id
* or lun (i.e. 8 for normal systems). * or lun (e.g. 8 for SCSI parallel systems).
*/ */
unsigned int max_id;
unsigned int max_lun;
unsigned int max_channel; unsigned int max_channel;
unsigned int max_id;
u64 max_lun;
/* /*
* This is a unique identifier that must be assigned so that we * This is a unique identifier that must be assigned so that we