diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2014-04-03 18:02:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-07 13:25:35 -0700 |
| commit | 863a921283fca22d63865314182e7c9e5fba0ad3 (patch) | |
| tree | 56ae30be6d56632c1f4249b2eb57b3c82b523a24 /drivers/hv | |
| parent | 8567f561ed67f4a444b554c8463d129c2ad0e8ad (diff) | |
| download | linux-3.10-863a921283fca22d63865314182e7c9e5fba0ad3.tar.gz linux-3.10-863a921283fca22d63865314182e7c9e5fba0ad3.tar.bz2 linux-3.10-863a921283fca22d63865314182e7c9e5fba0ad3.zip | |
Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts
commit 03367ef5ea811475187a0732aada068919e14d61 upstream.
Only ws2012r2 hosts support the ability to reconnect to the host on VMBUS. This functionality
is needed by kexec in Linux. To use this functionality we need to negotiate version 3.0 of the
VMBUS protocol.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
| -rw-r--r-- | drivers/hv/connection.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c index d4fac934b22..fd02cb79a99 100644 --- a/drivers/hv/connection.c +++ b/drivers/hv/connection.c @@ -55,6 +55,9 @@ static __u32 vmbus_get_next_version(__u32 current_version) case (VERSION_WIN8): return VERSION_WIN7; + case (VERSION_WIN8_1): + return VERSION_WIN8; + case (VERSION_WS2008): default: return VERSION_INVAL; @@ -80,6 +83,9 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo, (void *)((unsigned long)vmbus_connection.monitor_pages + PAGE_SIZE)); + if (version == VERSION_WIN8_1) + msg->target_vcpu = hv_context.vp_index[smp_processor_id()]; + /* * Add to list before we send the request since we may * receive the response before returning from this routine |