Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:

 - a fix for cm109 stomping on its own control URB if it tries to toggle
   buzzer immediately after userspace opens input device (found by
   syzcaller)

 - another fix for Raydium touchscreens that do not like splitting
   command transfers

 - quirks for i8042, soc_button_array, and goodix drivers to make them
   work better with certain hardware.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: goodix - add upside-down quirk for Teclast X98 Pro tablet
  Input: cm109 - do not stomp on control URB
  Input: i8042 - add Acer laptops to the i8042 reset list
  Input: cros_ec_keyb - send 'scancodes' in addition to key events
  Input: soc_button_array - add Lenovo Yoga Tablet2 1051L to the dmi_use_low_level_irq list
  Input: raydium_ts_i2c - do not split tx transactions

diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 15d17c7..1f0d61b 100644 (file)
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -183,6 +183,7 @@ static void cros_ec_keyb_process(struct cros_ec_keyb *ckdev,
                                        "changed: [r%d c%d]: byte %02x\n",
                                        row, col, new_state);
 
+                               input_event(idev, EV_MSC, MSC_SCAN, pos);
                                input_report_key(idev, keycodes[pos],
                                                 new_state);
                        }

diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index e413801..f515fae 100644 (file)
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -568,12 +568,15 @@ static int cm109_input_open(struct input_dev *idev)
        dev->ctl_data->byte[HID_OR2] = dev->keybit;
        dev->ctl_data->byte[HID_OR3] = 0x00;
 
+       dev->ctl_urb_pending = 1;
        error = usb_submit_urb(dev->urb_ctl, GFP_KERNEL);
-       if (error)
+       if (error) {
+               dev->ctl_urb_pending = 0;
                dev_err(&dev->intf->dev, "%s: usb_submit_urb (urb_ctl) failed %d\n",
                        __func__, error);
-       else
+       } else {
                dev->open = 1;
+       }
 
        mutex_unlock(&dev->pm_mutex);
 

diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index d14a656..cb6ec59 100644 (file)
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -83,6 +83,17 @@ static const struct dmi_system_id dmi_use_low_level_irq[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "One S1003"),
                },
        },
+       {
+               /*
+                * Lenovo Yoga Tab2 1051L, something messes with the home-button
+                * IRQ settings, leading to a non working home-button.
+                */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "60073"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "1051L"),
+               },
+       },
        {} /* Terminating entry */
 };
 

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 7ecb651..3a2dcf0 100644 (file)
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -611,6 +611,48 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
                },
        },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A114-31"),
+               },
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A314-31"),
+               },
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A315-31"),
+               },
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-132"),
+               },
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-332"),
+               },
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-432"),
+               },
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate Spin B118-RN"),
+               },
+       },
        {
                /* Advent 4211 */
                .matches = {

diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index 02c75ea..6612f9e 100644 (file)
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -192,6 +192,18 @@ static const struct dmi_system_id rotated_screen[] = {
                        DMI_MATCH(DMI_BIOS_DATE, "12/19/2014"),
                },
        },
+       {
+               .ident = "Teclast X98 Pro",
+               .matches = {
+                       /*
+                        * Only match BIOS date, because the manufacturers
+                        * BIOS does not report the board name at all
+                        * (sometimes)...
+                        */
+                       DMI_MATCH(DMI_BOARD_VENDOR, "TECLAST"),
+                       DMI_MATCH(DMI_BIOS_DATE, "10/28/2015"),
+               },
+       },
        {
                .ident = "WinBook TW100",
                .matches = {

diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c
index e694a9b..603a948 100644 (file)
--- a/drivers/input/touchscreen/raydium_i2c_ts.c
+++ b/drivers/input/touchscreen/raydium_i2c_ts.c
@@ -137,45 +137,25 @@ struct raydium_data {
        bool wake_irq_enabled;
 };
 
-static int raydium_i2c_xfer(struct i2c_client *client,
-                           u32 addr, void *data, size_t len, bool is_read)
-{
-       struct raydium_bank_switch_header {
-               u8 cmd;
-               __be32 be_addr;
-       } __packed header = {
-               .cmd = RM_CMD_BANK_SWITCH,
-               .be_addr = cpu_to_be32(addr),
-       };
-
-       u8 reg_addr = addr & 0xff;
-
-       struct i2c_msg xfer[] = {
-               {
-                       .addr = client->addr,
-                       .len = sizeof(header),
-                       .buf = (u8 *)&header,
-               },
-               {
-                       .addr = client->addr,
-                       .len = 1,
-                       .buf = &reg_addr,
-               },
-               {
-                       .addr = client->addr,
-                       .len = len,
-                       .buf = data,
-                       .flags = is_read ? I2C_M_RD : 0,
-               }
-       };
+/*
+ * Header to be sent for RM_CMD_BANK_SWITCH command. This is used by
+ * raydium_i2c_{read|send} below.
+ */
+struct __packed raydium_bank_switch_header {
+       u8 cmd;
+       __be32 be_addr;
+};
 
+static int raydium_i2c_xfer(struct i2c_client *client, u32 addr,
+                           struct i2c_msg *xfer, size_t xfer_count)
+{
+       int ret;
        /*
         * If address is greater than 255, then RM_CMD_BANK_SWITCH needs to be
         * sent first. Else, skip the header i.e. xfer[0].
         */
        int xfer_start_idx = (addr > 0xff) ? 0 : 1;
-       size_t xfer_count = ARRAY_SIZE(xfer) - xfer_start_idx;
-       int ret;
+       xfer_count -= xfer_start_idx;
 
        ret = i2c_transfer(client->adapter, &xfer[xfer_start_idx], xfer_count);
        if (likely(ret == xfer_count))
@@ -189,10 +169,46 @@ static int raydium_i2c_send(struct i2c_client *client,
 {
        int tries = 0;
        int error;
+       u8 *tx_buf;
+       u8 reg_addr = addr & 0xff;
+
+       tx_buf = kmalloc(len + 1, GFP_KERNEL);
+       if (!tx_buf)
+               return -ENOMEM;
+
+       tx_buf[0] = reg_addr;
+       memcpy(tx_buf + 1, data, len);
 
        do {
-               error = raydium_i2c_xfer(client, addr, (void *)data, len,
-                                        false);
+               struct raydium_bank_switch_header header = {
+                       .cmd = RM_CMD_BANK_SWITCH,
+                       .be_addr = cpu_to_be32(addr),
+               };
+
+               /*
+                * Perform as a single i2c_transfer transaction to ensure that
+                * no other I2C transactions are initiated on the bus to any
+                * other device in between. Initiating transacations to other
+                * devices after RM_CMD_BANK_SWITCH is sent is known to cause
+                * issues. This is also why regmap infrastructure cannot be used
+                * for this driver. Regmap handles page(bank) switch and reads
+                * as separate i2c_transfer() operations. This can result in
+                * problems if the Raydium device is on a shared I2C bus.
+                */
+               struct i2c_msg xfer[] = {
+                       {
+                               .addr = client->addr,
+                               .len = sizeof(header),
+                               .buf = (u8 *)&header,
+                       },
+                       {
+                               .addr = client->addr,
+                               .len = len + 1,
+                               .buf = tx_buf,
+                       },
+               };
+
+               error = raydium_i2c_xfer(client, addr, xfer, ARRAY_SIZE(xfer));
                if (likely(!error))
                        return 0;
 
@@ -206,12 +222,46 @@ static int raydium_i2c_send(struct i2c_client *client,
 static int raydium_i2c_read(struct i2c_client *client,
                            u32 addr, void *data, size_t len)
 {
-       size_t xfer_len;
        int error;
 
        while (len) {
-               xfer_len = min_t(size_t, len, RM_MAX_READ_SIZE);
-               error = raydium_i2c_xfer(client, addr, data, xfer_len, true);
+               u8 reg_addr = addr & 0xff;
+               struct raydium_bank_switch_header header = {
+                       .cmd = RM_CMD_BANK_SWITCH,
+                       .be_addr = cpu_to_be32(addr),
+               };
+               size_t xfer_len = min_t(size_t, len, RM_MAX_READ_SIZE);
+
+               /*
+                * Perform as a single i2c_transfer transaction to ensure that
+                * no other I2C transactions are initiated on the bus to any
+                * other device in between. Initiating transacations to other
+                * devices after RM_CMD_BANK_SWITCH is sent is known to cause
+                * issues. This is also why regmap infrastructure cannot be used
+                * for this driver. Regmap handles page(bank) switch and writes
+                * as separate i2c_transfer() operations. This can result in
+                * problems if the Raydium device is on a shared I2C bus.
+                */
+               struct i2c_msg xfer[] = {
+                       {
+                               .addr = client->addr,
+                               .len = sizeof(header),
+                               .buf = (u8 *)&header,
+                       },
+                       {
+                               .addr = client->addr,
+                               .len = 1,
+                               .buf = &reg_addr,
+                       },
+                       {
+                               .addr = client->addr,
+                               .len = xfer_len,
+                               .buf = data,
+                               .flags = I2C_M_RD,
+                       }
+               };
+
+               error = raydium_i2c_xfer(client, addr, xfer, ARRAY_SIZE(xfer));
                if (unlikely(error))
                        return error;