Skip to content

Commit 5b5e3d0

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "A few small updates to drivers. Of note we are now deferring probes of i8042 on some Asus devices as the controller is not ready to respond to queries first time around when the driver is compiled into the kernel" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: elants_i2c - do not check Remark ID on eKTH3900/eKTH5312 Input: atmel_mxt_ts - fix double free in mxt_read_info_block Input: goodix - fix memory leak in goodix_firmware_upload Input: goodix - add id->model mapping for the "9111" model Input: goodix - try not to touch the reset-pin on x86/ACPI devices Input: i8042 - enable deferred probe quirk for ASUS UM325UA Input: elantech - fix stack out of bound access in elantech_change_report_id() Input: iqs626a - prohibit inlining of channel parsing functions Input: i8042 - add deferred probe support
2 parents d0cc67b + 4ebfee2 commit 5b5e3d0

File tree

10 files changed

+151
-37
lines changed

10 files changed

+151
-37
lines changed

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,6 +1689,8 @@
16891689
architectures force reset to be always executed
16901690
i8042.unlock [HW] Unlock (ignore) the keylock
16911691
i8042.kbdreset [HW] Reset device connected to KBD port
1692+
i8042.probe_defer
1693+
[HW] Allow deferred probing upon i8042 probe errors
16921694

16931695
i810= [HW,DRM]
16941696

‎drivers/input/misc/iqs626a.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,10 @@ struct iqs626_private {
456456
unsigned int suspend_mode;
457457
};
458458

459-
static int iqs626_parse_events(struct iqs626_private *iqs626,
460-
const struct fwnode_handle *ch_node,
461-
enum iqs626_ch_id ch_id)
459+
static noinline_for_stack int
460+
iqs626_parse_events(struct iqs626_private *iqs626,
461+
const struct fwnode_handle *ch_node,
462+
enum iqs626_ch_id ch_id)
462463
{
463464
struct iqs626_sys_reg *sys_reg = &iqs626->sys_reg;
464465
struct i2c_client *client = iqs626->client;
@@ -604,9 +605,10 @@ static int iqs626_parse_events(struct iqs626_private *iqs626,
604605
return 0;
605606
}
606607

607-
static int iqs626_parse_ati_target(struct iqs626_private *iqs626,
608-
const struct fwnode_handle *ch_node,
609-
enum iqs626_ch_id ch_id)
608+
static noinline_for_stack int
609+
iqs626_parse_ati_target(struct iqs626_private *iqs626,
610+
const struct fwnode_handle *ch_node,
611+
enum iqs626_ch_id ch_id)
610612
{
611613
struct iqs626_sys_reg *sys_reg = &iqs626->sys_reg;
612614
struct i2c_client *client = iqs626->client;
@@ -885,9 +887,10 @@ static int iqs626_parse_trackpad(struct iqs626_private *iqs626,
885887
return 0;
886888
}
887889

888-
static int iqs626_parse_channel(struct iqs626_private *iqs626,
889-
const struct fwnode_handle *ch_node,
890-
enum iqs626_ch_id ch_id)
890+
static noinline_for_stack int
891+
iqs626_parse_channel(struct iqs626_private *iqs626,
892+
const struct fwnode_handle *ch_node,
893+
enum iqs626_ch_id ch_id)
891894
{
892895
struct iqs626_sys_reg *sys_reg = &iqs626->sys_reg;
893896
struct i2c_client *client = iqs626->client;

‎drivers/input/mouse/elantech.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1588,7 +1588,13 @@ static const struct dmi_system_id no_hw_res_dmi_table[] = {
15881588
*/
15891589
static int elantech_change_report_id(struct psmouse *psmouse)
15901590
{
1591-
unsigned char param[2] = { 0x10, 0x03 };
1591+
/*
1592+
* NOTE: the code is expecting to receive param[] as an array of 3
1593+
* items (see __ps2_command()), even if in this case only 2 are
1594+
* actually needed. Make sure the array size is 3 to avoid potential
1595+
* stack out-of-bound accesses.
1596+
*/
1597+
unsigned char param[3] = { 0x10, 0x03 };
15921598

15931599
if (elantech_write_reg_params(psmouse, 0x7, param) ||
15941600
elantech_read_reg_params(psmouse, 0x7, param) ||

‎drivers/input/serio/i8042-x86ia64io.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,24 @@ static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = {
995995
{ }
996996
};
997997

998+
static const struct dmi_system_id i8042_dmi_probe_defer_table[] __initconst = {
999+
{
1000+
/* ASUS ZenBook UX425UA */
1001+
.matches = {
1002+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
1003+
DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"),
1004+
},
1005+
},
1006+
{
1007+
/* ASUS ZenBook UM325UA */
1008+
.matches = {
1009+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
1010+
DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UA_UM325UA"),
1011+
},
1012+
},
1013+
{ }
1014+
};
1015+
9981016
#endif /* CONFIG_X86 */
9991017

10001018
#ifdef CONFIG_PNP
@@ -1315,6 +1333,9 @@ static int __init i8042_platform_init(void)
13151333
if (dmi_check_system(i8042_dmi_kbdreset_table))
13161334
i8042_kbdreset = true;
13171335

1336+
if (dmi_check_system(i8042_dmi_probe_defer_table))
1337+
i8042_probe_defer = true;
1338+
13181339
/*
13191340
* A20 was already enabled during early kernel init. But some buggy
13201341
* BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to

‎drivers/input/serio/i8042.c

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ static bool i8042_unlock;
4545
module_param_named(unlock, i8042_unlock, bool, 0);
4646
MODULE_PARM_DESC(unlock, "Ignore keyboard lock.");
4747

48+
static bool i8042_probe_defer;
49+
module_param_named(probe_defer, i8042_probe_defer, bool, 0);
50+
MODULE_PARM_DESC(probe_defer, "Allow deferred probing.");
51+
4852
enum i8042_controller_reset_mode {
4953
I8042_RESET_NEVER,
5054
I8042_RESET_ALWAYS,
@@ -711,7 +715,7 @@ static int i8042_set_mux_mode(bool multiplex, unsigned char *mux_version)
711715
* LCS/Telegraphics.
712716
*/
713717

714-
static int __init i8042_check_mux(void)
718+
static int i8042_check_mux(void)
715719
{
716720
unsigned char mux_version;
717721

@@ -740,10 +744,10 @@ static int __init i8042_check_mux(void)
740744
/*
741745
* The following is used to test AUX IRQ delivery.
742746
*/
743-
static struct completion i8042_aux_irq_delivered __initdata;
744-
static bool i8042_irq_being_tested __initdata;
747+
static struct completion i8042_aux_irq_delivered;
748+
static bool i8042_irq_being_tested;
745749

746-
static irqreturn_t __init i8042_aux_test_irq(int irq, void *dev_id)
750+
static irqreturn_t i8042_aux_test_irq(int irq, void *dev_id)
747751
{
748752
unsigned long flags;
749753
unsigned char str, data;
@@ -770,7 +774,7 @@ static irqreturn_t __init i8042_aux_test_irq(int irq, void *dev_id)
770774
* verifies success by readinng CTR. Used when testing for presence of AUX
771775
* port.
772776
*/
773-
static int __init i8042_toggle_aux(bool on)
777+
static int i8042_toggle_aux(bool on)
774778
{
775779
unsigned char param;
776780
int i;
@@ -798,7 +802,7 @@ static int __init i8042_toggle_aux(bool on)
798802
* the presence of an AUX interface.
799803
*/
800804

801-
static int __init i8042_check_aux(void)
805+
static int i8042_check_aux(void)
802806
{
803807
int retval = -1;
804808
bool irq_registered = false;
@@ -1005,7 +1009,7 @@ static int i8042_controller_init(void)
10051009

10061010
if (i8042_command(&ctr[n++ % 2], I8042_CMD_CTL_RCTR)) {
10071011
pr_err("Can't read CTR while initializing i8042\n");
1008-
return -EIO;
1012+
return i8042_probe_defer ? -EPROBE_DEFER : -EIO;
10091013
}
10101014

10111015
} while (n < 2 || ctr[0] != ctr[1]);
@@ -1320,7 +1324,7 @@ static void i8042_shutdown(struct platform_device *dev)
13201324
i8042_controller_reset(false);
13211325
}
13221326

1323-
static int __init i8042_create_kbd_port(void)
1327+
static int i8042_create_kbd_port(void)
13241328
{
13251329
struct serio *serio;
13261330
struct i8042_port *port = &i8042_ports[I8042_KBD_PORT_NO];
@@ -1349,7 +1353,7 @@ static int __init i8042_create_kbd_port(void)
13491353
return 0;
13501354
}
13511355

1352-
static int __init i8042_create_aux_port(int idx)
1356+
static int i8042_create_aux_port(int idx)
13531357
{
13541358
struct serio *serio;
13551359
int port_no = idx < 0 ? I8042_AUX_PORT_NO : I8042_MUX_PORT_NO + idx;
@@ -1386,13 +1390,13 @@ static int __init i8042_create_aux_port(int idx)
13861390
return 0;
13871391
}
13881392

1389-
static void __init i8042_free_kbd_port(void)
1393+
static void i8042_free_kbd_port(void)
13901394
{
13911395
kfree(i8042_ports[I8042_KBD_PORT_NO].serio);
13921396
i8042_ports[I8042_KBD_PORT_NO].serio = NULL;
13931397
}
13941398

1395-
static void __init i8042_free_aux_ports(void)
1399+
static void i8042_free_aux_ports(void)
13961400
{
13971401
int i;
13981402

@@ -1402,7 +1406,7 @@ static void __init i8042_free_aux_ports(void)
14021406
}
14031407
}
14041408

1405-
static void __init i8042_register_ports(void)
1409+
static void i8042_register_ports(void)
14061410
{
14071411
int i;
14081412

@@ -1443,7 +1447,7 @@ static void i8042_free_irqs(void)
14431447
i8042_aux_irq_registered = i8042_kbd_irq_registered = false;
14441448
}
14451449

1446-
static int __init i8042_setup_aux(void)
1450+
static int i8042_setup_aux(void)
14471451
{
14481452
int (*aux_enable)(void);
14491453
int error;
@@ -1485,7 +1489,7 @@ static int __init i8042_setup_aux(void)
14851489
return error;
14861490
}
14871491

1488-
static int __init i8042_setup_kbd(void)
1492+
static int i8042_setup_kbd(void)
14891493
{
14901494
int error;
14911495

@@ -1535,7 +1539,7 @@ static int i8042_kbd_bind_notifier(struct notifier_block *nb,
15351539
return 0;
15361540
}
15371541

1538-
static int __init i8042_probe(struct platform_device *dev)
1542+
static int i8042_probe(struct platform_device *dev)
15391543
{
15401544
int error;
15411545

@@ -1600,6 +1604,7 @@ static struct platform_driver i8042_driver = {
16001604
.pm = &i8042_pm_ops,
16011605
#endif
16021606
},
1607+
.probe = i8042_probe,
16031608
.remove = i8042_remove,
16041609
.shutdown = i8042_shutdown,
16051610
};
@@ -1610,7 +1615,6 @@ static struct notifier_block i8042_kbd_bind_notifier_block = {
16101615

16111616
static int __init i8042_init(void)
16121617
{
1613-
struct platform_device *pdev;
16141618
int err;
16151619

16161620
dbg_init();
@@ -1626,17 +1630,29 @@ static int __init i8042_init(void)
16261630
/* Set this before creating the dev to allow i8042_command to work right away */
16271631
i8042_present = true;
16281632

1629-
pdev = platform_create_bundle(&i8042_driver, i8042_probe, NULL, 0, NULL, 0);
1630-
if (IS_ERR(pdev)) {
1631-
err = PTR_ERR(pdev);
1633+
err = platform_driver_register(&i8042_driver);
1634+
if (err)
16321635
goto err_platform_exit;
1636+
1637+
i8042_platform_device = platform_device_alloc("i8042", -1);
1638+
if (!i8042_platform_device) {
1639+
err = -ENOMEM;
1640+
goto err_unregister_driver;
16331641
}
16341642

1643+
err = platform_device_add(i8042_platform_device);
1644+
if (err)
1645+
goto err_free_device;
1646+
16351647
bus_register_notifier(&serio_bus, &i8042_kbd_bind_notifier_block);
16361648
panic_blink = i8042_panic_blink;
16371649

16381650
return 0;
16391651

1652+
err_free_device:
1653+
platform_device_put(i8042_platform_device);
1654+
err_unregister_driver:
1655+
platform_driver_unregister(&i8042_driver);
16401656
err_platform_exit:
16411657
i8042_platform_exit();
16421658
return err;

‎drivers/input/touchscreen/atmel_mxt_ts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1882,7 +1882,7 @@ static int mxt_read_info_block(struct mxt_data *data)
18821882
if (error) {
18831883
dev_err(&client->dev, "Error %d parsing object table\n", error);
18841884
mxt_free_object_table(data);
1885-
goto err_free_mem;
1885+
return error;
18861886
}
18871887

18881888
data->object_table = (struct mxt_object *)(id_buf + MXT_OBJECT_START);

‎drivers/input/touchscreen/elants_i2c.c

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,19 @@
117117
#define ELAN_POWERON_DELAY_USEC 500
118118
#define ELAN_RESET_DELAY_MSEC 20
119119

120+
/* FW boot code version */
121+
#define BC_VER_H_BYTE_FOR_EKTH3900x1_I2C 0x72
122+
#define BC_VER_H_BYTE_FOR_EKTH3900x2_I2C 0x82
123+
#define BC_VER_H_BYTE_FOR_EKTH3900x3_I2C 0x92
124+
#define BC_VER_H_BYTE_FOR_EKTH5312x1_I2C 0x6D
125+
#define BC_VER_H_BYTE_FOR_EKTH5312x2_I2C 0x6E
126+
#define BC_VER_H_BYTE_FOR_EKTH5312cx1_I2C 0x77
127+
#define BC_VER_H_BYTE_FOR_EKTH5312cx2_I2C 0x78
128+
#define BC_VER_H_BYTE_FOR_EKTH5312x1_I2C_USB 0x67
129+
#define BC_VER_H_BYTE_FOR_EKTH5312x2_I2C_USB 0x68
130+
#define BC_VER_H_BYTE_FOR_EKTH5312cx1_I2C_USB 0x74
131+
#define BC_VER_H_BYTE_FOR_EKTH5312cx2_I2C_USB 0x75
132+
120133
enum elants_chip_id {
121134
EKTH3500,
122135
EKTF3624,
@@ -736,6 +749,37 @@ static int elants_i2c_validate_remark_id(struct elants_data *ts,
736749
return 0;
737750
}
738751

752+
static bool elants_i2c_should_check_remark_id(struct elants_data *ts)
753+
{
754+
struct i2c_client *client = ts->client;
755+
const u8 bootcode_version = ts->iap_version;
756+
bool check;
757+
758+
/* I2C eKTH3900 and eKTH5312 are NOT support Remark ID */
759+
if ((bootcode_version == BC_VER_H_BYTE_FOR_EKTH3900x1_I2C) ||
760+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH3900x2_I2C) ||
761+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH3900x3_I2C) ||
762+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH5312x1_I2C) ||
763+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH5312x2_I2C) ||
764+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH5312cx1_I2C) ||
765+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH5312cx2_I2C) ||
766+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH5312x1_I2C_USB) ||
767+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH5312x2_I2C_USB) ||
768+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH5312cx1_I2C_USB) ||
769+
(bootcode_version == BC_VER_H_BYTE_FOR_EKTH5312cx2_I2C_USB)) {
770+
dev_dbg(&client->dev,
771+
"eKTH3900/eKTH5312(0x%02x) are not support remark id\n",
772+
bootcode_version);
773+
check = false;
774+
} else if (bootcode_version >= 0x60) {
775+
check = true;
776+
} else {
777+
check = false;
778+
}
779+
780+
return check;
781+
}
782+
739783
static int elants_i2c_do_update_firmware(struct i2c_client *client,
740784
const struct firmware *fw,
741785
bool force)
@@ -749,7 +793,7 @@ static int elants_i2c_do_update_firmware(struct i2c_client *client,
749793
u16 send_id;
750794
int page, n_fw_pages;
751795
int error;
752-
bool check_remark_id = ts->iap_version >= 0x60;
796+
bool check_remark_id = elants_i2c_should_check_remark_id(ts);
753797

754798
/* Recovery mode detection! */
755799
if (force) {

0 commit comments

Comments
 (0)