From: Greg Kroah-Hartman Date: Tue, 1 Oct 2024 09:57:02 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v6.6.54~91 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd006b4d7de09121bea7d5db225d4fde7b1c52df;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch input-i8042-add-another-board-name-for-tuxedo-stellaris-gen5-amd-line.patch input-i8042-add-tuxedo-stellaris-15-slim-gen6-amd-to-i8042-quirk-table.patch input-i8042-add-tuxedo-stellaris-16-gen5-amd-to-i8042-quirk-table.patch soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch --- diff --git a/queue-5.10/asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch b/queue-5.10/asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch new file mode 100644 index 00000000000..ffec7947460 --- /dev/null +++ b/queue-5.10/asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch @@ -0,0 +1,37 @@ +From fcca6d05ef49d5650514ea1dcfd12e4ae3ff2be6 Mon Sep 17 00:00:00 2001 +From: Ma Ke +Date: Fri, 30 Aug 2024 22:31:54 +0800 +Subject: ASoC: rt5682: Return devm_of_clk_add_hw_provider to transfer the error + +From: Ma Ke + +commit fcca6d05ef49d5650514ea1dcfd12e4ae3ff2be6 upstream. + +Return devm_of_clk_add_hw_provider() in order to transfer the error, if it +fails due to resource allocation failure or device tree clock provider +registration failure. + +Cc: stable@vger.kernel.org +Fixes: ebbfabc16d23 ("ASoC: rt5682: Add CCF usage for providing I2S clks") +Signed-off-by: Ma Ke +Link: https://patch.msgid.link/20240830143154.3448004-1-make24@iscas.ac.cn +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/codecs/rt5682.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/sound/soc/codecs/rt5682.c ++++ b/sound/soc/codecs/rt5682.c +@@ -2843,8 +2843,10 @@ static int rt5682_register_dai_clks(stru + } + + if (dev->of_node) { +- devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, ++ ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, + dai_clk_hw); ++ if (ret) ++ return ret; + } else { + ret = devm_clk_hw_register_clkdev(dev, dai_clk_hw, + init.name, diff --git a/queue-5.10/input-i8042-add-another-board-name-for-tuxedo-stellaris-gen5-amd-line.patch b/queue-5.10/input-i8042-add-another-board-name-for-tuxedo-stellaris-gen5-amd-line.patch new file mode 100644 index 00000000000..b8efe293e65 --- /dev/null +++ b/queue-5.10/input-i8042-add-another-board-name-for-tuxedo-stellaris-gen5-amd-line.patch @@ -0,0 +1,39 @@ +From 01eed86d50af9fab27d876fd677b86259ebe9de3 Mon Sep 17 00:00:00 2001 +From: Werner Sembach +Date: Tue, 10 Sep 2024 11:40:07 +0200 +Subject: Input: i8042 - add another board name for TUXEDO Stellaris Gen5 AMD line + +From: Werner Sembach + +commit 01eed86d50af9fab27d876fd677b86259ebe9de3 upstream. + +There might be devices out in the wild where the board name is GMxXGxx +instead of GMxXGxX. + +Adding both to be on the safe side. + +Signed-off-by: Werner Sembach +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20240910094008.1601230-2-wse@tuxedocomputers.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/input/serio/i8042-acpipnpio.h ++++ b/drivers/input/serio/i8042-acpipnpio.h +@@ -1136,6 +1136,13 @@ static const struct dmi_system_id i8042_ + }, + { + .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "GMxXGxx"), ++ }, ++ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | ++ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) ++ }, ++ { ++ .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GMxXGxX"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | diff --git a/queue-5.10/input-i8042-add-tuxedo-stellaris-15-slim-gen6-amd-to-i8042-quirk-table.patch b/queue-5.10/input-i8042-add-tuxedo-stellaris-15-slim-gen6-amd-to-i8042-quirk-table.patch new file mode 100644 index 00000000000..ed1a32dd524 --- /dev/null +++ b/queue-5.10/input-i8042-add-tuxedo-stellaris-15-slim-gen6-amd-to-i8042-quirk-table.patch @@ -0,0 +1,46 @@ +From 3870e2850b56306d1d1e435c5a1ccbccd7c59291 Mon Sep 17 00:00:00 2001 +From: Werner Sembach +Date: Tue, 10 Sep 2024 11:40:08 +0200 +Subject: Input: i8042 - add TUXEDO Stellaris 15 Slim Gen6 AMD to i8042 quirk table + +From: Werner Sembach + +commit 3870e2850b56306d1d1e435c5a1ccbccd7c59291 upstream. + +The Gen6 devices have the same problem and the same Solution as the Gen5 +ones. + +Some TongFang barebones have touchpad and/or keyboard issues after +suspend, fixable with nomux + reset + noloop + nopnp. Luckily, none of +them have an external PS/2 port so this can safely be set for all of +them. + +I'm not entirely sure if every device listed really needs all four quirks, +but after testing and production use, no negative effects could be +observed when setting all four. + +Signed-off-by: Werner Sembach +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20240910094008.1601230-3-wse@tuxedocomputers.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/input/serio/i8042-acpipnpio.h ++++ b/drivers/input/serio/i8042-acpipnpio.h +@@ -1141,6 +1141,13 @@ static const struct dmi_system_id i8042_ + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) + }, ++ { ++ .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "GMxHGxx"), ++ }, ++ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | ++ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) ++ }, + /* + * A lot of modern Clevo barebones have touchpad and/or keyboard issues + * after suspend fixable with nomux + reset + noloop + nopnp. Luckily, diff --git a/queue-5.10/input-i8042-add-tuxedo-stellaris-16-gen5-amd-to-i8042-quirk-table.patch b/queue-5.10/input-i8042-add-tuxedo-stellaris-16-gen5-amd-to-i8042-quirk-table.patch new file mode 100644 index 00000000000..a090808649a --- /dev/null +++ b/queue-5.10/input-i8042-add-tuxedo-stellaris-16-gen5-amd-to-i8042-quirk-table.patch @@ -0,0 +1,59 @@ +From e06edf96dea065dd1d9df695bf8b92784992333e Mon Sep 17 00:00:00 2001 +From: Werner Sembach +Date: Thu, 5 Sep 2024 18:48:51 +0200 +Subject: Input: i8042 - add TUXEDO Stellaris 16 Gen5 AMD to i8042 quirk table + +From: Werner Sembach + +commit e06edf96dea065dd1d9df695bf8b92784992333e upstream. + +Some TongFang barebones have touchpad and/or keyboard issues after +suspend, fixable with nomux + reset + noloop + nopnp. Luckily, none of +them have an external PS/2 port so this can safely be set for all of +them. + +I'm not entirely sure if every device listed really needs all four quirks, +but after testing and production use, no negative effects could be +observed when setting all four. + +Signed-off-by: Werner Sembach +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20240905164851.771578-1-wse@tuxedocomputers.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/serio/i8042-acpipnpio.h | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +--- a/drivers/input/serio/i8042-acpipnpio.h ++++ b/drivers/input/serio/i8042-acpipnpio.h +@@ -1119,6 +1119,29 @@ static const struct dmi_system_id i8042_ + .driver_data = (void *)(SERIO_QUIRK_NOLOOP) + }, + /* ++ * Some TongFang barebones have touchpad and/or keyboard issues after ++ * suspend fixable with nomux + reset + noloop + nopnp. Luckily, none of ++ * them have an external PS/2 port so this can safely be set for all of ++ * them. ++ * TongFang barebones come with board_vendor and/or system_vendor set to ++ * a different value for each individual reseller. The only somewhat ++ * universal way to identify them is by board_name. ++ */ ++ { ++ .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "GM6XGxX"), ++ }, ++ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | ++ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) ++ }, ++ { ++ .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "GMxXGxX"), ++ }, ++ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | ++ SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) ++ }, ++ /* + * A lot of modern Clevo barebones have touchpad and/or keyboard issues + * after suspend fixable with nomux + reset + noloop + nopnp. Luckily, + * none of them have an external PS/2 port so this can safely be set for diff --git a/queue-5.10/series b/queue-5.10/series index 2c2aa2b8e10..f10174e3e03 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -228,3 +228,8 @@ bpf-fix-devmap_hash-overflow-check-on-32-bit-arches.patch selinux-smack-don-t-bypass-permissions-check-in-inode_setsecctx-hook.patch mptcp-fix-sometimes-uninitialized-warning.patch remove-.orig-pattern-from-.gitignore.patch +asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch +soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch +input-i8042-add-tuxedo-stellaris-16-gen5-amd-to-i8042-quirk-table.patch +input-i8042-add-tuxedo-stellaris-15-slim-gen6-amd-to-i8042-quirk-table.patch +input-i8042-add-another-board-name-for-tuxedo-stellaris-gen5-amd-line.patch diff --git a/queue-5.10/soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch b/queue-5.10/soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch new file mode 100644 index 00000000000..2264ebe4234 --- /dev/null +++ b/queue-5.10/soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch @@ -0,0 +1,32 @@ +From 874c5b601856adbfda10846b9770a6c66c41e229 Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Sun, 25 Aug 2024 20:05:22 +0200 +Subject: soc: versatile: integrator: fix OF node leak in probe() error path + +From: Krzysztof Kozlowski + +commit 874c5b601856adbfda10846b9770a6c66c41e229 upstream. + +Driver is leaking OF node reference obtained from +of_find_matching_node(). + +Fixes: f956a785a282 ("soc: move SoC driver for the ARM Integrator") +Cc: stable@vger.kernel.org +Signed-off-by: Krzysztof Kozlowski +Link: https://lore.kernel.org/20240825-soc-dev-fixes-v1-1-ff4b35abed83@linaro.org +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman +--- + drivers/soc/versatile/soc-integrator.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/soc/versatile/soc-integrator.c ++++ b/drivers/soc/versatile/soc-integrator.c +@@ -113,6 +113,7 @@ static int __init integrator_soc_init(vo + return -ENODEV; + + syscon_regmap = syscon_node_to_regmap(np); ++ of_node_put(np); + if (IS_ERR(syscon_regmap)) + return PTR_ERR(syscon_regmap); +