Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-20 11:11:54 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-20 11:11:54 +0200
commita8035b3f4095034db6794102cbbc1fed056f1a23 (patch)
tree842d00c83dc96bbf389e382615d77c9dfbd807ef
parent2323b0c0ee52796567ba610251f5d6ecef89b587 (diff)
parent5151480f6266240478f9e53954e76ce1941d9e19 (diff)
Merge branch 'users/fbaumanis/SLE12-SP3/for-next' into SLE12-SP3
Pull assorted driver fixes from Fabian Baumanis (bsc#1090888)
-rw-r--r--patches.fixes/0001-clk-fix-mux-clock-documentation.patch41
-rw-r--r--patches.fixes/0001-cpupower-remove-stringop-truncation-waring.patch48
-rw-r--r--patches.fixes/0001-dt-bindings-rcar-dmac-Document-missing-error-interru.patch44
-rw-r--r--patches.fixes/0001-kconfig-display-recursive-dependency-resolution-hint.patch68
-rw-r--r--series.conf4
5 files changed, 205 insertions, 0 deletions
diff --git a/patches.fixes/0001-clk-fix-mux-clock-documentation.patch b/patches.fixes/0001-clk-fix-mux-clock-documentation.patch
new file mode 100644
index 0000000000..a1cc3df15c
--- /dev/null
+++ b/patches.fixes/0001-clk-fix-mux-clock-documentation.patch
@@ -0,0 +1,41 @@
+From fe3f338f0cb2ed4d4f06da054c21ae2f8a36ef2d Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Wed, 14 Feb 2018 14:43:38 +0100
+Subject: [PATCH] clk: fix mux clock documentation
+Git-commit: fe3f338f0cb2ed4d4f06da054c21ae2f8a36ef2d
+Patch-mainline: v4.17
+References: bsc#1090888
+
+The mux documentation mentions the non-existing parameter width instead
+of mask, so just sed this.
+
+The table field is missing in the documentation of clk_mux.
+Add a small blurb explaining what it is
+
+Fixes: 9d9f78ed9af0 ("clk: basic clock hardware types")
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Michael Turquette <mturquette@baylibre.com>
+Signed-off-by: Stephen Boyd <sboyd@kernel.org>
+Reviewed-by: Fabian Baumanis <fabian.baumanis@suse.com>
+---
+ include/linux/clk-provider.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
+index fe720d679c31..cb18526d69cb 100644
+--- a/include/linux/clk-provider.h
++++ b/include/linux/clk-provider.h
+@@ -450,8 +450,9 @@ void clk_hw_unregister_divider(struct clk_hw *hw);
+ *
+ * @hw: handle between common and hardware-specific interfaces
+ * @reg: register controlling multiplexer
++ * @table: array of register values corresponding to the parent index
+ * @shift: shift to multiplexer bit field
+- * @width: width of mutliplexer bit field
++ * @mask: mask of mutliplexer bit field
+ * @flags: hardware-specific flags
+ * @lock: register lock
+ *
+--
+2.16.4
+
diff --git a/patches.fixes/0001-cpupower-remove-stringop-truncation-waring.patch b/patches.fixes/0001-cpupower-remove-stringop-truncation-waring.patch
new file mode 100644
index 0000000000..5014e4673a
--- /dev/null
+++ b/patches.fixes/0001-cpupower-remove-stringop-truncation-waring.patch
@@ -0,0 +1,48 @@
+From 8a7e2d2ea080d10a189a1d611344b0330468ebc3 Mon Sep 17 00:00:00 2001
+From: Anders Roxell <anders.roxell@linaro.org>
+Date: Tue, 28 Aug 2018 11:31:18 +0200
+Subject: [PATCH] cpupower: remove stringop-truncation waring
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Git-commit: 8a7e2d2ea080d10a189a1d611344b0330468ebc3
+Patch-mainline: v4.20
+References: bsc#1119086
+
+The strncpy doesn't null terminate the string because the size is too
+short by one byte.
+
+parse.c: In function ‘prepare_default_config’:
+parse.c:148:2: warning: ‘strncpy’ output truncated before terminating
+ nul copying 8 bytes from a string of the same length
+ [-Wstringop-truncation]
+ strncpy(config->governor, "ondemand", 8);
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The normal method of passing the length of the destination buffer works
+correctly here.
+
+Fixes: 7fe2f6399a84 ("cpupowerutils - cpufrequtils extended with quite some features")
+Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
+Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
+Reviewed-by: Fabian Baumanis <fabian.baumanis@suse.com>
+---
+ tools/power/cpupower/bench/parse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/power/cpupower/bench/parse.c b/tools/power/cpupower/bench/parse.c
+index 9ba8a44ad2a7..84caee38418f 100644
+--- a/tools/power/cpupower/bench/parse.c
++++ b/tools/power/cpupower/bench/parse.c
+@@ -145,7 +145,7 @@ struct config *prepare_default_config()
+ config->cpu = 0;
+ config->prio = SCHED_HIGH;
+ config->verbose = 0;
+- strncpy(config->governor, "ondemand", 8);
++ strncpy(config->governor, "ondemand", sizeof(config->governor));
+
+ config->output = stdout;
+
+--
+2.16.4
+
diff --git a/patches.fixes/0001-dt-bindings-rcar-dmac-Document-missing-error-interru.patch b/patches.fixes/0001-dt-bindings-rcar-dmac-Document-missing-error-interru.patch
new file mode 100644
index 0000000000..c9bff70b76
--- /dev/null
+++ b/patches.fixes/0001-dt-bindings-rcar-dmac-Document-missing-error-interru.patch
@@ -0,0 +1,44 @@
+From 5466c34f8425ccd24124ebdae6e3b6552195956d Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+Date: Fri, 19 May 2017 09:27:47 +0200
+Subject: [PATCH] dt-bindings: rcar-dmac: Document missing error interrupt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Git-commit: 5466c34f8425ccd24124ebdae6e3b6552195956d
+Patch-mainline: v4.13
+References: bsc#1085535
+
+The documentation for the "interrupt-names" property only mentions the
+per-channel interrupts, while the error interrupt has always been
+mandatory, too.
+
+Fixes: 10f5c8438475909a ("dmaengine: rcar-dmac: Add device tree bindings
+documentation")
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
+Signed-off-by: Vinod Koul <vinod.koul@intel.com>
+Reviewed-by: Fabian Baumanis <fabian.baumanis@suse.com>
+---
+ Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
+index 3316a9c2e638..79a204d50234 100644
+--- a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
++++ b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
+@@ -30,8 +30,9 @@ Required Properties:
+
+ - interrupts: interrupt specifiers for the DMAC, one for each entry in
+ interrupt-names.
+-- interrupt-names: one entry per channel, named "ch%u", where %u is the
+- channel number ranging from zero to the number of channels minus one.
++- interrupt-names: one entry for the error interrupt, named "error", plus one
++ entry per channel, named "ch%u", where %u is the channel number ranging from
++ zero to the number of channels minus one.
+
+ - clock-names: "fck" for the functional clock
+ - clocks: a list of phandle + clock-specifier pairs, one for each entry
+--
+2.16.4
+
diff --git a/patches.fixes/0001-kconfig-display-recursive-dependency-resolution-hint.patch b/patches.fixes/0001-kconfig-display-recursive-dependency-resolution-hint.patch
new file mode 100644
index 0000000000..432820cfe5
--- /dev/null
+++ b/patches.fixes/0001-kconfig-display-recursive-dependency-resolution-hint.patch
@@ -0,0 +1,68 @@
+From e3b03bf29d6b99fab7001fb20c33fe54928c157a Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Sat, 16 Dec 2017 00:28:42 +0900
+Subject: [PATCH] kconfig: display recursive dependency resolution hint just
+ once
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Git-commit: e3b03bf29d6b99fab7001fb20c33fe54928c157a
+Patch-mainline: v4.18
+References: bsc#1100132
+
+Commit 1c199f2878f6 ("kbuild: document recursive dependency limitation
+/ resolution") probably intended to show a hint along with "recursive
+dependency detected!" error, but it missed to add {...} guard, and the
+hint is displayed in every loop of the dep_stack traverse, annoyingly.
+
+This error was detected by GCC's -Wmisleading-indentation when switching
+to build-time generation of lexer/parser.
+
+scripts/kconfig/symbol.c: In function ‘sym_check_print_recursive’:
+scripts/kconfig/symbol.c:1150:3: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
+ if (stack->sym == last_sym)
+ ^~
+scripts/kconfig/symbol.c:1153:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
+ fprintf(stderr, "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n");
+ ^~~~~~~
+
+I could simply add {...} to surround the three fprintf(), but I rather
+chose to move the hint after the loop to make the whole message readable.
+
+Fixes: 1c199f2878f6 ("kbuild: document recursive dependency limitation / resolution"
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
+Reviewed-by: Fabian Baumanis <fabian.baumanis@suse.com>
+---
+ scripts/kconfig/symbol.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
+index 3c8bd9bb4267..35e0937aa6a6 100644
+--- a/scripts/kconfig/symbol.c
++++ b/scripts/kconfig/symbol.c
+@@ -1150,8 +1150,7 @@ static void sym_check_print_recursive(struct symbol *last_sym)
+ if (stack->sym == last_sym)
+ fprintf(stderr, "%s:%d:error: recursive dependency detected!\n",
+ prop->file->name, prop->lineno);
+- fprintf(stderr, "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n");
+- fprintf(stderr, "subsection \"Kconfig recursive dependency limitations\"\n");
++
+ if (stack->expr) {
+ fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
+ prop->file->name, prop->lineno,
+@@ -1181,6 +1180,11 @@ static void sym_check_print_recursive(struct symbol *last_sym)
+ }
+ }
+
++ fprintf(stderr,
++ "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n"
++ "subsection \"Kconfig recursive dependency limitations\"\n"
++ "\n");
++
+ if (check_top == &cv_stack)
+ dep_stack_remove();
+ }
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 2e70922a51..2bfd74ed52 100644
--- a/series.conf
+++ b/series.conf
@@ -22413,6 +22413,7 @@
patches.drivers/tpm-179-crb-fix-priv-cmd_size-initialisation.patch
patches.fixes/CIFS-fix-circular-locking-dependency.patch
patches.drivers/hns-0005-net-hns-Fix-a-skb-used-after-free-bug.patch
+ patches.fixes/0001-dt-bindings-rcar-dmac-Document-missing-error-interru.patch
patches.fixes/0001-md-use-a-separate-bio_set-for-synchronous-IO.patch
patches.fixes/md-fix-a-null-dereference.patch
patches.fixes/0001-MD-fix-sleep-in-atomic.patch
@@ -23927,6 +23928,7 @@
patches.fixes/0001-usb-Don-t-print-a-warning-if-interface-driver-rebind.patch
patches.drivers/serial-8250_uniphier-fix-error-return-code-in-uniphi
patches.suse/tty-fix-data-race-between-tty_init_dev-and-flush-of-.patch
+ patches.fixes/0001-kconfig-display-recursive-dependency-resolution-hint.patch
patches.suse/powerpc-modules-don-t-try-to-restore-r2-after-a-sibling-call.patch
patches.arch/powerpc-make-use-of-for_each_node_by_type-instead-of.patch
patches.arch/powerpc-crash-Remove-the-test-for-cpu_online-in-the-.patch
@@ -24356,6 +24358,7 @@
patches.fixes/0003-watchdog-hpwdt-Update-nmi_panic-message.patch
patches.fixes/0004-watchdog-hpwdt-Modify-to-use-watchdog-core.patch
patches.fixes/0005-watchdog-hpwdt-condition-early-return-of-NMI-handler.patch
+ patches.fixes/0001-clk-fix-mux-clock-documentation.patch
patches.suse/powerpc-64s-Fix-section-mismatch-warnings-from-setup.patch
patches.drivers/scsi-qla2xxx-Fix-small-memory-leak-in-qla2x00_probe_.patch
patches.drivers/scsi-qla2xxx-Avoid-double-completion-of-abort-comman.patch
@@ -24973,6 +24976,7 @@
patches.suse/0125-bcache-split-combined-if-condition-code-into-separat.patch
patches.suse/0126-bcache-panic-fix-for-making-cache-device.patch
patches.drivers/0001-ipmi-ssif-Add-support-for-multi-part-transmit-messag.patch
+ patches.fixes/0001-cpupower-remove-stringop-truncation-waring.patch
patches.suse/ACPI-processor-Fix-the-return-value-of-acpi_processor_ids_walk.patch
patches.arch/x86-cpu-sanitize-fam6_atom-naming.patch
patches.fixes/x86-kexec-correct-kexec_backup_src_end-off-by-one-error.patch