aboutsummaryrefslogtreecommitdiffstats
path: root/f09.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-13 11:22:10 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-13 11:22:10 -0700
commit719d631363a9728e4b082cb689b802ece4476f6c (patch)
treef0ea8e8c62621b7536f5216242bdc5dc5781a28e /f09.patch
parent44ea8a3f679a11e5ac3c5b174b645669e33fd8cf (diff)
downloadpatches-719d631363a9728e4b082cb689b802ece4476f6c.tar.gz
rename hv patches and document them better.
Diffstat (limited to 'f09.patch')
-rw-r--r--f09.patch151
1 files changed, 0 insertions, 151 deletions
diff --git a/f09.patch b/f09.patch
deleted file mode 100644
index bcce69e4cf33a2..00000000000000
--- a/f09.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From foo@baz Mon Sep 9 14:41:49 PDT 2013
-Date: Mon, 09 Sep 2013 14:41:49 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject:
-
-Cc: "K. Y. Srinivasan" <kys@microsoft.com>
-Cc: Haiyang Zhang <haiyangz@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/hv/channel.c | 4 ----
- drivers/hv/vmbus_drv.c | 48 ++++++++++++++++++++++++++++++++++++++----------
- include/linux/hyperv.h | 2 --
- 3 files changed, 38 insertions(+), 16 deletions(-)
-
---- a/drivers/hv/channel.c
-+++ b/drivers/hv/channel.c
-@@ -70,15 +70,11 @@ void vmbus_get_debug_info(struct vmbus_c
- u8 monitor_offset = (u8)channel->offermsg.monitorid % 32;
-
- monitorpage = vmbus_connection.monitor_pages[0];
-- debuginfo->servermonitor_latency =
-- monitorpage->latency[monitor_group][monitor_offset];
- debuginfo->servermonitor_connectionid =
- monitorpage->parameter[monitor_group]
- [monitor_offset].connectionid.u.id;
-
- monitorpage = vmbus_connection.monitor_pages[1];
-- debuginfo->clientmonitor_latency =
-- monitorpage->latency[monitor_group][monitor_offset];
- debuginfo->clientmonitor_connectionid =
- monitorpage->parameter[monitor_group]
- [monitor_offset].connectionid.u.id;
---- a/drivers/hv/vmbus_drv.c
-+++ b/drivers/hv/vmbus_drv.c
-@@ -47,9 +47,7 @@ static struct completion probe_event;
- static int irq;
-
- struct hv_device_info {
-- u32 server_monitor_latency;
- u32 server_monitor_conn_id;
-- u32 client_monitor_latency;
- u32 client_monitor_conn_id;
-
- struct hv_dev_port_info inbound;
-@@ -75,10 +73,8 @@ static void get_channel_info(struct hv_d
-
- vmbus_get_debug_info(device->channel, &debug_info);
-
-- info->server_monitor_latency = debug_info.servermonitor_latency;
- info->server_monitor_conn_id = debug_info.servermonitor_connectionid;
-
-- info->client_monitor_latency = debug_info.clientmonitor_latency;
- info->client_monitor_conn_id = debug_info.clientmonitor_connectionid;
-
- info->inbound.int_mask = debug_info.inbound.current_interrupt_mask;
-@@ -151,13 +147,9 @@ static ssize_t vmbus_show_device_attr(st
- } else if (!strcmp(dev_attr->attr.name, "in_write_bytes_avail")) {
- ret = sprintf(buf, "%d\n",
- device_info->inbound.bytes_avail_towrite);
-- } else if (!strcmp(dev_attr->attr.name, "server_monitor_latency")) {
-- ret = sprintf(buf, "%d\n", device_info->server_monitor_latency);
- } else if (!strcmp(dev_attr->attr.name, "server_monitor_conn_id")) {
- ret = sprintf(buf, "%d\n",
- device_info->server_monitor_conn_id);
-- } else if (!strcmp(dev_attr->attr.name, "client_monitor_latency")) {
-- ret = sprintf(buf, "%d\n", device_info->client_monitor_latency);
- } else if (!strcmp(dev_attr->attr.name, "client_monitor_conn_id")) {
- ret = sprintf(buf, "%d\n",
- device_info->client_monitor_conn_id);
-@@ -184,6 +176,14 @@ static u32 channel_pending(struct vmbus_
- return monitor_page->trigger_group[monitor_group].pending;
- }
-
-+static u32 channel_latency(struct vmbus_channel *channel,
-+ struct hv_monitor_page *monitor_page)
-+{
-+ u8 monitor_group = channel_monitor_group(channel);
-+ u8 monitor_offset = channel_monitor_offset(channel);
-+ return monitor_page->latency[monitor_group][monitor_offset];
-+}
-+
- static ssize_t id_show(struct device *dev, struct device_attribute *dev_attr,
- char *buf)
- {
-@@ -280,6 +280,34 @@ static ssize_t client_monitor_pending_sh
- }
- static DEVICE_ATTR_RO(client_monitor_pending);
-
-+static ssize_t server_monitor_latency_show(struct device *dev,
-+ struct device_attribute *dev_attr,
-+ char *buf)
-+{
-+ struct hv_device *hv_dev = device_to_hv_device(dev);
-+
-+ if (!hv_dev->channel)
-+ return -ENODEV;
-+ return sprintf(buf, "%d\n",
-+ channel_latency(hv_dev->channel,
-+ vmbus_connection.monitor_pages[0]));
-+}
-+static DEVICE_ATTR_RO(server_monitor_latency);
-+
-+static ssize_t client_monitor_latency_show(struct device *dev,
-+ struct device_attribute *dev_attr,
-+ char *buf)
-+{
-+ struct hv_device *hv_dev = device_to_hv_device(dev);
-+
-+ if (!hv_dev->channel)
-+ return -ENODEV;
-+ return sprintf(buf, "%d\n",
-+ channel_latency(hv_dev->channel,
-+ vmbus_connection.monitor_pages[1]));
-+}
-+static DEVICE_ATTR_RO(client_monitor_latency);
-+
- static struct attribute *vmbus_attrs[] = {
- &dev_attr_id.attr,
- &dev_attr_state.attr,
-@@ -289,16 +317,16 @@ static struct attribute *vmbus_attrs[] =
- &dev_attr_modalias.attr,
- &dev_attr_server_monitor_pending.attr,
- &dev_attr_client_monitor_pending.attr,
-+ &dev_attr_server_monitor_latency.attr,
-+ &dev_attr_client_monitor_latency.attr,
- NULL,
- };
- ATTRIBUTE_GROUPS(vmbus);
-
- /* Set up per device attributes in /sys/bus/vmbus/devices/<bus device> */
- static struct device_attribute vmbus_device_attrs[] = {
-- __ATTR(server_monitor_latency, S_IRUGO, vmbus_show_device_attr, NULL),
- __ATTR(server_monitor_conn_id, S_IRUGO, vmbus_show_device_attr, NULL),
-
-- __ATTR(client_monitor_latency, S_IRUGO, vmbus_show_device_attr, NULL),
- __ATTR(client_monitor_conn_id, S_IRUGO, vmbus_show_device_attr, NULL),
-
- __ATTR(out_intr_mask, S_IRUGO, vmbus_show_device_attr, NULL),
---- a/include/linux/hyperv.h
-+++ b/include/linux/hyperv.h
-@@ -900,9 +900,7 @@ enum vmbus_channel_state {
- };
-
- struct vmbus_channel_debug_info {
-- u32 servermonitor_latency;
- u32 servermonitor_connectionid;
-- u32 clientmonitor_latency;
- u32 clientmonitor_connectionid;
-
- struct hv_ring_buffer_debug_info inbound;