Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6] / drivers / staging / hv / StorVsc.c
index 2b388d1..2f7c425 100644 (file)
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright (c) 2009, Microsoft Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * Authors:
  *   Haiyang Zhang <haiyangz@microsoft.com>
  *   Hank Janssen  <hjanssen@microsoft.com>
- *
  */
-
-#define KERNEL_2_6_27
-
 #include <linux/kernel.h>
-#include "include/logging.h"
-
-#include "include/StorVscApi.h"
-#include "include/VmbusPacketFormat.h"
-#include "include/vstorage.h"
-
-
-//
-// #defines
-//
-
-//
-// Data types
-//
-
-typedef struct _STORVSC_REQUEST_EXTENSION {
-       //LIST_ENTRY                                            ListEntry;
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/delay.h>
+#include "osd.h"
+#include "logging.h"
+#include "StorVscApi.h"
+#include "VmbusPacketFormat.h"
+#include "vstorage.h"
 
-       STORVSC_REQUEST                                 *Request;
-       DEVICE_OBJECT                                   *Device;
 
-       // Synchronize the request/response if needed
-       HANDLE                                                  WaitEvent;
+struct storvsc_request_extension {
+       /* LIST_ENTRY ListEntry; */
 
-       VSTOR_PACKET                                    VStorPacket;
-} STORVSC_REQUEST_EXTENSION;
+       struct hv_storvsc_request *Request;
+       struct hv_device *Device;
 
+       /* Synchronize the request/response if needed */
+       struct osd_waitevent *WaitEvent;
 
-// A storvsc device is a device object that contains a vmbus channel
-typedef struct _STORVSC_DEVICE{
-       DEVICE_OBJECT                           *Device;
-
-       int                                                     RefCount; // 0 indicates the device is being destroyed
+       struct vstor_packet VStorPacket;
+};
 
-       int                                                     NumOutstandingRequests;
+/* A storvsc device is a device object that contains a vmbus channel */
+struct storvsc_device {
+       struct hv_device *Device;
 
-       //  Each unique Port/Path/Target represents 1 channel ie scsi controller. In reality, the pathid, targetid is always 0
-       // and the port is set by us
-       ULONG                                           PortNumber;
-    UCHAR                                              PathId;
-    UCHAR                                              TargetId;
+       /* 0 indicates the device is being destroyed */
+       atomic_t RefCount;
 
-       //LIST_ENTRY                                    OutstandingRequestList;
-       //HANDLE                                                OutstandingRequestLock;
+       atomic_t NumOutstandingRequests;
 
-       // Used for vsc/vsp channel reset process
-       STORVSC_REQUEST_EXTENSION       InitRequest;
+       /*
+        * Each unique Port/Path/Target represents 1 channel ie scsi
+        * controller. In reality, the pathid, targetid is always 0
+        * and the port is set by us
+        */
+       unsigned int PortNumber;
+       unsigned char PathId;
+       unsigned char TargetId;
 
-       STORVSC_REQUEST_EXTENSION       ResetRequest;
+       /* LIST_ENTRY OutstandingRequestList; */
+       /* HANDLE OutstandingRequestLock; */
 
-} STORVSC_DEVICE;
+       /* Used for vsc/vsp channel reset process */
+       struct storvsc_request_extension InitRequest;
+       struct storvsc_request_extension ResetRequest;
+};
 
 
-//
-// Globals
-//
-static const char* gDriverName="storvsc";
+static const char *gDriverName = "storvsc";
 
-//{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}
-static const GUID gStorVscDeviceType={
-       .Data = {0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d, 0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f}
+/* {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f} */
+static const struct hv_guid gStorVscDeviceType = {
+       .data = {
+               0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d,
+               0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f
+       }
 };
 
-//
-// Internal routines
-//
-static int
-StorVscOnDeviceAdd(
-       DEVICE_OBJECT   *Device,
-       void                    *AdditionalInfo
-       );
-
-static int
-StorVscOnDeviceRemove(
-       DEVICE_OBJECT   *Device
-       );
-
-static int
-StorVscOnIORequest(
-       DEVICE_OBJECT   *Device,
-       STORVSC_REQUEST *Request
-       );
-
-static int
-StorVscOnHostReset(
-       DEVICE_OBJECT   *Device
-       );
-
-static void
-StorVscOnCleanup(
-       DRIVER_OBJECT   *Device
-       );
-
-static void
-StorVscOnChannelCallback(
-       void * Context
-       );
-
-static void
-StorVscOnIOCompletion(
-       DEVICE_OBJECT   *Device,
-       VSTOR_PACKET    *VStorPacket,
-       STORVSC_REQUEST_EXTENSION *RequestExt
-       );
-
-static void
-StorVscOnReceive(
-       DEVICE_OBJECT   *Device,
-       VSTOR_PACKET    *VStorPacket,
-       STORVSC_REQUEST_EXTENSION *RequestExt
-       );
-
-static int
-StorVscConnectToVsp(
-       DEVICE_OBJECT   *Device
-       );
-
-static inline STORVSC_DEVICE* AllocStorDevice(DEVICE_OBJECT *Device)
+
+static inline struct storvsc_device *AllocStorDevice(struct hv_device *Device)
 {
-       STORVSC_DEVICE *storDevice;
+       struct storvsc_device *storDevice;
 
-       storDevice = MemAllocZeroed(sizeof(STORVSC_DEVICE));
+       storDevice = kzalloc(sizeof(struct storvsc_device), GFP_KERNEL);
        if (!storDevice)
                return NULL;
 
-       // Set to 2 to allow both inbound and outbound traffics
-       // (ie GetStorDevice() and MustGetStorDevice()) to proceed.
-       InterlockedCompareExchange(&storDevice->RefCount, 2, 0);
+       /* Set to 2 to allow both inbound and outbound traffics */
+       /* (ie GetStorDevice() and MustGetStorDevice()) to proceed. */
+       atomic_cmpxchg(&storDevice->RefCount, 0, 2);
 
        storDevice->Device = Device;
        Device->Extension = storDevice;
@@ -159,211 +97,94 @@ static inline STORVSC_DEVICE* AllocStorDevice(DEVICE_OBJECT *Device)
        return storDevice;
 }
 
-static inline void FreeStorDevice(STORVSC_DEVICE *Device)
+static inline void FreeStorDevice(struct storvsc_device *Device)
 {
-       ASSERT(Device->RefCount == 0);
-       MemFree(Device);
+       ASSERT(atomic_read(&Device->RefCount) == 0);
+       kfree(Device);
 }
 
-// Get the stordevice object iff exists and its refcount > 1
-static inline STORVSC_DEVICE* GetStorDevice(DEVICE_OBJECT *Device)
+/* Get the stordevice object iff exists and its refcount > 1 */
+static inline struct storvsc_device *GetStorDevice(struct hv_device *Device)
 {
-       STORVSC_DEVICE *storDevice;
+       struct storvsc_device *storDevice;
 
-       storDevice = (STORVSC_DEVICE*)Device->Extension;
-       if (storDevice && storDevice->RefCount > 1)
-       {
-               InterlockedIncrement(&storDevice->RefCount);
-       }
+       storDevice = (struct storvsc_device *)Device->Extension;
+       if (storDevice && atomic_read(&storDevice->RefCount) > 1)
+               atomic_inc(&storDevice->RefCount);
        else
-       {
                storDevice = NULL;
-       }
 
        return storDevice;
 }
 
-// Get the stordevice object iff exists and its refcount > 0
-static inline STORVSC_DEVICE* MustGetStorDevice(DEVICE_OBJECT *Device)
+/* Get the stordevice object iff exists and its refcount > 0 */
+static inline struct storvsc_device *MustGetStorDevice(struct hv_device *Device)
 {
-       STORVSC_DEVICE *storDevice;
+       struct storvsc_device *storDevice;
 
-       storDevice = (STORVSC_DEVICE*)Device->Extension;
-       if (storDevice && storDevice->RefCount)
-       {
-               InterlockedIncrement(&storDevice->RefCount);
-       }
+       storDevice = (struct storvsc_device *)Device->Extension;
+       if (storDevice && atomic_read(&storDevice->RefCount))
+               atomic_inc(&storDevice->RefCount);
        else
-       {
                storDevice = NULL;
-       }
 
        return storDevice;
 }
 
-static inline void PutStorDevice(DEVICE_OBJECT *Device)
+static inline void PutStorDevice(struct hv_device *Device)
 {
-       STORVSC_DEVICE *storDevice;
+       struct storvsc_device *storDevice;
 
-       storDevice = (STORVSC_DEVICE*)Device->Extension;
+       storDevice = (struct storvsc_device *)Device->Extension;
        ASSERT(storDevice);
 
-       InterlockedDecrement(&storDevice->RefCount);
-       ASSERT(storDevice->RefCount);
+       atomic_dec(&storDevice->RefCount);
+       ASSERT(atomic_read(&storDevice->RefCount));
 }
 
-// Drop ref count to 1 to effectively disable GetStorDevice()
-static inline STORVSC_DEVICE* ReleaseStorDevice(DEVICE_OBJECT *Device)
+/* Drop ref count to 1 to effectively disable GetStorDevice() */
+static inline struct storvsc_device *ReleaseStorDevice(struct hv_device *Device)
 {
-       STORVSC_DEVICE *storDevice;
+       struct storvsc_device *storDevice;
 
-       storDevice = (STORVSC_DEVICE*)Device->Extension;
+       storDevice = (struct storvsc_device *)Device->Extension;
        ASSERT(storDevice);
 
-       // Busy wait until the ref drop to 2, then set it to 1
-       while (InterlockedCompareExchange(&storDevice->RefCount, 1, 2) != 2)
-       {
-               Sleep(100);
-       }
+       /* Busy wait until the ref drop to 2, then set it to 1 */
+       while (atomic_cmpxchg(&storDevice->RefCount, 2, 1) != 2)
+               udelay(100);
 
        return storDevice;
 }
 
-// Drop ref count to 0. No one can use StorDevice object.
-static inline STORVSC_DEVICE* FinalReleaseStorDevice(DEVICE_OBJECT *Device)
+/* Drop ref count to 0. No one can use StorDevice object. */
+static inline struct storvsc_device *FinalReleaseStorDevice(
+                       struct hv_device *Device)
 {
-       STORVSC_DEVICE *storDevice;
+       struct storvsc_device *storDevice;
 
-       storDevice = (STORVSC_DEVICE*)Device->Extension;
+       storDevice = (struct storvsc_device *)Device->Extension;
        ASSERT(storDevice);
 
-       // Busy wait until the ref drop to 1, then set it to 0
-       while (InterlockedCompareExchange(&storDevice->RefCount, 0, 1) != 1)
-       {
-               Sleep(100);
-       }
+       /* Busy wait until the ref drop to 1, then set it to 0 */
+       while (atomic_cmpxchg(&storDevice->RefCount, 1, 0) != 1)
+               udelay(100);
 
        Device->Extension = NULL;
        return storDevice;
 }
 
-/*++;
-
-
-Name:
-       StorVscInitialize()
-
-Description:
-       Main entry point
-
---*/
-int
-StorVscInitialize(
-       DRIVER_OBJECT *Driver
-       )
+static int StorVscChannelInit(struct hv_device *Device)
 {
-       STORVSC_DRIVER_OBJECT* storDriver = (STORVSC_DRIVER_OBJECT*)Driver;
-       int ret=0;
-
-       DPRINT_ENTER(STORVSC);
-
-       DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%d sizeof(STORVSC_REQUEST_EXTENSION)=%d sizeof(VSTOR_PACKET)=%d, sizeof(VMSCSI_REQUEST)=%d",
-               sizeof(STORVSC_REQUEST), sizeof(STORVSC_REQUEST_EXTENSION), sizeof(VSTOR_PACKET), sizeof(VMSCSI_REQUEST));
-
-       // Make sure we are at least 2 pages since 1 page is used for control
-       ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1));
-
-       Driver->name = gDriverName;
-       memcpy(&Driver->deviceType, &gStorVscDeviceType, sizeof(GUID));
-
-       storDriver->RequestExtSize                      = sizeof(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_MULITPAGE_BUFFER + VSTOR_PACKET + UINT64)
-       storDriver->MaxOutstandingRequestsPerChannel =
-               ((storDriver->RingBufferSize - PAGE_SIZE) / ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET + sizeof(VSTOR_PACKET) + sizeof(UINT64),sizeof(UINT64)));
-
-       DPRINT_INFO(STORVSC, "max io %u, currently %u\n", storDriver->MaxOutstandingRequestsPerChannel, STORVSC_MAX_IO_REQUESTS);
-
-       // Setup the dispatch table
-       storDriver->Base.OnDeviceAdd                    = StorVscOnDeviceAdd;
-       storDriver->Base.OnDeviceRemove         = StorVscOnDeviceRemove;
-       storDriver->Base.OnCleanup                      = StorVscOnCleanup;
-
-       storDriver->OnIORequest                         = StorVscOnIORequest;
-       storDriver->OnHostReset                         = StorVscOnHostReset;
-
-       DPRINT_EXIT(STORVSC);
-
-       return ret;
-}
-
-/*++
-
-Name:
-       StorVscOnDeviceAdd()
-
-Description:
-       Callback when the device belonging to this driver is added
-
---*/
-int
-StorVscOnDeviceAdd(
-       DEVICE_OBJECT   *Device,
-       void                    *AdditionalInfo
-       )
-{
-       int ret=0;
-       STORVSC_DEVICE *storDevice;
-       //VMSTORAGE_CHANNEL_PROPERTIES *props;
-       STORVSC_DEVICE_INFO *deviceInfo = (STORVSC_DEVICE_INFO*)AdditionalInfo;
-
-       DPRINT_ENTER(STORVSC);
-
-       storDevice = AllocStorDevice(Device);
-       if (!storDevice)
-       {
-               ret = -1;
-               goto Cleanup;
-       }
-
-       // Save the channel properties to our storvsc channel
-       //props = (VMSTORAGE_CHANNEL_PROPERTIES*) channel->offerMsg.Offer.u.Standard.UserDefined;
-
-       // FIXME:
-       // If we support more than 1 scsi channel, we need to set the port number here
-       // to the scsi channel but how do we get the scsi channel prior to the bus scan
-       /*storChannel->PortNumber = 0;
-       storChannel->PathId = props->PathId;
-       storChannel->TargetId = props->TargetId;*/
-
-       storDevice->PortNumber = deviceInfo->PortNumber;
-       // Send it back up
-       ret = StorVscConnectToVsp(Device);
-
-       //deviceInfo->PortNumber = storDevice->PortNumber;
-       deviceInfo->PathId = storDevice->PathId;
-       deviceInfo->TargetId = storDevice->TargetId;
-
-       DPRINT_DBG(STORVSC, "assigned port %u, path %u target %u\n", storDevice->PortNumber, storDevice->PathId, storDevice->TargetId);
-
-Cleanup:
-       DPRINT_EXIT(STORVSC);
-
-       return ret;
-}
-
-static int StorVscChannelInit(DEVICE_OBJECT *Device)
-{
-       int ret=0;
-       STORVSC_DEVICE *storDevice;
-       STORVSC_REQUEST_EXTENSION *request;
-       VSTOR_PACKET *vstorPacket;
+       struct storvsc_device *storDevice;
+       struct storvsc_request_extension *request;
+       struct vstor_packet *vstorPacket;
+       int ret;
 
        storDevice = GetStorDevice(Device);
-       if (!storDevice)
-       {
-               DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
+       if (!storDevice) {
+               DPRINT_ERR(STORVSC, "unable to get stor device..."
+                          "device being destroyed?");
                DPRINT_EXIT(STORVSC);
                return -1;
        }
@@ -371,10 +192,12 @@ static int StorVscChannelInit(DEVICE_OBJECT *Device)
        request = &storDevice->InitRequest;
        vstorPacket = &request->VStorPacket;
 
-       // Now, initiate the vsc/vsp initialization protocol on the open channel
-
-       memset(request, sizeof(STORVSC_REQUEST_EXTENSION), 0);
-       request->WaitEvent = WaitEventCreate();
+       /*
+        * Now, initiate the vsc/vsp initialization protocol on the open
+        * channel
+        */
+       memset(request, 0, sizeof(struct storvsc_request_extension));
+       request->WaitEvent = osd_WaitEventCreate();
 
        vstorPacket->Operation = VStorOperationBeginInitialization;
        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
@@ -386,127 +209,134 @@ static int StorVscChannelInit(DEVICE_OBJECT *Device)
        DPRINT_INFO(STORVSC, "BEGIN_INITIALIZATION_OPERATION...");
 
        ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
-                                                                                                                       vstorPacket,
-                                                                                                                       sizeof(VSTOR_PACKET),
-                                                                                                                       (ULONG_PTR)request,
-                                                                                                                       VmbusPacketTypeDataInBand,
-                                                                                                                       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-       if ( ret != 0)
-       {
-               DPRINT_ERR(STORVSC, "unable to send BEGIN_INITIALIZATION_OPERATION");
+                               vstorPacket,
+                               sizeof(struct vstor_packet),
+                               (unsigned long)request,
+                               VmbusPacketTypeDataInBand,
+                               VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+       if (ret != 0) {
+               DPRINT_ERR(STORVSC,
+                          "unable to send BEGIN_INITIALIZATION_OPERATION");
                goto Cleanup;
        }
 
-       WaitEventWait(request->WaitEvent);
+       osd_WaitEventWait(request->WaitEvent);
 
-       if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status != 0)
-       {
-               DPRINT_ERR(STORVSC, "BEGIN_INITIALIZATION_OPERATION failed (op %d status 0x%x)", vstorPacket->Operation, vstorPacket->Status);
+       if (vstorPacket->Operation != VStorOperationCompleteIo ||
+           vstorPacket->Status != 0) {
+               DPRINT_ERR(STORVSC, "BEGIN_INITIALIZATION_OPERATION failed "
+                          "(op %d status 0x%x)",
+                          vstorPacket->Operation, vstorPacket->Status);
                goto Cleanup;
        }
 
        DPRINT_INFO(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION...");
 
-       // reuse the packet for version range supported
-       memset(vstorPacket, sizeof(VSTOR_PACKET), 0);
+       /* reuse the packet for version range supported */
+       memset(vstorPacket, 0, sizeof(struct vstor_packet));
        vstorPacket->Operation = VStorOperationQueryProtocolVersion;
        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
 
-    vstorPacket->Version.MajorMinor = VMSTOR_PROTOCOL_VERSION_CURRENT;
-    FILL_VMSTOR_REVISION(vstorPacket->Version.Revision);
+       vstorPacket->Version.MajorMinor = VMSTOR_PROTOCOL_VERSION_CURRENT;
+       FILL_VMSTOR_REVISION(vstorPacket->Version.Revision);
 
        ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
-                                                                                                                       vstorPacket,
-                                                                                                                       sizeof(VSTOR_PACKET),
-                                                                                                                       (ULONG_PTR)request,
-                                                                                                                       VmbusPacketTypeDataInBand,
-                                                                                                                       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-       if ( ret != 0)
-       {
-               DPRINT_ERR(STORVSC, "unable to send BEGIN_INITIALIZATION_OPERATION");
+                               vstorPacket,
+                               sizeof(struct vstor_packet),
+                               (unsigned long)request,
+                               VmbusPacketTypeDataInBand,
+                               VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+       if (ret != 0) {
+               DPRINT_ERR(STORVSC,
+                          "unable to send BEGIN_INITIALIZATION_OPERATION");
                goto Cleanup;
        }
 
-       WaitEventWait(request->WaitEvent);
+       osd_WaitEventWait(request->WaitEvent);
 
-       // TODO: Check returned version
-       if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status != 0)
-       {
-               DPRINT_ERR(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION failed (op %d status 0x%x)", vstorPacket->Operation, vstorPacket->Status);
+       /* TODO: Check returned version */
+       if (vstorPacket->Operation != VStorOperationCompleteIo ||
+           vstorPacket->Status != 0) {
+               DPRINT_ERR(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION failed "
+                          "(op %d status 0x%x)",
+                          vstorPacket->Operation, vstorPacket->Status);
                goto Cleanup;
        }
 
-       // Query channel properties
+       /* Query channel properties */
        DPRINT_INFO(STORVSC, "QUERY_PROPERTIES_OPERATION...");
 
-       memset(vstorPacket, sizeof(VSTOR_PACKET), 0);
-    vstorPacket->Operation = VStorOperationQueryProperties;
+       memset(vstorPacket, 0, sizeof(struct vstor_packet));
+       vstorPacket->Operation = VStorOperationQueryProperties;
        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
-    vstorPacket->StorageChannelProperties.PortNumber = storDevice->PortNumber;
+       vstorPacket->StorageChannelProperties.PortNumber =
+                                       storDevice->PortNumber;
 
        ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
-                                                                                                                       vstorPacket,
-                                                                                                                       sizeof(VSTOR_PACKET),
-                                                                                                                       (ULONG_PTR)request,
-                                                                                                                       VmbusPacketTypeDataInBand,
-                                                                                                                       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-
-       if ( ret != 0)
-       {
-               DPRINT_ERR(STORVSC, "unable to send QUERY_PROPERTIES_OPERATION");
+                               vstorPacket,
+                               sizeof(struct vstor_packet),
+                               (unsigned long)request,
+                               VmbusPacketTypeDataInBand,
+                               VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+
+       if (ret != 0) {
+               DPRINT_ERR(STORVSC,
+                          "unable to send QUERY_PROPERTIES_OPERATION");
                goto Cleanup;
        }
 
-       WaitEventWait(request->WaitEvent);
+       osd_WaitEventWait(request->WaitEvent);
 
-       // TODO: Check returned version
-       if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status != 0)
-       {
-               DPRINT_ERR(STORVSC, "QUERY_PROPERTIES_OPERATION failed (op %d status 0x%x)", vstorPacket->Operation, vstorPacket->Status);
+       /* TODO: Check returned version */
+       if (vstorPacket->Operation != VStorOperationCompleteIo ||
+           vstorPacket->Status != 0) {
+               DPRINT_ERR(STORVSC, "QUERY_PROPERTIES_OPERATION failed "
+                          "(op %d status 0x%x)",
+                          vstorPacket->Operation, vstorPacket->Status);
                goto Cleanup;
        }
 
-       //storDevice->PortNumber = vstorPacket->StorageChannelProperties.PortNumber;
        storDevice->PathId = vstorPacket->StorageChannelProperties.PathId;
        storDevice->TargetId = vstorPacket->StorageChannelProperties.TargetId;
 
-       DPRINT_DBG(STORVSC, "channel flag 0x%x, max xfer len 0x%x", vstorPacket->StorageChannelProperties.Flags, vstorPacket->StorageChannelProperties.MaxTransferBytes);
+       DPRINT_DBG(STORVSC, "channel flag 0x%x, max xfer len 0x%x",
+                  vstorPacket->StorageChannelProperties.Flags,
+                  vstorPacket->StorageChannelProperties.MaxTransferBytes);
 
        DPRINT_INFO(STORVSC, "END_INITIALIZATION_OPERATION...");
 
-       memset(vstorPacket, sizeof(VSTOR_PACKET), 0);
-    vstorPacket->Operation = VStorOperationEndInitialization;
+       memset(vstorPacket, 0, sizeof(struct vstor_packet));
+       vstorPacket->Operation = VStorOperationEndInitialization;
        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
 
        ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
-                                                                                                                       vstorPacket,
-                                                                                                                       sizeof(VSTOR_PACKET),
-                                                                                                                       (ULONG_PTR)request,
-                                                                                                                       VmbusPacketTypeDataInBand,
-                                                                                                                       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-
-       if ( ret != 0)
-       {
-               DPRINT_ERR(STORVSC, "unable to send END_INITIALIZATION_OPERATION");
+                               vstorPacket,
+                               sizeof(struct vstor_packet),
+                               (unsigned long)request,
+                               VmbusPacketTypeDataInBand,
+                               VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+
+       if (ret != 0) {
+               DPRINT_ERR(STORVSC,
+                          "unable to send END_INITIALIZATION_OPERATION");
                goto Cleanup;
        }
 
-       WaitEventWait(request->WaitEvent);
+       osd_WaitEventWait(request->WaitEvent);
 
-       if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status != 0)
-       {
-               DPRINT_ERR(STORVSC, "END_INITIALIZATION_OPERATION failed (op %d status 0x%x)", vstorPacket->Operation, vstorPacket->Status);
+       if (vstorPacket->Operation != VStorOperationCompleteIo ||
+           vstorPacket->Status != 0) {
+               DPRINT_ERR(STORVSC, "END_INITIALIZATION_OPERATION failed "
+                          "(op %d status 0x%x)",
+                          vstorPacket->Operation, vstorPacket->Status);
                goto Cleanup;
        }
 
        DPRINT_INFO(STORVSC, "**** storage channel up and running!! ****");
 
 Cleanup:
-       if (request->WaitEvent)
-       {
-               WaitEventClose(request->WaitEvent);
-               request->WaitEvent = NULL;
-       }
+       kfree(request->WaitEvent);
+       request->WaitEvent = NULL;
 
        PutStorDevice(Device);
 
@@ -514,33 +344,185 @@ Cleanup:
        return ret;
 }
 
+static void StorVscOnIOCompletion(struct hv_device *Device,
+                                 struct vstor_packet *VStorPacket,
+                                 struct storvsc_request_extension *RequestExt)
+{
+       struct hv_storvsc_request *request;
+       struct storvsc_device *storDevice;
+
+       DPRINT_ENTER(STORVSC);
+
+       storDevice = MustGetStorDevice(Device);
+       if (!storDevice) {
+               DPRINT_ERR(STORVSC, "unable to get stor device..."
+                          "device being destroyed?");
+               DPRINT_EXIT(STORVSC);
+               return;
+       }
+
+       DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request extension %p "
+                  "completed bytes xfer %u", RequestExt,
+                  VStorPacket->VmSrb.DataTransferLength);
+
+       ASSERT(RequestExt != NULL);
+       ASSERT(RequestExt->Request != NULL);
+
+       request = RequestExt->Request;
+
+       ASSERT(request->OnIOCompletion != NULL);
+
+       /* Copy over the status...etc */
+       request->Status = VStorPacket->VmSrb.ScsiStatus;
+
+       if (request->Status != 0 || VStorPacket->VmSrb.SrbStatus != 1) {
+               DPRINT_WARN(STORVSC,
+                           "cmd 0x%x scsi status 0x%x srb status 0x%x\n",
+                           request->Cdb[0], VStorPacket->VmSrb.ScsiStatus,
+                           VStorPacket->VmSrb.SrbStatus);
+       }
+
+       if ((request->Status & 0xFF) == 0x02) {
+               /* CHECK_CONDITION */
+               if (VStorPacket->VmSrb.SrbStatus & 0x80) {
+                       /* autosense data available */
+                       DPRINT_WARN(STORVSC, "storvsc pkt %p autosense data "
+                                   "valid - len %d\n", RequestExt,
+                                   VStorPacket->VmSrb.SenseInfoLength);
+
+                       ASSERT(VStorPacket->VmSrb.SenseInfoLength <=
+                               request->SenseBufferSize);
+                       memcpy(request->SenseBuffer,
+                              VStorPacket->VmSrb.SenseData,
+                              VStorPacket->VmSrb.SenseInfoLength);
+
+                       request->SenseBufferSize =
+                                       VStorPacket->VmSrb.SenseInfoLength;
+               }
+       }
+
+       /* TODO: */
+       request->BytesXfer = VStorPacket->VmSrb.DataTransferLength;
+
+       request->OnIOCompletion(request);
+
+       atomic_dec(&storDevice->NumOutstandingRequests);
+
+       PutStorDevice(Device);
+
+       DPRINT_EXIT(STORVSC);
+}
+
+static void StorVscOnReceive(struct hv_device *Device,
+                            struct vstor_packet *VStorPacket,
+                            struct storvsc_request_extension *RequestExt)
+{
+       switch (VStorPacket->Operation) {
+       case VStorOperationCompleteIo:
+               DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION");
+               StorVscOnIOCompletion(Device, VStorPacket, RequestExt);
+               break;
+       case VStorOperationRemoveDevice:
+               DPRINT_INFO(STORVSC, "REMOVE_DEVICE_OPERATION");
+               /* TODO: */
+               break;
+
+       default:
+               DPRINT_INFO(STORVSC, "Unknown operation received - %d",
+                           VStorPacket->Operation);
+               break;
+       }
+}
 
-int
-StorVscConnectToVsp(
-       DEVICE_OBJECT   *Device
-       )
+static void StorVscOnChannelCallback(void *context)
 {
-       int ret=0;
-    VMSTORAGE_CHANNEL_PROPERTIES props;
+       struct hv_device *device = (struct hv_device *)context;
+       struct storvsc_device *storDevice;
+       u32 bytesRecvd;
+       u64 requestId;
+       unsigned char packet[ALIGN_UP(sizeof(struct vstor_packet), 8)];
+       struct storvsc_request_extension *request;
+       int ret;
+
+       DPRINT_ENTER(STORVSC);
+
+       ASSERT(device);
+
+       storDevice = MustGetStorDevice(device);
+       if (!storDevice) {
+               DPRINT_ERR(STORVSC, "unable to get stor device..."
+                          "device being destroyed?");
+               DPRINT_EXIT(STORVSC);
+               return;
+       }
+
+       do {
+               ret = device->Driver->VmbusChannelInterface.RecvPacket(device,
+                               packet,
+                               ALIGN_UP(sizeof(struct vstor_packet), 8),
+                               &bytesRecvd, &requestId);
+               if (ret == 0 && bytesRecvd > 0) {
+                       DPRINT_DBG(STORVSC, "receive %d bytes - tid %llx",
+                                  bytesRecvd, requestId);
+
+                       /* ASSERT(bytesRecvd == sizeof(struct vstor_packet)); */
 
-       STORVSC_DRIVER_OBJECT *storDriver = (STORVSC_DRIVER_OBJECT*) Device->Driver;;
+                       request = (struct storvsc_request_extension *)
+                                       (unsigned long)requestId;
+                       ASSERT(request);
 
-       memset(&props, sizeof(VMSTORAGE_CHANNEL_PROPERTIES), 0);
+                       /* if (vstorPacket.Flags & SYNTHETIC_FLAG) */
+                       if ((request == &storDevice->InitRequest) ||
+                           (request == &storDevice->ResetRequest)) {
+                               /* DPRINT_INFO(STORVSC,
+                                *             "reset completion - operation "
+                                *             "%u status %u",
+                                *             vstorPacket.Operation,
+                                *             vstorPacket.Status); */
+
+                               memcpy(&request->VStorPacket, packet,
+                                      sizeof(struct vstor_packet));
+
+                               osd_WaitEventSet(request->WaitEvent);
+                       } else {
+                               StorVscOnReceive(device,
+                                               (struct vstor_packet *)packet,
+                                               request);
+                       }
+               } else {
+                       /* DPRINT_DBG(STORVSC, "nothing else to read..."); */
+                       break;
+               }
+       } while (1);
 
-       // Open the channel
+       PutStorDevice(device);
+
+       DPRINT_EXIT(STORVSC);
+       return;
+}
+
+static int StorVscConnectToVsp(struct hv_device *Device)
+{
+       struct vmstorage_channel_properties props;
+       struct storvsc_driver_object *storDriver;
+       int ret;
+
+       storDriver = (struct storvsc_driver_object *)Device->Driver;
+       memset(&props, 0, sizeof(struct vmstorage_channel_properties));
+
+       /* Open the channel */
        ret = Device->Driver->VmbusChannelInterface.Open(Device,
-               storDriver->RingBufferSize,
-               storDriver->RingBufferSize,
-               (void *)&props,
-               sizeof(VMSTORAGE_CHANNEL_PROPERTIES),
-               StorVscOnChannelCallback,
-               Device
-               );
-
-       DPRINT_DBG(STORVSC, "storage props: path id %d, tgt id %d, max xfer %d", props.PathId, props.TargetId, props.MaxTransferBytes);
-
-       if (ret != 0)
-       {
+                       storDriver->RingBufferSize,
+                       storDriver->RingBufferSize,
+                       (void *)&props,
+                       sizeof(struct vmstorage_channel_properties),
+                       StorVscOnChannelCallback,
+                       Device);
+
+       DPRINT_DBG(STORVSC, "storage props: path id %d, tgt id %d, max xfer %d",
+                  props.PathId, props.TargetId, props.MaxTransferBytes);
+
+       if (ret != 0) {
                DPRINT_ERR(STORVSC, "unable to open channel: %d", ret);
                return -1;
        }
@@ -550,90 +532,114 @@ StorVscConnectToVsp(
        return ret;
 }
 
+/**
+ * StorVscOnDeviceAdd - Callback when the device belonging to this driver is added
+ */
+static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
+{
+       struct storvsc_device *storDevice;
+       /* struct vmstorage_channel_properties *props; */
+       struct storvsc_device_info *deviceInfo;
+       int ret = 0;
+
+       DPRINT_ENTER(STORVSC);
 
-/*++
+       deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
+       storDevice = AllocStorDevice(Device);
+       if (!storDevice) {
+               ret = -1;
+               goto Cleanup;
+       }
 
-Name:
-       StorVscOnDeviceRemove()
+       /* Save the channel properties to our storvsc channel */
+       /* props = (struct vmstorage_channel_properties *)
+        *              channel->offerMsg.Offer.u.Standard.UserDefined; */
 
-Description:
-       Callback when the our device is being removed
+       /* FIXME: */
+       /*
+        * If we support more than 1 scsi channel, we need to set the
+        * port number here to the scsi channel but how do we get the
+        * scsi channel prior to the bus scan
+        */
+
+       /* storChannel->PortNumber = 0;
+       storChannel->PathId = props->PathId;
+       storChannel->TargetId = props->TargetId; */
 
---*/
-int
-StorVscOnDeviceRemove(
-       DEVICE_OBJECT *Device
-       )
+       storDevice->PortNumber = deviceInfo->PortNumber;
+       /* Send it back up */
+       ret = StorVscConnectToVsp(Device);
+
+       /* deviceInfo->PortNumber = storDevice->PortNumber; */
+       deviceInfo->PathId = storDevice->PathId;
+       deviceInfo->TargetId = storDevice->TargetId;
+
+       DPRINT_DBG(STORVSC, "assigned port %u, path %u target %u\n",
+                  storDevice->PortNumber, storDevice->PathId,
+                  storDevice->TargetId);
+
+Cleanup:
+       DPRINT_EXIT(STORVSC);
+
+       return ret;
+}
+
+/**
+ * StorVscOnDeviceRemove - Callback when the our device is being removed
+ */
+static int StorVscOnDeviceRemove(struct hv_device *Device)
 {
-       STORVSC_DEVICE *storDevice;
-       int ret=0;
+       struct storvsc_device *storDevice;
 
        DPRINT_ENTER(STORVSC);
 
-       DPRINT_INFO(STORVSC, "disabling storage device (%p)...", Device->Extension);
+       DPRINT_INFO(STORVSC, "disabling storage device (%p)...",
+                   Device->Extension);
 
        storDevice = ReleaseStorDevice(Device);
 
-       // At this point, all outbound traffic should be disable. We only allow inbound traffic (responses) to proceed
-       // so that outstanding requests can be completed.
-       while (storDevice->NumOutstandingRequests)
-       {
-               DPRINT_INFO(STORVSC, "waiting for %d requests to complete...", storDevice->NumOutstandingRequests);
-
-               Sleep(100);
+       /*
+        * At this point, all outbound traffic should be disable. We
+        * only allow inbound traffic (responses) to proceed so that
+        * outstanding requests can be completed.
+        */
+       while (atomic_read(&storDevice->NumOutstandingRequests)) {
+               DPRINT_INFO(STORVSC, "waiting for %d requests to complete...",
+                           atomic_read(&storDevice->NumOutstandingRequests));
+               udelay(100);
        }
 
-       DPRINT_INFO(STORVSC, "removing storage device (%p)...", Device->Extension);
+       DPRINT_INFO(STORVSC, "removing storage device (%p)...",
+                   Device->Extension);
 
        storDevice = FinalReleaseStorDevice(Device);
 
        DPRINT_INFO(STORVSC, "storage device (%p) safe to remove", storDevice);
 
-       // Close the channel
+       /* Close the channel */
        Device->Driver->VmbusChannelInterface.Close(Device);
 
        FreeStorDevice(storDevice);
 
        DPRINT_EXIT(STORVSC);
-       return ret;
+       return 0;
 }
 
-
-//static void
-//StorVscOnTargetRescan(
-//     void *Context
-//     )
-//{
-//     DEVICE_OBJECT *device=(DEVICE_OBJECT*)Context;
-//     STORVSC_DRIVER_OBJECT *storDriver;
-//
-//     DPRINT_ENTER(STORVSC);
-//
-//     storDriver = (STORVSC_DRIVER_OBJECT*) device->Driver;
-//     storDriver->OnHostRescan(device);
-//
-//     DPRINT_EXIT(STORVSC);
-//}
-
-int
-StorVscOnHostReset(
-       DEVICE_OBJECT *Device
-       )
+static int StorVscOnHostReset(struct hv_device *Device)
 {
-       int ret=0;
-
-       STORVSC_DEVICE *storDevice;
-       STORVSC_REQUEST_EXTENSION *request;
-       VSTOR_PACKET *vstorPacket;
+       struct storvsc_device *storDevice;
+       struct storvsc_request_extension *request;
+       struct vstor_packet *vstorPacket;
+       int ret;
 
        DPRINT_ENTER(STORVSC);
 
        DPRINT_INFO(STORVSC, "resetting host adapter...");
 
        storDevice = GetStorDevice(Device);
-       if (!storDevice)
-       {
-               DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
+       if (!storDevice) {
+               DPRINT_ERR(STORVSC, "unable to get stor device..."
+                          "device being destroyed?");
                DPRINT_EXIT(STORVSC);
                return -1;
        }
@@ -641,31 +647,34 @@ StorVscOnHostReset(
        request = &storDevice->ResetRequest;
        vstorPacket = &request->VStorPacket;
 
-       request->WaitEvent = WaitEventCreate();
+       request->WaitEvent = osd_WaitEventCreate();
 
-    vstorPacket->Operation = VStorOperationResetBus;
-    vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
-    vstorPacket->VmSrb.PathId = storDevice->PathId;
+       vstorPacket->Operation = VStorOperationResetBus;
+       vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
+       vstorPacket->VmSrb.PathId = storDevice->PathId;
 
        ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
-                                                                                                                       vstorPacket,
-                                                                                                                       sizeof(VSTOR_PACKET),
-                                                                                                                       (ULONG_PTR)&storDevice->ResetRequest,
-                                                                                                                       VmbusPacketTypeDataInBand,
-                                                                                                                       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-       if (ret != 0)
-       {
-               DPRINT_ERR(STORVSC, "Unable to send reset packet %p ret %d", vstorPacket, ret);
+                               vstorPacket,
+                               sizeof(struct vstor_packet),
+                               (unsigned long)&storDevice->ResetRequest,
+                               VmbusPacketTypeDataInBand,
+                               VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+       if (ret != 0) {
+               DPRINT_ERR(STORVSC, "Unable to send reset packet %p ret %d",
+                          vstorPacket, ret);
                goto Cleanup;
        }
 
-       // FIXME: Add a timeout
-       WaitEventWait(request->WaitEvent);
+       /* FIXME: Add a timeout */
+       osd_WaitEventWait(request->WaitEvent);
 
-       WaitEventClose(request->WaitEvent);
+       kfree(request->WaitEvent);
        DPRINT_INFO(STORVSC, "host adapter reset completed");
 
-       // At this point, all outstanding requests in the adapter should have been flushed out and return to us
+       /*
+        * At this point, all outstanding requests in the adapter
+        * should have been flushed out and return to us
+        */
 
 Cleanup:
        PutStorDevice(Device);
@@ -673,63 +682,60 @@ Cleanup:
        return ret;
 }
 
-/*++
-
-Name:
-       StorVscOnIORequest()
-
-Description:
-       Callback to initiate an I/O request
-
---*/
-int
-StorVscOnIORequest(
-       DEVICE_OBJECT   *Device,
-       STORVSC_REQUEST *Request
-       )
+/**
+ * StorVscOnIORequest - Callback to initiate an I/O request
+ */
+static int StorVscOnIORequest(struct hv_device *Device,
+                             struct hv_storvsc_request *Request)
 {
-       STORVSC_DEVICE *storDevice;
-       STORVSC_REQUEST_EXTENSION* requestExtension = (STORVSC_REQUEST_EXTENSION*) Request->Extension;
-       VSTOR_PACKET* vstorPacket =&requestExtension->VStorPacket;
-       int ret=0;
+       struct storvsc_device *storDevice;
+       struct storvsc_request_extension *requestExtension;
+       struct vstor_packet *vstorPacket;
+       int ret = 0;
 
        DPRINT_ENTER(STORVSC);
 
+       requestExtension =
+               (struct storvsc_request_extension *)Request->Extension;
+       vstorPacket = &requestExtension->VStorPacket;
        storDevice = GetStorDevice(Device);
 
-       DPRINT_DBG(STORVSC, "enter - Device %p, DeviceExt %p, Request %p, Extension %p",
-               Device, storDevice, Request, requestExtension);
+       DPRINT_DBG(STORVSC, "enter - Device %p, DeviceExt %p, Request %p, "
+                  "Extension %p", Device, storDevice, Request,
+                  requestExtension);
 
        DPRINT_DBG(STORVSC, "req %p len %d bus %d, target %d, lun %d cdblen %d",
-               Request, Request->DataBuffer.Length, Request->Bus, Request->TargetId, Request->LunId, Request->CdbLen);
+                  Request, Request->DataBuffer.Length, Request->Bus,
+                  Request->TargetId, Request->LunId, Request->CdbLen);
 
-       if (!storDevice)
-       {
-               DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
+       if (!storDevice) {
+               DPRINT_ERR(STORVSC, "unable to get stor device..."
+                          "device being destroyed?");
                DPRINT_EXIT(STORVSC);
                return -2;
        }
 
-       //PrintBytes(Request->Cdb, Request->CdbLen);
+       /* print_hex_dump_bytes("", DUMP_PREFIX_NONE, Request->Cdb,
+        *                      Request->CdbLen); */
 
        requestExtension->Request = Request;
        requestExtension->Device  = Device;
 
-       memset(vstorPacket, 0 , sizeof(VSTOR_PACKET));
+       memset(vstorPacket, 0 , sizeof(struct vstor_packet));
 
        vstorPacket->Flags |= REQUEST_COMPLETION_FLAG;
 
-    vstorPacket->VmSrb.Length = sizeof(VMSCSI_REQUEST);
+       vstorPacket->VmSrb.Length = sizeof(struct vmscsi_request);
 
        vstorPacket->VmSrb.PortNumber = Request->Host;
-    vstorPacket->VmSrb.PathId = Request->Bus;
-    vstorPacket->VmSrb.TargetId = Request->TargetId;
-    vstorPacket->VmSrb.Lun = Request->LunId;
+       vstorPacket->VmSrb.PathId = Request->Bus;
+       vstorPacket->VmSrb.TargetId = Request->TargetId;
+       vstorPacket->VmSrb.Lun = Request->LunId;
 
        vstorPacket->VmSrb.SenseInfoLength = SENSE_BUFFER_SIZE;
 
-       // Copy over the scsi command descriptor block
-    vstorPacket->VmSrb.CdbLength = Request->CdbLen;
+       /* Copy over the scsi command descriptor block */
+       vstorPacket->VmSrb.CdbLength = Request->CdbLen;
        memcpy(&vstorPacket->VmSrb.Cdb, Request->Cdb, Request->CdbLen);
 
        vstorPacket->VmSrb.DataIn = Request->Type;
@@ -737,39 +743,38 @@ StorVscOnIORequest(
 
        vstorPacket->Operation = VStorOperationExecuteSRB;
 
-       DPRINT_DBG(STORVSC, "srb - len %d port %d, path %d, target %d, lun %d senselen %d cdblen %d",
-               vstorPacket->VmSrb.Length,
-               vstorPacket->VmSrb.PortNumber,
-               vstorPacket->VmSrb.PathId,
-               vstorPacket->VmSrb.TargetId,
-               vstorPacket->VmSrb.Lun,
-               vstorPacket->VmSrb.SenseInfoLength,
-               vstorPacket->VmSrb.CdbLength);
-
-       if (requestExtension->Request->DataBuffer.Length)
-       {
-               ret = Device->Driver->VmbusChannelInterface.SendPacketMultiPageBuffer(Device,
+       DPRINT_DBG(STORVSC, "srb - len %d port %d, path %d, target %d, "
+                  "lun %d senselen %d cdblen %d",
+                  vstorPacket->VmSrb.Length,
+                  vstorPacket->VmSrb.PortNumber,
+                  vstorPacket->VmSrb.PathId,
+                  vstorPacket->VmSrb.TargetId,
+                  vstorPacket->VmSrb.Lun,
+                  vstorPacket->VmSrb.SenseInfoLength,
+                  vstorPacket->VmSrb.CdbLength);
+
+       if (requestExtension->Request->DataBuffer.Length) {
+               ret = Device->Driver->VmbusChannelInterface.
+                       SendPacketMultiPageBuffer(Device,
                                &requestExtension->Request->DataBuffer,
                                vstorPacket,
-                               sizeof(VSTOR_PACKET),
-                               (ULONG_PTR)requestExtension);
-       }
-       else
-       {
+                               sizeof(struct vstor_packet),
+                               (unsigned long)requestExtension);
+       } else {
                ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
-                                                                                                                       vstorPacket,
-                                                                                                                       sizeof(VSTOR_PACKET),
-                                                                                                                       (ULONG_PTR)requestExtension,
-                                                                                                                       VmbusPacketTypeDataInBand,
-                                                                                                                       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+                               vstorPacket,
+                               sizeof(struct vstor_packet),
+                               (unsigned long)requestExtension,
+                               VmbusPacketTypeDataInBand,
+                               VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
        }
 
-       if (ret != 0)
-       {
-               DPRINT_DBG(STORVSC, "Unable to send packet %p ret %d", vstorPacket, ret);
+       if (ret != 0) {
+               DPRINT_DBG(STORVSC, "Unable to send packet %p ret %d",
+                          vstorPacket, ret);
        }
 
-       InterlockedIncrement(&storDevice->NumOutstandingRequests);
+       atomic_inc(&storDevice->NumOutstandingRequests);
 
        PutStorDevice(Device);
 
@@ -777,193 +782,69 @@ StorVscOnIORequest(
        return ret;
 }
 
-/*++
-
-Name:
-       StorVscOnCleanup()
-
-Description:
-       Perform any cleanup when the driver is removed
-
---*/
-void
-StorVscOnCleanup(
-       DRIVER_OBJECT *Driver
-       )
+/**
+ * StorVscOnCleanup - Perform any cleanup when the driver is removed
+ */
+static void StorVscOnCleanup(struct hv_driver *Driver)
 {
        DPRINT_ENTER(STORVSC);
        DPRINT_EXIT(STORVSC);
 }
 
-
-static void
-StorVscOnIOCompletion(
-       DEVICE_OBJECT   *Device,
-       VSTOR_PACKET    *VStorPacket,
-       STORVSC_REQUEST_EXTENSION *RequestExt
-       )
+/**
+ * StorVscInitialize - Main entry point
+ */
+int StorVscInitialize(struct hv_driver *Driver)
 {
-       STORVSC_REQUEST *request;
-       STORVSC_DEVICE *storDevice;
+       struct storvsc_driver_object *storDriver;
 
        DPRINT_ENTER(STORVSC);
 
-       storDevice = MustGetStorDevice(Device);
-       if (!storDevice)
-       {
-               DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
-               DPRINT_EXIT(STORVSC);
-               return;
-       }
+       storDriver = (struct storvsc_driver_object *)Driver;
 
-       DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request extension %p completed bytes xfer %u",
-               RequestExt, VStorPacket->VmSrb.DataTransferLength);
+       DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd "
+                  "sizeof(struct storvsc_request_extension)=%zd "
+                  "sizeof(struct vstor_packet)=%zd, "
+                  "sizeof(struct vmscsi_request)=%zd",
+                  sizeof(struct hv_storvsc_request),
+                  sizeof(struct storvsc_request_extension),
+                  sizeof(struct vstor_packet),
+                  sizeof(struct vmscsi_request));
 
-       ASSERT(RequestExt != NULL);
-       ASSERT(RequestExt->Request != NULL);
-
-       request = RequestExt->Request;
-
-       ASSERT(request->OnIOCompletion != NULL);
-
-       // Copy over the status...etc
-       request->Status = VStorPacket->VmSrb.ScsiStatus;
-
-       if (request->Status != 0 || VStorPacket->VmSrb.SrbStatus != 1)
-       {
-               DPRINT_WARN(STORVSC, "cmd 0x%x scsi status 0x%x srb status 0x%x\n",
-                       request->Cdb[0],
-                       VStorPacket->VmSrb.ScsiStatus,
-                       VStorPacket->VmSrb.SrbStatus);
-       }
+       /* Make sure we are at least 2 pages since 1 page is used for control */
+       ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1));
 
-       if ((request->Status & 0xFF) == 0x02) // CHECK_CONDITION
-       {
-               if (VStorPacket->VmSrb.SrbStatus & 0x80) // autosense data available
-               {
-                       DPRINT_WARN(STORVSC, "storvsc pkt %p autosense data valid - len %d\n",
-                               RequestExt, VStorPacket->VmSrb.SenseInfoLength);
+       Driver->name = gDriverName;
+       memcpy(&Driver->deviceType, &gStorVscDeviceType,
+              sizeof(struct hv_guid));
 
-                       ASSERT(VStorPacket->VmSrb.SenseInfoLength <=  request->SenseBufferSize);
-                       memcpy(request->SenseBuffer,
-                               VStorPacket->VmSrb.SenseData,
-                               VStorPacket->VmSrb.SenseInfoLength);
+       storDriver->RequestExtSize = sizeof(struct storvsc_request_extension);
 
-                       request->SenseBufferSize = VStorPacket->VmSrb.SenseInfoLength;
-               }
-       }
+       /*
+        * 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_MULITPAGE_BUFFER + struct vstor_packet + u64)
+        */
+       storDriver->MaxOutstandingRequestsPerChannel =
+               ((storDriver->RingBufferSize - PAGE_SIZE) /
+                 ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET +
+                          sizeof(struct vstor_packet) + sizeof(u64),
+                          sizeof(u64)));
 
-       // TODO:
-       request->BytesXfer = VStorPacket->VmSrb.DataTransferLength;
+       DPRINT_INFO(STORVSC, "max io %u, currently %u\n",
+                   storDriver->MaxOutstandingRequestsPerChannel,
+                   STORVSC_MAX_IO_REQUESTS);
 
-       request->OnIOCompletion(request);
+       /* Setup the dispatch table */
+       storDriver->Base.OnDeviceAdd    = StorVscOnDeviceAdd;
+       storDriver->Base.OnDeviceRemove = StorVscOnDeviceRemove;
+       storDriver->Base.OnCleanup      = StorVscOnCleanup;
 
-       InterlockedDecrement(&storDevice->NumOutstandingRequests);
-
-       PutStorDevice(Device);
+       storDriver->OnIORequest         = StorVscOnIORequest;
+       storDriver->OnHostReset         = StorVscOnHostReset;
 
        DPRINT_EXIT(STORVSC);
-}
-
-
-static void
-StorVscOnReceive(
-       DEVICE_OBJECT   *Device,
-       VSTOR_PACKET    *VStorPacket,
-       STORVSC_REQUEST_EXTENSION *RequestExt
-       )
-{
-       switch(VStorPacket->Operation)
-       {
-               case VStorOperationCompleteIo:
-
-                       DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION");
-                       StorVscOnIOCompletion(Device, VStorPacket, RequestExt);
-                       break;
-
-               //case ENUMERATE_DEVICE_OPERATION:
-
-               //      DPRINT_INFO(STORVSC, "ENUMERATE_DEVICE_OPERATION");
-
-               //      StorVscOnTargetRescan(Device);
-               //      break;
-
-        case VStorOperationRemoveDevice:
-
-                       DPRINT_INFO(STORVSC, "REMOVE_DEVICE_OPERATION");
-                       // TODO:
-                       break;
-
-               default:
-                       DPRINT_INFO(STORVSC, "Unknown operation received - %d", VStorPacket->Operation);
-                       break;
-       }
-}
-
-void
-StorVscOnChannelCallback(
-       void * Context
-       )
-{
-       int ret=0;
-       DEVICE_OBJECT *device = (DEVICE_OBJECT*)Context;
-       STORVSC_DEVICE *storDevice;
-       u32 bytesRecvd;
-       UINT64 requestId;
-       UCHAR packet[ALIGN_UP(sizeof(VSTOR_PACKET),8)];
-       STORVSC_REQUEST_EXTENSION *request;
-
-       DPRINT_ENTER(STORVSC);
-
-       ASSERT(device);
-
-       storDevice = MustGetStorDevice(device);
-       if (!storDevice)
-       {
-               DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
-               DPRINT_EXIT(STORVSC);
-               return;
-       }
-
-       do
-       {
-               ret = device->Driver->VmbusChannelInterface.RecvPacket(device,
-                                                                                                                               packet,
-                                                                                                                               ALIGN_UP(sizeof(VSTOR_PACKET),8),
-                                                                                                                               &bytesRecvd,
-                                                                                                                               &requestId);
-               if (ret == 0 && bytesRecvd > 0)
-               {
-                       DPRINT_DBG(STORVSC, "receive %d bytes - tid %llx", bytesRecvd, requestId);
 
-                       //ASSERT(bytesRecvd == sizeof(VSTOR_PACKET));
-
-                       request = (STORVSC_REQUEST_EXTENSION*)(ULONG_PTR)requestId;
-                       ASSERT(request);
-
-                       //if (vstorPacket.Flags & SYNTHETIC_FLAG)
-                       if ((request == &storDevice->InitRequest) || (request == &storDevice->ResetRequest))
-                       {
-                               //DPRINT_INFO(STORVSC, "reset completion - operation %u status %u", vstorPacket.Operation, vstorPacket.Status);
-
-                               memcpy(&request->VStorPacket, packet, sizeof(VSTOR_PACKET));
-
-                               WaitEventSet(request->WaitEvent);
-                       }
-                       else
-                       {
-                               StorVscOnReceive(device, (VSTOR_PACKET*)packet, request);
-                       }
-               }
-               else
-               {
-                       //DPRINT_DBG(STORVSC, "nothing else to read...");
-                       break;
-               }
-       } while (1);
-
-       PutStorDevice(device);
-
-       DPRINT_EXIT(STORVSC);
-       return;
+       return 0;
 }