From: Greg Kroah-Hartman Date: Fri, 9 Oct 2020 14:11:32 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.4.239~53 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=132172f12318bf0f93af480586b8087e60c26f7c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: arm64-dts-stratix10-add-status-to-qspi-dts-node.patch i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch mtd-rawnand-sunxi-fix-the-probe-error-path.patch perf-top-fix-stdio-interface-input-handling-with-glibc-2.28.patch --- diff --git a/queue-4.19/arm64-dts-stratix10-add-status-to-qspi-dts-node.patch b/queue-4.19/arm64-dts-stratix10-add-status-to-qspi-dts-node.patch new file mode 100644 index 00000000000..29fd49374c5 --- /dev/null +++ b/queue-4.19/arm64-dts-stratix10-add-status-to-qspi-dts-node.patch @@ -0,0 +1,31 @@ +From 263a0269a59c0b4145829462a107fe7f7327105f Mon Sep 17 00:00:00 2001 +From: Dinh Nguyen +Date: Mon, 29 Jun 2020 11:25:43 -0500 +Subject: arm64: dts: stratix10: add status to qspi dts node + +From: Dinh Nguyen + +commit 263a0269a59c0b4145829462a107fe7f7327105f upstream. + +Add status = "okay" to QSPI node. + +Fixes: 0cb140d07fc75 ("arm64: dts: stratix10: Add QSPI support for Stratix10") +Cc: linux-stable # >= v5.6 +Signed-off-by: Dinh Nguyen +[iwamatsu: Drop arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts] +Signed-off-by: Nobuhiro Iwamatsu +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts ++++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +@@ -151,6 +151,7 @@ + }; + + &qspi { ++ status = "okay"; + flash@0 { + #address-cells = <1>; + #size-cells = <1>; diff --git a/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch b/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch new file mode 100644 index 00000000000..3d7ba754989 --- /dev/null +++ b/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch @@ -0,0 +1,40 @@ +From 845b89127bc5458d0152a4d63f165c62a22fcb70 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Thu, 10 Sep 2020 11:57:08 +0200 +Subject: i2c: i801: Exclude device from suspend direct complete optimization +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jean Delvare + +commit 845b89127bc5458d0152a4d63f165c62a22fcb70 upstream. + +By default, PCI drivers with runtime PM enabled will skip the calls +to suspend and resume on system PM. For this driver, we don't want +that, as we need to perform additional steps for system PM to work +properly on all systems. So instruct the PM core to not skip these +calls. + +Fixes: a9c8088c7988 ("i2c: i801: Don't restore config registers on runtime PM") +Reported-by: Volker Rümelin +Signed-off-by: Jean Delvare +Cc: stable@vger.kernel.org +Signed-off-by: Wolfram Sang +[iwamatsu: Use DPM_FLAG_NEVER_SKIP instead of DPM_FLAG_NO_DIRECT_COMPLETE] +Signed-off-by: Nobuhiro Iwamatsu (CIP) +Signed-off-by: Greg Kroah-Hartman +--- + drivers/i2c/busses/i2c-i801.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/i2c/busses/i2c-i801.c ++++ b/drivers/i2c/busses/i2c-i801.c +@@ -1698,6 +1698,7 @@ static int i801_probe(struct pci_dev *de + + pci_set_drvdata(dev, priv); + ++ dev_pm_set_driver_flags(&dev->dev, DPM_FLAG_NEVER_SKIP); + pm_runtime_set_autosuspend_delay(&dev->dev, 1000); + pm_runtime_use_autosuspend(&dev->dev); + pm_runtime_put_autosuspend(&dev->dev); diff --git a/queue-4.19/mtd-rawnand-sunxi-fix-the-probe-error-path.patch b/queue-4.19/mtd-rawnand-sunxi-fix-the-probe-error-path.patch new file mode 100644 index 00000000000..ba328f9916f --- /dev/null +++ b/queue-4.19/mtd-rawnand-sunxi-fix-the-probe-error-path.patch @@ -0,0 +1,33 @@ +From 3d84515ffd8fb657e10fa5b1215e9f095fa7efca Mon Sep 17 00:00:00 2001 +From: Miquel Raynal +Date: Tue, 19 May 2020 15:00:26 +0200 +Subject: mtd: rawnand: sunxi: Fix the probe error path + +From: Miquel Raynal + +commit 3d84515ffd8fb657e10fa5b1215e9f095fa7efca upstream. + +nand_release() is supposed be called after MTD device registration. +Here, only nand_scan() happened, so use nand_cleanup() instead. + +Fixes: 1fef62c1423b ("mtd: nand: add sunxi NAND flash controller support") +Signed-off-by: Miquel Raynal +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-54-miquel.raynal@bootlin.com +Signed-off-by: Nobuhiro Iwamatsu +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/nand/raw/sunxi_nand.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mtd/nand/raw/sunxi_nand.c ++++ b/drivers/mtd/nand/raw/sunxi_nand.c +@@ -1947,7 +1947,7 @@ static int sunxi_nand_chip_init(struct d + ret = mtd_device_register(mtd, NULL, 0); + if (ret) { + dev_err(dev, "failed to register mtd device: %d\n", ret); +- nand_release(nand); ++ nand_cleanup(nand); + return ret; + } + diff --git a/queue-4.19/perf-top-fix-stdio-interface-input-handling-with-glibc-2.28.patch b/queue-4.19/perf-top-fix-stdio-interface-input-handling-with-glibc-2.28.patch new file mode 100644 index 00000000000..68798a8cd1e --- /dev/null +++ b/queue-4.19/perf-top-fix-stdio-interface-input-handling-with-glibc-2.28.patch @@ -0,0 +1,53 @@ +From 29b4f5f188571c112713c35cc87eefb46efee612 Mon Sep 17 00:00:00 2001 +From: Tommi Rantala +Date: Thu, 5 Mar 2020 10:37:12 +0200 +Subject: perf top: Fix stdio interface input handling with glibc 2.28+ + +From: Tommi Rantala + +commit 29b4f5f188571c112713c35cc87eefb46efee612 upstream. + +Since glibc 2.28 when running 'perf top --stdio', input handling no +longer works, but hitting any key always just prints the "Mapped keys" +help text. + +To fix it, call clearerr() in the display_thread() loop to clear any EOF +sticky errors, as instructed in the glibc NEWS file +(https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS): + + * All stdio functions now treat end-of-file as a sticky condition. If you + read from a file until EOF, and then the file is enlarged by another + process, you must call clearerr or another function with the same effect + (e.g. fseek, rewind) before you can read the additional data. This + corrects a longstanding C99 conformance bug. It is most likely to affect + programs that use stdio to read interactive input from a terminal. + (Bug #1190.) + +Signed-off-by: Tommi Rantala +Tested-by: Arnaldo Carvalho de Melo +Cc: Alexander Shishkin +Cc: Jiri Olsa +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lore.kernel.org/lkml/20200305083714.9381-2-tommi.t.rantala@nokia.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/builtin-top.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/tools/perf/builtin-top.c ++++ b/tools/perf/builtin-top.c +@@ -651,7 +651,9 @@ repeat: + delay_msecs = top->delay_secs * MSEC_PER_SEC; + set_term_quiet_input(&save); + /* trash return*/ +- getc(stdin); ++ clearerr(stdin); ++ if (poll(&stdin_poll, 1, 0) > 0) ++ getc(stdin); + + while (!done) { + perf_top__print_sym_table(top); diff --git a/queue-4.19/series b/queue-4.19/series index ae605f42266..27f4a718995 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -10,3 +10,7 @@ platform-x86-thinkpad_acpi-initialize-tp_nvram_state-variable.patch platform-x86-intel-vbtn-switch-to-an-allow-list-for-sw_tablet_mode-reporting.patch platform-x86-thinkpad_acpi-re-initialize-acpi-buffer-size-when-reuse.patch driver-core-fix-probe_count-imbalance-in-really_probe.patch +perf-top-fix-stdio-interface-input-handling-with-glibc-2.28.patch +i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch +mtd-rawnand-sunxi-fix-the-probe-error-path.patch +arm64-dts-stratix10-add-status-to-qspi-dts-node.patch