Staging: hv: Move the contents of blkvsc.c to blkvsc_drv.c

In preparation for getting rid of the file blkvsc.c, move its contents
to the appropriate file.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index a733154fa7e15bfd19a00aed3df0f930675fc7dc..30046743a0b4418f8813037998dd206f0e08c21f 100644 (file)
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -9,6 +9,6 @@ hv_vmbus-y := vmbus_drv.o \
                 hv.o connection.o channel.o \
                 channel_mgmt.o ring_buffer.o
 hv_storvsc-y := storvsc_drv.o storvsc.o
-hv_blkvsc-y := blkvsc_drv.o blkvsc.o storvsc.o
+hv_blkvsc-y := blkvsc_drv.o  storvsc.o
 hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
 hv_utils-y := hv_util.o hv_kvp.o

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index af789937be4ed8fd48a5041739290c290122d7c2..f1bf44bb09e68b89f0632045dc97492e8f88c5fc 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -116,6 +116,85 @@ struct block_device_context {
 };
 
 
+static const char *g_blk_driver_name = "blkvsc";
+
+/* {32412632-86cb-44a2-9b5c-50d1417354f5} */
+static const struct hv_guid g_blk_device_type = {
+       .data = {
+               0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
+               0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
+       }
+};
+
+static int blk_vsc_on_device_add(struct hv_device *device,
+                               void *additional_info)
+{
+       struct storvsc_device_info *device_info;
+       int ret = 0;
+
+       device_info = (struct storvsc_device_info *)additional_info;
+
+       ret = stor_vsc_on_device_add(device, additional_info);
+       if (ret != 0)
+               return ret;
+
+       /*
+        * We need to use the device instance guid to set the path and target
+        * id. For IDE devices, the device instance id is formatted as
+        * <bus id> * - <device id> - 8899 - 000000000000.
+        */
+       device_info->path_id = device->dev_instance.data[3] << 24 |
+                            device->dev_instance.data[2] << 16 |
+                            device->dev_instance.data[1] << 8  |
+                            device->dev_instance.data[0];
+
+       device_info->target_id = device->dev_instance.data[5] << 8 |
+                              device->dev_instance.data[4];
+
+       return ret;
+}
+
+
+int blk_vsc_initialize(struct hv_driver *driver)
+{
+       struct storvsc_driver_object *stor_driver;
+       int ret = 0;
+
+       stor_driver = (struct storvsc_driver_object *)driver;
+
+       /* Make sure we are at least 2 pages since 1 page is used for control */
+       /* ASSERT(stor_driver->RingBufferSize >= (PAGE_SIZE << 1)); */
+
+       driver->name = g_blk_driver_name;
+       memcpy(&driver->dev_type, &g_blk_device_type, sizeof(struct hv_guid));
+
+       stor_driver->request_ext_size =
+       sizeof(struct storvsc_request_extension);
+
+       /*
+        * Divide the ring buffer data size (which is 1 page less than the ring
+        * buffer size since that page is reserved for the ring buffer indices)
+        * by the max request size (which is
+        * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64)
+        */
+       stor_driver->max_outstanding_req_per_channel =
+               ((stor_driver->ring_buffer_size - PAGE_SIZE) /
+                 ALIGN(MAX_MULTIPAGE_BUFFER_PACKET +
+                          sizeof(struct vstor_packet) + sizeof(u64),
+                          sizeof(u64)));
+
+       DPRINT_INFO(BLKVSC, "max io outstd %u",
+                   stor_driver->max_outstanding_req_per_channel);
+
+       /* Setup the dispatch table */
+       stor_driver->base.dev_add = blk_vsc_on_device_add;
+       stor_driver->base.dev_rm = stor_vsc_on_device_remove;
+       stor_driver->base.cleanup = stor_vsc_on_cleanup;
+       stor_driver->on_io_request = stor_vsc_on_io_request;
+
+       return ret;
+}
+
 /* Static decl */
 static DEFINE_MUTEX(blkvsc_mutex);
 static int blkvsc_probe(struct device *dev);