mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-31 06:32:06 +00:00
5de66f4fd9
While at it, also update to latest alpine base Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
119 lines
4.0 KiB
Diff
119 lines
4.0 KiB
Diff
From b16f9d200445f5a61d2ea1b14a753d7b39a59db3 Mon Sep 17 00:00:00 2001
|
|
From: Alex Ng <alexng@messages.microsoft.com>
|
|
Date: Sat, 28 Jan 2017 12:37:18 -0700
|
|
Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions.
|
|
|
|
Log the negotiated IC versions.
|
|
|
|
Signed-off-by: Alex Ng <alexng@messages.microsoft.com>
|
|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
|
|
(cherry picked from commit 1274a690f6b2bd2b37447c47e3062afa8aa43f93)
|
|
---
|
|
drivers/hv/hv_fcopy.c | 9 +++++++--
|
|
drivers/hv/hv_kvp.c | 8 ++++++--
|
|
drivers/hv/hv_snapshot.c | 11 ++++++++---
|
|
drivers/hv/hv_util.c | 4 ++--
|
|
4 files changed, 23 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c
|
|
index f1e0d0358206..e0ce0753c568 100644
|
|
--- a/drivers/hv/hv_fcopy.c
|
|
+++ b/drivers/hv/hv_fcopy.c
|
|
@@ -254,10 +254,15 @@ void hv_fcopy_onchannelcallback(void *context)
|
|
icmsghdr = (struct icmsg_hdr *)&recv_buffer[
|
|
sizeof(struct vmbuspipe_hdr)];
|
|
if (icmsghdr->icmsgtype == ICMSGTYPE_NEGOTIATE) {
|
|
- vmbus_prep_negotiate_resp(icmsghdr, recv_buffer,
|
|
+ if (vmbus_prep_negotiate_resp(icmsghdr, recv_buffer,
|
|
fw_versions, FW_VER_COUNT,
|
|
fcopy_versions, FCOPY_VER_COUNT,
|
|
- NULL, &fcopy_srv_version);
|
|
+ NULL, &fcopy_srv_version)) {
|
|
+
|
|
+ pr_info("FCopy IC version %d.%d\n",
|
|
+ fcopy_srv_version >> 16,
|
|
+ fcopy_srv_version & 0xFFFF);
|
|
+ }
|
|
} else {
|
|
fcopy_msg = (struct hv_fcopy_hdr *)&recv_buffer[
|
|
sizeof(struct vmbuspipe_hdr) +
|
|
diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c
|
|
index 70c28b8806de..a1adfe2cfb34 100644
|
|
--- a/drivers/hv/hv_kvp.c
|
|
+++ b/drivers/hv/hv_kvp.c
|
|
@@ -650,10 +650,14 @@ void hv_kvp_onchannelcallback(void *context)
|
|
sizeof(struct vmbuspipe_hdr)];
|
|
|
|
if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
|
|
- vmbus_prep_negotiate_resp(icmsghdrp,
|
|
+ if (vmbus_prep_negotiate_resp(icmsghdrp,
|
|
recv_buffer, fw_versions, FW_VER_COUNT,
|
|
kvp_versions, KVP_VER_COUNT,
|
|
- NULL, &kvp_srv_version);
|
|
+ NULL, &kvp_srv_version)) {
|
|
+ pr_info("KVP IC version %d.%d\n",
|
|
+ kvp_srv_version >> 16,
|
|
+ kvp_srv_version & 0xFFFF);
|
|
+ }
|
|
} else {
|
|
kvp_msg = (struct hv_kvp_msg *)&recv_buffer[
|
|
sizeof(struct vmbuspipe_hdr) +
|
|
diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c
|
|
index 8e62bf7f6265..e659d1b94a57 100644
|
|
--- a/drivers/hv/hv_snapshot.c
|
|
+++ b/drivers/hv/hv_snapshot.c
|
|
@@ -303,7 +303,7 @@ void hv_vss_onchannelcallback(void *context)
|
|
u32 recvlen;
|
|
u64 requestid;
|
|
struct hv_vss_msg *vss_msg;
|
|
-
|
|
+ int vss_srv_version;
|
|
|
|
struct icmsg_hdr *icmsghdrp;
|
|
|
|
@@ -318,10 +318,15 @@ void hv_vss_onchannelcallback(void *context)
|
|
sizeof(struct vmbuspipe_hdr)];
|
|
|
|
if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
|
|
- vmbus_prep_negotiate_resp(icmsghdrp,
|
|
+ if (vmbus_prep_negotiate_resp(icmsghdrp,
|
|
recv_buffer, fw_versions, FW_VER_COUNT,
|
|
vss_versions, VSS_VER_COUNT,
|
|
- NULL, NULL);
|
|
+ NULL, &vss_srv_version)) {
|
|
+
|
|
+ pr_info("VSS IC version %d.%d\n",
|
|
+ vss_srv_version >> 16,
|
|
+ vss_srv_version & 0xFFFF);
|
|
+ }
|
|
} else {
|
|
vss_msg = (struct hv_vss_msg *)&recv_buffer[
|
|
sizeof(struct vmbuspipe_hdr) +
|
|
diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
|
|
index f3797c07be10..89440c2eb346 100644
|
|
--- a/drivers/hv/hv_util.c
|
|
+++ b/drivers/hv/hv_util.c
|
|
@@ -294,7 +294,7 @@ static void timesync_onchannelcallback(void *context)
|
|
fw_versions, FW_VER_COUNT,
|
|
ts_versions, TS_VER_COUNT,
|
|
NULL, &ts_srv_version)) {
|
|
- pr_info("TimeSync version %d.%d\n",
|
|
+ pr_info("TimeSync IC version %d.%d\n",
|
|
ts_srv_version >> 16,
|
|
ts_srv_version & 0xFFFF);
|
|
}
|
|
@@ -360,7 +360,7 @@ static void heartbeat_onchannelcallback(void *context)
|
|
hb_versions, HB_VER_COUNT,
|
|
NULL, &hb_srv_version)) {
|
|
|
|
- pr_info("Heartbeat version %d.%d\n",
|
|
+ pr_info("Heartbeat IC version %d.%d\n",
|
|
hb_srv_version >> 16,
|
|
hb_srv_version & 0xFFFF);
|
|
}
|
|
--
|
|
2.16.0
|
|
|