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

Commit 1274a690 authored by Alex Ng's avatar Alex Ng Committed by Greg Kroah-Hartman
Browse files

Drivers: hv: Log the negotiated IC versions. 



Log the negotiated IC versions.

Signed-off-by: default avatarAlex Ng <alexng@messages.microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1656454

drivers/hv/hv_fcopy.c

+7 −2
Original line number Diff line number Diff line
@@ -251,10 +251,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) +

drivers/hv/hv_kvp.c

+6 −2
Original line number Diff line number Diff line
@@ -651,10 +651,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) +

drivers/hv/hv_snapshot.c

+8 −3
Original line number Diff line number Diff line
@@ -304,7 +304,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;
@@ -319,10 +319,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) +

drivers/hv/hv_util.c

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,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);

			}
@@ -361,7 +361,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);

			}