Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2011-10-13 21:25:59 +0200
committerOlaf Hering <ohering@suse.de>2011-10-13 21:25:59 +0200
commit7ac758b0aa4c2371ed2bfccb49684ad097f205f8 (patch)
tree6f9c0bd5d6c99f8dc77ca674ca4562c2e051aa82
parent1e8fb5b9762a6a3cd976cf2fd85f690d5d475ac3 (diff)
series.conf: really apply all hv_mouse patchesrpm-3.1.rc9-1
-rw-r--r--drivers/staging/hv/hv_mouse.c447
1 files changed, 81 insertions, 366 deletions
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 74faa2678485..edbb4797db75 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -26,9 +26,6 @@
#include "hyperv.h"
-/*
- * Data types
- */
struct hv_input_dev_info {
unsigned int size;
unsigned short vendor;
@@ -58,12 +55,12 @@ struct hv_input_dev_info {
* Message types in the synthetic input protocol
*/
enum synthhid_msg_type {
- SynthHidProtocolRequest,
- SynthHidProtocolResponse,
- SynthHidInitialDeviceInfo,
- SynthHidInitialDeviceInfoAck,
- SynthHidInputReport,
- SynthHidMax
+ SYNTH_HID_PROTOCOL_REQUEST,
+ SYNTH_HID_PROTOCOL_RESPONSE,
+ SYNTH_HID_INITIAL_DEVICE_INFO,
+ SYNTH_HID_INITIAL_DEVICE_INFO_ACK,
+ SYNTH_HID_INPUT_REPORT,
+ SYNTH_HID_MAX
};
/*
@@ -125,9 +122,9 @@ struct synthhid_input_report {
#define NBITS(x) (((x)/BITS_PER_LONG)+1)
enum pipe_prot_msg_type {
- PipeMessageInvalid = 0,
- PipeMessageData,
- PipeMessageMaximum
+ PIPE_MESSAGE_INVALID,
+ PIPE_MESSAGE_DATA,
+ PIPE_MESSAGE_MAXIMUM
};
@@ -137,9 +134,6 @@ struct pipe_prt_msg {
char data[1];
};
-/*
- * Data types
- */
struct mousevsc_prt_msg {
enum pipe_prot_msg_type type;
u32 size;
@@ -155,17 +149,11 @@ struct mousevsc_prt_msg {
*/
struct mousevsc_dev {
struct hv_device *device;
- /* 0 indicates the device is being destroyed */
- atomic_t ref_count;
- int num_outstanding_req;
unsigned char init_complete;
struct mousevsc_prt_msg protocol_req;
struct mousevsc_prt_msg protocol_resp;
/* Synchronize the request/response if needed */
- wait_queue_head_t protocol_wait_event;
- wait_queue_head_t dev_info_wait_event;
- int protocol_wait_condition;
- int device_wait_condition;
+ struct completion wait_event;
int dev_info_status;
struct hid_descriptor *hid_desc;
@@ -186,130 +174,21 @@ static struct mousevsc_dev *alloc_input_device(struct hv_device *device)
if (!input_dev)
return NULL;
- /*
- * Set to 2 to allow both inbound and outbound traffics
- * (ie get_input_device() and must_get_input_device()) to proceed.
- */
- atomic_cmpxchg(&input_dev->ref_count, 0, 2);
-
input_dev->device = device;
hv_set_drvdata(device, input_dev);
+ init_completion(&input_dev->wait_event);
return input_dev;
}
static void free_input_device(struct mousevsc_dev *device)
{
- WARN_ON(atomic_read(&device->ref_count) != 0);
+ kfree(device->hid_desc);
+ kfree(device->report_desc);
+ hv_set_drvdata(device->device, NULL);
kfree(device);
}
-/*
- * Get the inputdevice object if exists and its refcount > 1
- */
-static struct mousevsc_dev *get_input_device(struct hv_device *device)
-{
- struct mousevsc_dev *input_dev;
-
- input_dev = hv_get_drvdata(device);
-
-/*
- * FIXME
- * This sure isn't a valid thing to print for debugging, no matter
- * what the intention is...
- *
- * printk(KERN_ERR "-------------------------> REFCOUNT = %d",
- * input_dev->ref_count);
- */
-
- if (input_dev && atomic_read(&input_dev->ref_count) > 1)
- atomic_inc(&input_dev->ref_count);
- else
- input_dev = NULL;
-
- return input_dev;
-}
-
-/*
- * Get the inputdevice object iff exists and its refcount > 0
- */
-static struct mousevsc_dev *must_get_input_device(struct hv_device *device)
-{
- struct mousevsc_dev *input_dev;
-
- input_dev = hv_get_drvdata(device);
-
- if (input_dev && atomic_read(&input_dev->ref_count))
- atomic_inc(&input_dev->ref_count);
- else
- input_dev = NULL;
-
- return input_dev;
-}
-
-static void put_input_device(struct hv_device *device)
-{
- struct mousevsc_dev *input_dev;
-
- input_dev = hv_get_drvdata(device);
-
- atomic_dec(&input_dev->ref_count);
-}
-
-/*
- * Drop ref count to 1 to effectively disable get_input_device()
- */
-static struct mousevsc_dev *release_input_device(struct hv_device *device)
-{
- struct mousevsc_dev *input_dev;
-
- input_dev = hv_get_drvdata(device);
-
- /* Busy wait until the ref drop to 2, then set it to 1 */
- while (atomic_cmpxchg(&input_dev->ref_count, 2, 1) != 2)
- udelay(100);
-
- return input_dev;
-}
-
-/*
- * Drop ref count to 0. No one can use input_device object.
- */
-static struct mousevsc_dev *final_release_input_device(struct hv_device *device)
-{
- struct mousevsc_dev *input_dev;
-
- input_dev = hv_get_drvdata(device);
-
- /* Busy wait until the ref drop to 1, then set it to 0 */
- while (atomic_cmpxchg(&input_dev->ref_count, 1, 0) != 1)
- udelay(100);
-
- hv_set_drvdata(device, NULL);
- return input_dev;
-}
-
-static void mousevsc_on_send_completion(struct hv_device *device,
- struct vmpacket_descriptor *packet)
-{
- struct mousevsc_dev *input_dev;
- void *request;
-
- input_dev = must_get_input_device(device);
- if (!input_dev) {
- pr_err("unable to get input device...device being destroyed?");
- return;
- }
-
- request = (void *)(unsigned long)packet->trans_id;
-
- if (request == &input_dev->protocol_req) {
- /* FIXME */
- /* Shouldn't we be doing something here? */
- }
-
- put_input_device(device);
-}
static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
struct synthhid_device_info *device_info)
@@ -321,36 +200,27 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
/* Assume success for now */
input_device->dev_info_status = 0;
- /* Save the device attr */
memcpy(&input_device->hid_dev_info, &device_info->hid_dev_info,
sizeof(struct hv_input_dev_info));
- /* Save the hid desc */
desc = &device_info->hid_descriptor;
WARN_ON(desc->bLength == 0);
input_device->hid_desc = kzalloc(desc->bLength, GFP_ATOMIC);
- if (!input_device->hid_desc) {
- pr_err("unable to allocate hid descriptor - size %d",
- desc->bLength);
+ if (!input_device->hid_desc)
goto cleanup;
- }
memcpy(input_device->hid_desc, desc, desc->bLength);
- /* Save the report desc */
input_device->report_desc_size = desc->desc[0].wDescriptorLength;
if (input_device->report_desc_size == 0)
goto cleanup;
input_device->report_desc = kzalloc(input_device->report_desc_size,
GFP_ATOMIC);
- if (!input_device->report_desc) {
- pr_err("unable to allocate report descriptor - size %d",
- input_device->report_desc_size);
+ if (!input_device->report_desc)
goto cleanup;
- }
memcpy(input_device->report_desc,
((unsigned char *)desc) + desc->bLength,
@@ -359,10 +229,10 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
/* Send the ack */
memset(&ack, 0, sizeof(struct mousevsc_prt_msg));
- ack.type = PipeMessageData;
+ ack.type = PIPE_MESSAGE_DATA;
ack.size = sizeof(struct synthhid_device_info_ack);
- ack.ack.header.type = SynthHidInitialDeviceInfoAck;
+ ack.ack.header.type = SYNTH_HID_INITIAL_DEVICE_INFO_ACK;
ack.ack.header.size = 1;
ack.ack.reserved = 0;
@@ -373,14 +243,10 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
(unsigned long)&ack,
VM_PKT_DATA_INBAND,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
- if (ret != 0) {
- pr_err("unable to send synthhid device info ack - ret %d",
- ret);
+ if (ret != 0)
goto cleanup;
- }
- input_device->device_wait_condition = 1;
- wake_up(&input_device->dev_info_wait_event);
+ complete(&input_device->wait_event);
return;
@@ -392,26 +258,7 @@ cleanup:
input_device->report_desc = NULL;
input_device->dev_info_status = -1;
- input_device->device_wait_condition = 1;
- wake_up(&input_device->dev_info_wait_event);
-}
-
-static void mousevsc_on_receive_input_report(struct mousevsc_dev *input_device,
- struct synthhid_input_report *input_report)
-{
- struct hv_driver *input_drv;
-
- if (!input_device->init_complete) {
- pr_info("Initialization incomplete...ignoring input_report msg");
- return;
- }
-
- input_drv = drv_to_hv_drv(input_device->device->device.driver);
-
-
- hid_input_report(input_device->hid_device,
- HID_INPUT_REPORT, input_report->buffer, input_report->header.size, 1);
-
+ complete(&input_device->wait_event);
}
static void mousevsc_on_receive(struct hv_device *device,
@@ -419,36 +266,26 @@ static void mousevsc_on_receive(struct hv_device *device,
{
struct pipe_prt_msg *pipe_msg;
struct synthhid_msg *hid_msg;
- struct mousevsc_dev *input_dev;
-
- input_dev = must_get_input_device(device);
- if (!input_dev) {
- pr_err("unable to get input device...device being destroyed?");
- return;
- }
+ struct mousevsc_dev *input_dev = hv_get_drvdata(device);
+ struct synthhid_input_report *input_report;
pipe_msg = (struct pipe_prt_msg *)((unsigned long)packet +
(packet->offset8 << 3));
- if (pipe_msg->type != PipeMessageData) {
- pr_err("unknown pipe msg type - type %d len %d",
- pipe_msg->type, pipe_msg->size);
- put_input_device(device);
- return ;
- }
+ if (pipe_msg->type != PIPE_MESSAGE_DATA)
+ return;
hid_msg = (struct synthhid_msg *)&pipe_msg->data[0];
switch (hid_msg->header.type) {
- case SynthHidProtocolResponse:
+ case SYNTH_HID_PROTOCOL_RESPONSE:
memcpy(&input_dev->protocol_resp, pipe_msg,
pipe_msg->size + sizeof(struct pipe_prt_msg) -
sizeof(unsigned char));
- input_dev->protocol_wait_condition = 1;
- wake_up(&input_dev->protocol_wait_event);
+ complete(&input_dev->wait_event);
break;
- case SynthHidInitialDeviceInfo:
+ case SYNTH_HID_INITIAL_DEVICE_INFO:
WARN_ON(pipe_msg->size < sizeof(struct hv_input_dev_info));
/*
@@ -458,10 +295,14 @@ static void mousevsc_on_receive(struct hv_device *device,
mousevsc_on_receive_device_info(input_dev,
(struct synthhid_device_info *)&pipe_msg->data[0]);
break;
- case SynthHidInputReport:
- mousevsc_on_receive_input_report(input_dev,
- (struct synthhid_input_report *)&pipe_msg->data[0]);
-
+ case SYNTH_HID_INPUT_REPORT:
+ input_report =
+ (struct synthhid_input_report *)&pipe_msg->data[0];
+ if (!input_dev->init_complete)
+ break;
+ hid_input_report(input_dev->hid_device,
+ HID_INPUT_REPORT, input_report->buffer,
+ input_report->header.size, 1);
break;
default:
pr_err("unsupported hid msg type - type %d len %d",
@@ -469,7 +310,6 @@ static void mousevsc_on_receive(struct hv_device *device,
break;
}
- put_input_device(device);
}
static void mousevsc_on_channel_callback(void *context)
@@ -477,7 +317,6 @@ static void mousevsc_on_channel_callback(void *context)
const int packetSize = 0x100;
int ret = 0;
struct hv_device *device = (struct hv_device *)context;
- struct mousevsc_dev *input_dev;
u32 bytes_recvd;
u64 req_id;
@@ -486,12 +325,6 @@ static void mousevsc_on_channel_callback(void *context)
unsigned char *buffer = packet;
int bufferlen = packetSize;
- input_dev = must_get_input_device(device);
-
- if (!input_dev) {
- pr_err("unable to get input device...device being destroyed?");
- return;
- }
do {
ret = vmbus_recvpacket_raw(device->channel, buffer,
@@ -503,8 +336,6 @@ static void mousevsc_on_channel_callback(void *context)
switch (desc->type) {
case VM_PKT_COMP:
- mousevsc_on_send_completion(
- device, desc);
break;
case VM_PKT_DATA_INBAND:
@@ -528,10 +359,6 @@ static void mousevsc_on_channel_callback(void *context)
bufferlen = packetSize;
}
} else {
- /*
- * pr_debug("nothing else to read...");
- * reset
- */
if (bufferlen > packetSize) {
kfree(buffer);
@@ -548,52 +375,34 @@ static void mousevsc_on_channel_callback(void *context)
if (buffer == NULL) {
buffer = packet;
bufferlen = packetSize;
-
- /* Try again next time around */
- pr_err("unable to allocate buffer of size %d!",
- bytes_recvd);
break;
}
}
} while (1);
- put_input_device(device);
-
return;
}
static int mousevsc_connect_to_vsp(struct hv_device *device)
{
int ret = 0;
- struct mousevsc_dev *input_dev;
+ int t;
+ struct mousevsc_dev *input_dev = hv_get_drvdata(device);
struct mousevsc_prt_msg *request;
struct mousevsc_prt_msg *response;
- input_dev = get_input_device(device);
-
- if (!input_dev) {
- pr_err("unable to get input device...device being destroyed?");
- return -1;
- }
-
- init_waitqueue_head(&input_dev->protocol_wait_event);
- init_waitqueue_head(&input_dev->dev_info_wait_event);
request = &input_dev->protocol_req;
- /*
- * Now, initiate the vsc/vsp initialization protocol on the open channel
- */
memset(request, 0, sizeof(struct mousevsc_prt_msg));
- request->type = PipeMessageData;
+ request->type = PIPE_MESSAGE_DATA;
request->size = sizeof(struct synthhid_protocol_request);
- request->request.header.type = SynthHidProtocolRequest;
+ request->request.header.type = SYNTH_HID_PROTOCOL_REQUEST;
request->request.header.size = sizeof(unsigned int);
request->request.version_requested.version = SYNTHHID_INPUT_VERSION;
- pr_info("synthhid protocol request...");
ret = vmbus_sendpacket(device->channel, request,
sizeof(struct pipe_prt_msg) -
@@ -602,15 +411,11 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
(unsigned long)request,
VM_PKT_DATA_INBAND,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
- if (ret != 0) {
- pr_err("unable to send synthhid protocol request.");
+ if (ret != 0)
goto cleanup;
- }
- input_dev->protocol_wait_condition = 0;
- wait_event_timeout(input_dev->protocol_wait_event,
- input_dev->protocol_wait_condition, msecs_to_jiffies(1000));
- if (input_dev->protocol_wait_condition == 0) {
+ t = wait_for_completion_timeout(&input_dev->wait_event, 5*HZ);
+ if (t == 0) {
ret = -ETIMEDOUT;
goto cleanup;
}
@@ -620,14 +425,12 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
if (!response->response.approved) {
pr_err("synthhid protocol request failed (version %d)",
SYNTHHID_INPUT_VERSION);
- ret = -1;
+ ret = -ENODEV;
goto cleanup;
}
- input_dev->device_wait_condition = 0;
- wait_event_timeout(input_dev->dev_info_wait_event,
- input_dev->device_wait_condition, msecs_to_jiffies(1000));
- if (input_dev->device_wait_condition == 0) {
+ t = wait_for_completion_timeout(&input_dev->wait_event, 5*HZ);
+ if (t == 0) {
ret = -ETIMEDOUT;
goto cleanup;
}
@@ -636,13 +439,10 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
* We should have gotten the device attr, hid desc and report
* desc at this point
*/
- if (!input_dev->dev_info_status)
- pr_info("**** input channel up and running!! ****");
- else
- ret = -1;
+ if (input_dev->dev_info_status)
+ ret = -ENOMEM;
cleanup:
- put_input_device(device);
return ret;
}
@@ -656,75 +456,57 @@ static void mousevsc_hid_close(struct hid_device *hid)
{
}
+static struct hid_ll_driver mousevsc_ll_driver = {
+ .open = mousevsc_hid_open,
+ .close = mousevsc_hid_close,
+};
+
+static struct hid_driver mousevsc_hid_driver;
+
static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len)
{
struct hid_device *hid_dev;
struct mousevsc_dev *input_device = hv_get_drvdata(dev);
- /* hid_debug = -1; */
- hid_dev = kmalloc(sizeof(struct hid_device), GFP_KERNEL);
-
- if (hid_parse_report(hid_dev, packet, len)) {
- DPRINT_INFO(INPUTVSC_DRV, "Unable to call hd_parse_report");
+ hid_dev = hid_allocate_device();
+ if (IS_ERR(hid_dev))
return;
- }
-
- if (hid_dev) {
- DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
-
- hid_dev->ll_driver->open = mousevsc_hid_open;
- hid_dev->ll_driver->close = mousevsc_hid_close;
- hid_dev->bus = BUS_VIRTUAL;
- hid_dev->vendor = input_device->hid_dev_info.vendor;
- hid_dev->product = input_device->hid_dev_info.product;
- hid_dev->version = input_device->hid_dev_info.version;
- hid_dev->dev = dev->device;
+ hid_dev->ll_driver = &mousevsc_ll_driver;
+ hid_dev->driver = &mousevsc_hid_driver;
- sprintf(hid_dev->name, "%s",
- "Microsoft Vmbus HID-compliant Mouse");
+ if (hid_parse_report(hid_dev, packet, len))
+ return;
- /*
- * HJ Do we want to call it with a 0
- */
- if (!hidinput_connect(hid_dev, 0)) {
- hid_dev->claimed |= HID_CLAIMED_INPUT;
+ hid_dev->bus = BUS_VIRTUAL;
+ hid_dev->vendor = input_device->hid_dev_info.vendor;
+ hid_dev->product = input_device->hid_dev_info.product;
+ hid_dev->version = input_device->hid_dev_info.version;
- input_device->connected = 1;
+ sprintf(hid_dev->name, "%s", "Microsoft Vmbus HID-compliant Mouse");
- DPRINT_INFO(INPUTVSC_DRV,
- "HID device claimed by input\n");
- }
+ if (!hidinput_connect(hid_dev, 0)) {
+ hid_dev->claimed |= HID_CLAIMED_INPUT;
- if (!hid_dev->claimed) {
- DPRINT_ERR(INPUTVSC_DRV,
- "HID device not claimed by "
- "input or hiddev\n");
- }
+ input_device->connected = 1;
- input_device->hid_device = hid_dev;
}
- kfree(hid_dev);
+ input_device->hid_device = hid_dev;
}
-static int mousevsc_on_device_add(struct hv_device *device,
- void *additional_info)
+static int mousevsc_on_device_add(struct hv_device *device)
{
int ret = 0;
struct mousevsc_dev *input_dev;
- struct hv_driver *input_drv;
input_dev = alloc_input_device(device);
- if (!input_dev) {
- ret = -1;
- goto cleanup;
- }
+ if (!input_dev)
+ return -ENOMEM;
input_dev->init_complete = false;
- /* Open the channel */
ret = vmbus_open(device->channel,
INPUTVSC_SEND_RING_BUFFER_SIZE,
INPUTVSC_RECV_RING_BUFFER_SIZE,
@@ -735,28 +517,20 @@ static int mousevsc_on_device_add(struct hv_device *device,
);
if (ret != 0) {
- pr_err("unable to open channel: %d", ret);
free_input_device(input_dev);
- return -1;
+ return ret;
}
- pr_info("InputVsc channel open: %d", ret);
ret = mousevsc_connect_to_vsp(device);
if (ret != 0) {
- pr_err("unable to connect channel: %d", ret);
-
vmbus_close(device->channel);
free_input_device(input_dev);
return ret;
}
- input_drv = drv_to_hv_drv(input_dev->device->device.driver);
-
-
- /* Send the report desc back up */
/* workaround SA-167 */
if (input_dev->report_desc[14] == 0x25)
input_dev->report_desc[14] = 0x29;
@@ -766,88 +540,32 @@ static int mousevsc_on_device_add(struct hv_device *device,
input_dev->init_complete = true;
-cleanup:
- return ret;
-}
-
-static int mousevsc_on_device_remove(struct hv_device *device)
-{
- struct mousevsc_dev *input_dev;
- int ret = 0;
-
- pr_info("disabling input device (%p)...",
- hv_get_drvdata(device));
-
- input_dev = release_input_device(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 (input_dev->num_outstanding_req) {
- pr_info("waiting for %d requests to complete...",
- input_dev->num_outstanding_req);
-
- udelay(100);
- }
-
- pr_info("removing input device (%p)...", hv_get_drvdata(device));
-
- input_dev = final_release_input_device(device);
-
- pr_info("input device (%p) safe to remove", input_dev);
-
- /* Close the channel */
- vmbus_close(device->channel);
-
- free_input_device(input_dev);
-
return ret;
}
-
static int mousevsc_probe(struct hv_device *dev,
const struct hv_vmbus_device_id *dev_id)
{
- int ret = 0;
-
- /* Call to the vsc driver to add the device */
- ret = mousevsc_on_device_add(dev, NULL);
+ return mousevsc_on_device_add(dev);
- if (ret != 0) {
- DPRINT_ERR(INPUTVSC_DRV, "unable to add input vsc device");
-
- return -1;
- }
-
- return 0;
}
static int mousevsc_remove(struct hv_device *dev)
{
struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
- int ret;
+
+ vmbus_close(dev->channel);
if (input_dev->connected) {
hidinput_disconnect(input_dev->hid_device);
input_dev->connected = 0;
+ hid_destroy_device(input_dev->hid_device);
}
- /*
- * Call to the vsc driver to let it know that the device
- * is being removed
- */
- ret = mousevsc_on_device_remove(dev);
- if (ret != 0) {
- DPRINT_ERR(INPUTVSC_DRV,
- "unable to remove vsc device (ret %d)", ret);
- }
+ free_input_device(input_dev);
- return ret;
+ return 0;
}
static const struct hv_vmbus_device_id id_table[] = {
@@ -857,10 +575,7 @@ static const struct hv_vmbus_device_id id_table[] = {
{ },
};
-/*
- * The mouse driver is not functional; do not auto-load it.
- */
-/* MODULE_DEVICE_TABLE(vmbus, id_table); */
+MODULE_DEVICE_TABLE(vmbus, id_table);
static struct hv_driver mousevsc_drv = {
.name = "mousevsc",