From: Greg Kroah-Hartman Date: Mon, 30 Mar 2020 09:58:47 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v5.6.1~60 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9f8be07ed82f25f66febc78819071d68d1843ce;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_boot_trigger.patch input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch --- diff --git a/queue-4.19/i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch b/queue-4.19/i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch new file mode 100644 index 00000000000..aa02ac5b2ae --- /dev/null +++ b/queue-4.19/i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch @@ -0,0 +1,31 @@ +From e1b9f99ff8c40bba6e59de9ad4a659447b1e4112 Mon Sep 17 00:00:00 2001 +From: Chuhong Yuan +Date: Mon, 4 Nov 2019 23:00:48 +0800 +Subject: i2c: hix5hd2: add missed clk_disable_unprepare in remove + +From: Chuhong Yuan + +commit e1b9f99ff8c40bba6e59de9ad4a659447b1e4112 upstream. + +The driver forgets to disable and unprepare clk when remove. +Add a call to clk_disable_unprepare to fix it. + +Signed-off-by: Chuhong Yuan +Signed-off-by: Wolfram Sang +Cc: stable@kernel.org +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/i2c/busses/i2c-hix5hd2.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/i2c/busses/i2c-hix5hd2.c ++++ b/drivers/i2c/busses/i2c-hix5hd2.c +@@ -482,6 +482,7 @@ static int hix5hd2_i2c_remove(struct pla + i2c_del_adapter(&priv->adap); + pm_runtime_disable(priv->dev); + pm_runtime_set_suspended(priv->dev); ++ clk_disable_unprepare(priv->clk); + + return 0; + } diff --git a/queue-4.19/input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch b/queue-4.19/input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch new file mode 100644 index 00000000000..a8326ed8d9f --- /dev/null +++ b/queue-4.19/input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch @@ -0,0 +1,52 @@ +From 52afa505a03d914081f40cb869a3248567a57573 Mon Sep 17 00:00:00 2001 +From: Eugene Syromiatnikov +Date: Tue, 24 Mar 2020 15:53:50 -0700 +Subject: Input: avoid BIT() macro usage in the serio.h UAPI header + +From: Eugene Syromiatnikov + +commit 52afa505a03d914081f40cb869a3248567a57573 upstream. + +The commit 19ba1eb15a2a ("Input: psmouse - add a custom serio protocol +to send extra information") introduced usage of the BIT() macro +for SERIO_* flags; this macro is not provided in UAPI headers. +Replace if with similarly defined _BITUL() macro defined +in . + +Fixes: 19ba1eb15a2a ("Input: psmouse - add a custom serio protocol to send extra information") +Signed-off-by: Eugene Syromiatnikov +Cc: # v5.0+ +Link: https://lore.kernel.org/r/20200324041341.GA32335@asgard.redhat.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + include/uapi/linux/serio.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/include/uapi/linux/serio.h ++++ b/include/uapi/linux/serio.h +@@ -9,7 +9,7 @@ + #ifndef _UAPI_SERIO_H + #define _UAPI_SERIO_H + +- ++#include + #include + + #define SPIOCSTYPE _IOW('q', 0x01, unsigned long) +@@ -18,10 +18,10 @@ + /* + * bit masks for use in "interrupt" flags (3rd argument) + */ +-#define SERIO_TIMEOUT BIT(0) +-#define SERIO_PARITY BIT(1) +-#define SERIO_FRAME BIT(2) +-#define SERIO_OOB_DATA BIT(3) ++#define SERIO_TIMEOUT _BITUL(0) ++#define SERIO_PARITY _BITUL(1) ++#define SERIO_FRAME _BITUL(2) ++#define SERIO_OOB_DATA _BITUL(3) + + /* + * Serio types diff --git a/queue-4.19/input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_boot_trigger.patch b/queue-4.19/input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_boot_trigger.patch new file mode 100644 index 00000000000..d3aa7c4913d --- /dev/null +++ b/queue-4.19/input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_boot_trigger.patch @@ -0,0 +1,57 @@ +From 32cf3a610c35cb21e3157f4bbf29d89960e30a36 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Fri, 6 Mar 2020 11:50:51 -0800 +Subject: Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger() + +From: Dan Carpenter + +commit 32cf3a610c35cb21e3157f4bbf29d89960e30a36 upstream. + +These functions are supposed to return negative error codes but instead +it returns true on failure and false on success. The error codes are +eventually propagated back to user space. + +Fixes: 48a2b783483b ("Input: add Raydium I2C touchscreen driver") +Signed-off-by: Dan Carpenter +Link: https://lore.kernel.org/r/20200303101306.4potflz7na2nn3od@kili.mountain +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/touchscreen/raydium_i2c_ts.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/input/touchscreen/raydium_i2c_ts.c ++++ b/drivers/input/touchscreen/raydium_i2c_ts.c +@@ -441,7 +441,7 @@ static int raydium_i2c_write_object(stru + return 0; + } + +-static bool raydium_i2c_boot_trigger(struct i2c_client *client) ++static int raydium_i2c_boot_trigger(struct i2c_client *client) + { + static const u8 cmd[7][6] = { + { 0x08, 0x0C, 0x09, 0x00, 0x50, 0xD7 }, +@@ -466,10 +466,10 @@ static bool raydium_i2c_boot_trigger(str + } + } + +- return false; ++ return 0; + } + +-static bool raydium_i2c_fw_trigger(struct i2c_client *client) ++static int raydium_i2c_fw_trigger(struct i2c_client *client) + { + static const u8 cmd[5][11] = { + { 0, 0x09, 0x71, 0x0C, 0x09, 0x00, 0x50, 0xD7, 0, 0, 0 }, +@@ -492,7 +492,7 @@ static bool raydium_i2c_fw_trigger(struc + } + } + +- return false; ++ return 0; + } + + static int raydium_i2c_check_path(struct i2c_client *client) diff --git a/queue-4.19/input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch b/queue-4.19/input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch new file mode 100644 index 00000000000..2efedd8654a --- /dev/null +++ b/queue-4.19/input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch @@ -0,0 +1,34 @@ +From 1369d0abe469fb4cdea8a5bce219d38cb857a658 Mon Sep 17 00:00:00 2001 +From: Yussuf Khalil +Date: Sat, 7 Mar 2020 14:16:31 -0800 +Subject: Input: synaptics - enable RMI on HP Envy 13-ad105ng + +From: Yussuf Khalil + +commit 1369d0abe469fb4cdea8a5bce219d38cb857a658 upstream. + +This laptop (and perhaps other variants of the same model) reports an +SMBus-capable Synaptics touchpad. Everything (including suspend and +resume) works fine when RMI is enabled via the kernel command line, so +let's add it to the whitelist. + +Signed-off-by: Yussuf Khalil +Link: https://lore.kernel.org/r/20200307213508.267187-1-dev@pp3345.net +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/mouse/synaptics.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -189,6 +189,7 @@ static const char * const smbus_pnp_ids[ + "SYN3052", /* HP EliteBook 840 G4 */ + "SYN3221", /* HP 15-ay000 */ + "SYN323d", /* HP Spectre X360 13-w013dx */ ++ "SYN3257", /* HP Envy 13-ad105ng */ + NULL + }; + diff --git a/queue-4.19/series b/queue-4.19/series index 2f60942fd11..1a972ec13e9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -44,3 +44,7 @@ mac80211-do-not-send-mesh-hwmp-preq-if-hwmp-is-disab.patch dpaa_eth-remove-unnecessary-boolean-expression-in-dp.patch sxgbe-fix-off-by-one-in-samsung-driver-strncpy-size-.patch ftrace-x86-anotate-text_mutex-split-between-ftrace_arch_code_modify_post_process-and-ftrace_arch_code_modify_prepare.patch +i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch +input-raydium_i2c_ts-fix-error-codes-in-raydium_i2c_boot_trigger.patch +input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch +input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch