1 files changed, 101 insertions, 2 deletions

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index cedc6da93c19..0d078c32db4f 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -244,12 +244,35 @@ static int uhid_hid_output_raw(struct hid_device *hid, __u8 *buf, size_t count,
         return count;
 }
 
+static int uhid_hid_output_report(struct hid_device *hid, __u8 *buf,
+                                  size_t count)
+{
+        return uhid_hid_output_raw(hid, buf, count, HID_OUTPUT_REPORT);
+}
+
+static int uhid_raw_request(struct hid_device *hid, unsigned char reportnum,
+                            __u8 *buf, size_t len, unsigned char rtype,
+                            int reqtype)
+{
+        switch (reqtype) {
+        case HID_REQ_GET_REPORT:
+                return uhid_hid_get_raw(hid, reportnum, buf, len, rtype);
+        case HID_REQ_SET_REPORT:
+                /* TODO: implement proper SET_REPORT functionality */
+                return -ENOSYS;
+        default:
+                return -EIO;
+        }
+}
+
 static struct hid_ll_driver uhid_hid_driver = {
         .start = uhid_hid_start,
         .stop = uhid_hid_stop,
         .open = uhid_hid_open,
         .close = uhid_hid_close,
         .parse = uhid_hid_parse,
+        .output_report = uhid_hid_output_report,
+        .raw_request = uhid_raw_request,
 };
 
 #ifdef CONFIG_COMPAT
@@ -377,8 +400,6 @@ static int uhid_dev_create(struct uhid_device *uhid,
         hid->uniq[63] = 0;
 
         hid->ll_driver = &uhid_hid_driver;
-        hid->hid_get_raw_report = uhid_hid_get_raw;
-        hid->hid_output_raw_report = uhid_hid_output_raw;
         hid->bus = ev->u.create.bus;
         hid->vendor = ev->u.create.vendor;
         hid->product = ev->u.create.product;
@@ -407,6 +428,67 @@ err_free:
         return ret;
 }
 
+static int uhid_dev_create2(struct uhid_device *uhid,
+                            const struct uhid_event *ev)
+{
+        struct hid_device *hid;
+        int ret;
+
+        if (uhid->running)
+                return -EALREADY;
+
+        uhid->rd_size = ev->u.create2.rd_size;
+        if (uhid->rd_size <= 0 || uhid->rd_size > HID_MAX_DESCRIPTOR_SIZE)
+                return -EINVAL;
+
+        uhid->rd_data = kmalloc(uhid->rd_size, GFP_KERNEL);
+        if (!uhid->rd_data)
+                return -ENOMEM;
+
+        memcpy(uhid->rd_data, ev->u.create2.rd_data, uhid->rd_size);
+
+        hid = hid_allocate_device();
+        if (IS_ERR(hid)) {
+                ret = PTR_ERR(hid);
+                goto err_free;
+        }
+
+        strncpy(hid->name, ev->u.create2.name, 127);
+        hid->name[127] = 0;
+        strncpy(hid->phys, ev->u.create2.phys, 63);
+        hid->phys[63] = 0;
+        strncpy(hid->uniq, ev->u.create2.uniq, 63);
+        hid->uniq[63] = 0;
+
+        hid->ll_driver = &uhid_hid_driver;
+        hid->bus = ev->u.create2.bus;
+        hid->vendor = ev->u.create2.vendor;
+        hid->product = ev->u.create2.product;
+        hid->version = ev->u.create2.version;
+        hid->country = ev->u.create2.country;
+        hid->driver_data = uhid;
+        hid->dev.parent = uhid_misc.this_device;
+
+        uhid->hid = hid;
+        uhid->running = true;
+
+        ret = hid_add_device(hid);
+        if (ret) {
+                hid_err(hid, "Cannot register HID device\n");
+                goto err_hid;
+        }
+
+        return 0;
+
+err_hid:
+        hid_destroy_device(hid);
+        uhid->hid = NULL;
+        uhid->running = false;
+err_free:
+        kfree(uhid->rd_data);
+        return ret;
+}
+
 static int uhid_dev_destroy(struct uhid_device *uhid)
 {
         if (!uhid->running)
@@ -435,6 +517,17 @@ static int uhid_dev_input(struct uhid_device *uhid, struct uhid_event *ev)
         return 0;
 }
 
+static int uhid_dev_input2(struct uhid_device *uhid, struct uhid_event *ev)
+{
+        if (!uhid->running)
+                return -EINVAL;
+
+        hid_input_report(uhid->hid, HID_INPUT_REPORT, ev->u.input2.data,
+                         min_t(size_t, ev->u.input2.size, UHID_DATA_MAX), 0);
+
+        return 0;
+}
+
 static int uhid_dev_feature_answer(struct uhid_device *uhid,
                                    struct uhid_event *ev)
 {
@@ -571,12 +664,18 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer,
         case UHID_CREATE:
                 ret = uhid_dev_create(uhid, &uhid->input_buf);
                 break;
+        case UHID_CREATE2:
+                ret = uhid_dev_create2(uhid, &uhid->input_buf);
+                break;
         case UHID_DESTROY:
                 ret = uhid_dev_destroy(uhid);
                 break;
         case UHID_INPUT:
                 ret = uhid_dev_input(uhid, &uhid->input_buf);
                 break;
+        case UHID_INPUT2:
+                ret = uhid_dev_input2(uhid, &uhid->input_buf);
+                break;
         case UHID_FEATURE_ANSWER:
                 ret = uhid_dev_feature_answer(uhid, &uhid->input_buf);
                 break;