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

Commit 03367ef5 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts 



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: default avatarK. Y. Srinivasan <kys@microsoft.com>
Cc: <stable@vger.kernel.org>        [3.9+]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 314672a2

drivers/hv/connection.c

+4 −1
Original line number Diff line number Diff line
@@ -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;
@@ -77,7 +80,7 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo, 
	msg->interrupt_page = virt_to_phys(vmbus_connection.int_page);

	msg->monitor_page1 = virt_to_phys(vmbus_connection.monitor_pages[0]);

	msg->monitor_page2 = virt_to_phys(vmbus_connection.monitor_pages[1]);

	if (version == VERSION_WIN8)

	if (version == VERSION_WIN8_1)

		msg->target_vcpu = hv_context.vp_index[smp_processor_id()];



	/*

include/linux/hyperv.h

+3 −1
Original line number Diff line number Diff line
@@ -147,15 +147,17 @@ hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi, 
 * 0 . 13 (Windows Server 2008)

 * 1 . 1  (Windows 7)

 * 2 . 4  (Windows 8)

 * 3 . 0  (Windows 8 R2)

 */



#define VERSION_WS2008  ((0 << 16) | (13))

#define VERSION_WIN7    ((1 << 16) | (1))

#define VERSION_WIN8    ((2 << 16) | (4))

#define VERSION_WIN8_1    ((3 << 16) | (0))



#define VERSION_INVAL -1



#define VERSION_CURRENT VERSION_WIN8

#define VERSION_CURRENT VERSION_WIN8_1



/* Make maximum size of pipe payload of 16K */

#define MAX_PIPE_DATA_PAYLOAD		(sizeof(u8) * 16384)