Commit 0606a178 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

Drivers: scsi: storvsc: Change the limits to reflect the values on the host

commit 4cd83ecd upstream.

Hyper-V hosts can support multiple targets and multiple channels and larger number of
LUNs per target. Update the code to reflect this. With this patch we can correctly
enumerate all the paths in a multi-path storage environment.
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fda813aa
...@@ -331,17 +331,17 @@ static int storvsc_timeout = 180; ...@@ -331,17 +331,17 @@ static int storvsc_timeout = 180;
static void storvsc_on_channel_callback(void *context); static void storvsc_on_channel_callback(void *context);
/* #define STORVSC_MAX_LUNS_PER_TARGET 255
* In Hyper-V, each port/path/target maps to 1 scsi host adapter. In #define STORVSC_MAX_TARGETS 2
* reality, the path/target is not used (ie always set to 0) so our #define STORVSC_MAX_CHANNELS 8
* scsi host adapter essentially has 1 bus with 1 target that contains
* up to 256 luns.
*/
#define STORVSC_MAX_LUNS_PER_TARGET 64
#define STORVSC_MAX_TARGETS 1
#define STORVSC_MAX_CHANNELS 1
#define STORVSC_FC_MAX_LUNS_PER_TARGET 255
#define STORVSC_FC_MAX_TARGETS 128
#define STORVSC_FC_MAX_CHANNELS 8
#define STORVSC_IDE_MAX_LUNS_PER_TARGET 64
#define STORVSC_IDE_MAX_TARGETS 1
#define STORVSC_IDE_MAX_CHANNELS 1
struct storvsc_cmd_request { struct storvsc_cmd_request {
struct list_head entry; struct list_head entry;
...@@ -1713,7 +1713,6 @@ static struct scsi_host_template scsi_driver = { ...@@ -1713,7 +1713,6 @@ static struct scsi_host_template scsi_driver = {
.slave_destroy = storvsc_device_destroy, .slave_destroy = storvsc_device_destroy,
.slave_configure = storvsc_device_configure, .slave_configure = storvsc_device_configure,
.cmd_per_lun = 1, .cmd_per_lun = 1,
/* 64 max_queue * 1 target */
.can_queue = STORVSC_MAX_IO_REQUESTS*STORVSC_MAX_TARGETS, .can_queue = STORVSC_MAX_IO_REQUESTS*STORVSC_MAX_TARGETS,
.this_id = -1, .this_id = -1,
/* no use setting to 0 since ll_blk_rw reset it to 1 */ /* no use setting to 0 since ll_blk_rw reset it to 1 */
...@@ -1778,6 +1777,9 @@ static int storvsc_probe(struct hv_device *device, ...@@ -1778,6 +1777,9 @@ static int storvsc_probe(struct hv_device *device,
} }
if (dev_id->driver_data == SFC_GUID)
scsi_driver.can_queue = (STORVSC_MAX_IO_REQUESTS *
STORVSC_FC_MAX_TARGETS);
host = scsi_host_alloc(&scsi_driver, host = scsi_host_alloc(&scsi_driver,
sizeof(struct hv_host_device)); sizeof(struct hv_host_device));
if (!host) if (!host)
...@@ -1811,12 +1813,25 @@ static int storvsc_probe(struct hv_device *device, ...@@ -1811,12 +1813,25 @@ static int storvsc_probe(struct hv_device *device,
host_dev->path = stor_device->path_id; host_dev->path = stor_device->path_id;
host_dev->target = stor_device->target_id; host_dev->target = stor_device->target_id;
/* max # of devices per target */ switch (dev_id->driver_data) {
host->max_lun = STORVSC_MAX_LUNS_PER_TARGET; case SFC_GUID:
/* max # of targets per channel */ host->max_lun = STORVSC_FC_MAX_LUNS_PER_TARGET;
host->max_id = STORVSC_MAX_TARGETS; host->max_id = STORVSC_FC_MAX_TARGETS;
/* max # of channels */ host->max_channel = STORVSC_FC_MAX_CHANNELS - 1;
host->max_channel = STORVSC_MAX_CHANNELS - 1; break;
case SCSI_GUID:
host->max_lun = STORVSC_MAX_LUNS_PER_TARGET;
host->max_id = STORVSC_MAX_TARGETS;
host->max_channel = STORVSC_MAX_CHANNELS - 1;
break;
default:
host->max_lun = STORVSC_IDE_MAX_LUNS_PER_TARGET;
host->max_id = STORVSC_IDE_MAX_TARGETS;
host->max_channel = STORVSC_IDE_MAX_CHANNELS - 1;
break;
}
/* max cmd length */ /* max cmd length */
host->max_cmd_len = STORVSC_MAX_CMD_LEN; host->max_cmd_len = STORVSC_MAX_CMD_LEN;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment