Skip to contentSkip to conversation

Drivers: hv: vmbus:Update preferred vmbus protocol version to windows 10.

PATCH Superseded K. Y. Srinivasan 2 participants 3 messages May 15, 2015 – May 26, 2015 Hyper-V/Azure core and drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

K. Y. Srinivasan

author
#0 lore raw

PATCH 1/1 Drivers: hv: vmbus:Update preferred vmbus protocol version to windows 10.

From: [email protected] <[email protected]>

Add support for Windows 10.

Signed-off-by Keith Mange <[email protected]>
Signed-off-by K. Y. Srinivasan <[email protected]>
---
 drivers/hv/connection.c |    8 +++++---
 include/linux/hyperv.h  |    4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/hv/connection.c +5 -3
index acd50e9..4fc2e88 100644
@@ -58,6 +58,9 @@ static __u32 vmbus_get_next_version(__u32 current_version)
 	case (VERSION_WIN8_1):
 		return VERSION_WIN8;
 
+	case (VERSION_WIN10):
+		return VERSION_WIN8_1;
+
 	case (VERSION_WS2008):
 	default:
 		return VERSION_INVAL;

@@ -80,7 +83,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_1) {
+	if (version >= VERSION_WIN8_1) {
 		msg->target_vcpu = hv_context.vp_index[get_cpu()];
 		put_cpu();
 	}

@@ -376,8 +379,7 @@ void vmbus_on_event(unsigned long data)
 	int cpu = smp_processor_id();
 	union hv_synic_event_flags *event;
 
-	if ((vmbus_proto_version == VERSION_WS2008) ||
-		(vmbus_proto_version == VERSION_WIN7)) {
+	if (vmbus_proto_version < VERSION_WIN8) {
 		maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5;
 		recv_int_page = vmbus_connection.recv_int_page;
 	} else {
include/linux/hyperv.h +3 -1
index 3932a99..4317cd1 100644
@@ -160,16 +160,18 @@ hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
  * 1 . 1  (Windows 7)
  * 2 . 4  (Windows 8)
  * 3 . 0  (Windows 8 R2)
+ * 4 . 0  (Windows 10)
  */
 
 #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_WIN10	((4 << 16) | (0))
 
 #define VERSION_INVAL -1
 
-#define VERSION_CURRENT VERSION_WIN8_1
+#define VERSION_CURRENT VERSION_WIN10
 
 /* Make maximum size of pipe payload of 16K */
 #define MAX_PIPE_DATA_PAYLOAD		(sizeof(u8) * 16384)
Signature · 1 line
1.7.4.1
author
#2 lore raw
Quoted 12 lines

-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Sunday, May 24, 2015 12:20 PM
To: KY Srinivasan
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Keith Mange
Subject: Re: [PATCH 1/1] Drivers: hv: vmbus:Update preferred vmbus protocol version to windows 10.

Quoted 6 lines
Quoted 1 line · K. Y. Srinivasan

From: [email protected] <[email protected]>

That's not a valid "From:" name that matches the signed-off-by line below :(

Sorry about that; I am resending the patch.

K. Y

Quoted 5 lines
Quoted 5 lines

Add support for Windows 10.

Signed-off-by Keith Mange <[email protected]>
Signed-off-by K. Y. Srinivasan <[email protected]>