scsi: storvsc: Set up correct queue depth values for IDE devices

[ Upstream commit f286299c1d ]

Unlike SCSI and FC, we don't use multiple channels for IDE.  Also fix
the calculation for sub-channels.

Signed-off-by: Long Li <longli@microsoft.com>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Long Li
2018-03-22 14:47:18 -07:00
committed by Greg Kroah-Hartman
parent fc0d99fde0
commit 12f9bb1a27

View File

@@ -1725,11 +1725,14 @@ static int storvsc_probe(struct hv_device *device,
max_targets = STORVSC_MAX_TARGETS; max_targets = STORVSC_MAX_TARGETS;
max_channels = STORVSC_MAX_CHANNELS; max_channels = STORVSC_MAX_CHANNELS;
/* /*
* On Windows8 and above, we support sub-channels for storage. * On Windows8 and above, we support sub-channels for storage
* on SCSI and FC controllers.
* The number of sub-channels offerred is based on the number of * The number of sub-channels offerred is based on the number of
* VCPUs in the guest. * VCPUs in the guest.
*/ */
max_sub_channels = (num_cpus / storvsc_vcpus_per_sub_channel); if (!dev_is_ide)
max_sub_channels =
(num_cpus - 1) / storvsc_vcpus_per_sub_channel;
} }
scsi_driver.can_queue = (max_outstanding_req_per_channel * scsi_driver.can_queue = (max_outstanding_req_per_channel *