Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ee5c615 authored by Keith Mange's avatar Keith Mange Committed by James Bottomley
Browse files

storvsc: Rather than look for sets of specific protocol versions, make decisions based on ranges. 



Rather than look for sets of specific protocol versions,
make decisions based on ranges. This will be safer and require fewer changes
going forward as we add more storage protocol versions.

Tested-by: default avatarAlex Ng <alexng@microsoft.com>
Signed-off-by: default avatarKeith Mange <keith.mange@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 89576205

drivers/scsi/storvsc_drv.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -981,8 +981,7 @@ static int storvsc_channel_init(struct hv_device *device) 
	 * support multi-channel.

	 * support multi-channel.

	 */

	 */

	max_chns = vstor_packet->storage_channel_properties.max_channel_cnt;

	max_chns = vstor_packet->storage_channel_properties.max_channel_cnt;

	if ((vmbus_proto_version != VERSION_WIN7) &&

	if (vmbus_proto_version >= VERSION_WIN8) {

	   (vmbus_proto_version != VERSION_WS2008))  {

		if (vstor_packet->storage_channel_properties.flags &

		if (vstor_packet->storage_channel_properties.flags &

		    STORAGE_CHANNEL_SUPPORTS_MULTI_CHANNEL)

		    STORAGE_CHANNEL_SUPPORTS_MULTI_CHANNEL)

			process_sub_channels = true;

			process_sub_channels = true;
@@ -1759,9 +1758,7 @@ static int storvsc_probe(struct hv_device *device, 
	 * set state to properly communicate with the host.

	 * set state to properly communicate with the host.

	 */

	 */





	switch (vmbus_proto_version) {

	if (vmbus_proto_version < VERSION_WIN8) {

	case VERSION_WS2008:

	case VERSION_WIN7:

		sense_buffer_size = PRE_WIN8_STORVSC_SENSE_BUFFER_SIZE;

		sense_buffer_size = PRE_WIN8_STORVSC_SENSE_BUFFER_SIZE;

		vmscsi_size_delta = sizeof(struct vmscsi_win8_extension);

		vmscsi_size_delta = sizeof(struct vmscsi_win8_extension);

		vmstor_current_major = VMSTOR_WIN7_MAJOR;

		vmstor_current_major = VMSTOR_WIN7_MAJOR;
@@ -1769,8 +1766,7 @@ static int storvsc_probe(struct hv_device *device, 
		max_luns_per_target = STORVSC_IDE_MAX_LUNS_PER_TARGET;

		max_luns_per_target = STORVSC_IDE_MAX_LUNS_PER_TARGET;

		max_targets = STORVSC_IDE_MAX_TARGETS;

		max_targets = STORVSC_IDE_MAX_TARGETS;

		max_channels = STORVSC_IDE_MAX_CHANNELS;

		max_channels = STORVSC_IDE_MAX_CHANNELS;

		break;

	} else {

	default:

		sense_buffer_size = POST_WIN7_STORVSC_SENSE_BUFFER_SIZE;

		sense_buffer_size = POST_WIN7_STORVSC_SENSE_BUFFER_SIZE;

		vmscsi_size_delta = 0;

		vmscsi_size_delta = 0;

		vmstor_current_major = VMSTOR_WIN8_MAJOR;

		vmstor_current_major = VMSTOR_WIN8_MAJOR;
@@ -1784,7 +1780,6 @@ static int storvsc_probe(struct hv_device *device, 
		 * VCPUs in the guest.

		 * VCPUs in the guest.

		 */

		 */

		max_sub_channels = (num_cpus / storvsc_vcpus_per_sub_channel);

		max_sub_channels = (num_cpus / storvsc_vcpus_per_sub_channel);

		break;

	}

	}





	scsi_driver.can_queue = (max_outstanding_req_per_channel *

	scsi_driver.can_queue = (max_outstanding_req_per_channel *