4.14-stable patches

added patches:
	lib82596-fix-irq-check-in-sni_82596_probe.patch
	scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch

diff --git a/queue-4.14/lib82596-fix-irq-check-in-sni_82596_probe.patch b/queue-4.14/lib82596-fix-irq-check-in-sni_82596_probe.patch
new file mode 100644 (file)
index 0000000..07e75a9
--- /dev/null
+++ b/queue-4.14/lib82596-fix-irq-check-in-sni_82596_probe.patch
@@ -0,0 +1,40 @@
+From 99218cbf81bf21355a3de61cd46a706d36e900e6 Mon Sep 17 00:00:00 2001
+From: Miaoqian Lin <linmq006@gmail.com>
+Date: Fri, 14 Jan 2022 06:57:24 +0000
+Subject: lib82596: Fix IRQ check in sni_82596_probe
+
+From: Miaoqian Lin <linmq006@gmail.com>
+
+commit 99218cbf81bf21355a3de61cd46a706d36e900e6 upstream.
+
+platform_get_irq() returns negative error number instead 0 on failure.
+And the doc of platform_get_irq() provides a usage example:
+
+    int irq = platform_get_irq(pdev, 0);
+    if (irq < 0)
+        return irq;
+
+Fix the check of return value to catch errors correctly.
+
+Fixes: 115978859272 ("i825xx: Move the Intel 82586/82593/82596 based drivers")
+Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/i825xx/sni_82596.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/i825xx/sni_82596.c
++++ b/drivers/net/ethernet/i825xx/sni_82596.c
+@@ -122,9 +122,10 @@ static int sni_82596_probe(struct platfo
+       netdevice->dev_addr[5] = readb(eth_addr + 0x06);
+       iounmap(eth_addr);
+ 
+-      if (!netdevice->irq) {
++      if (netdevice->irq < 0) {
+               printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n",
+                       __FILE__, netdevice->base_addr);
++              retval = netdevice->irq;
+               goto probe_failed;
+       }
+ 

diff --git a/queue-4.14/scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch b/queue-4.14/scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch
new file mode 100644 (file)
index 0000000..7265661
--- /dev/null
+++ b/queue-4.14/scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch
@@ -0,0 +1,46 @@
+From d8adf5b92a9d2205620874d498c39923ecea8749 Mon Sep 17 00:00:00 2001
+From: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
+Date: Thu, 13 Jan 2022 09:19:18 +0100
+Subject: scripts/dtc: dtx_diff: remove broken example from help text
+
+From: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
+
+commit d8adf5b92a9d2205620874d498c39923ecea8749 upstream.
+
+dtx_diff suggests to use <(...) syntax to pipe two inputs into it, but
+this has never worked: The /proc/self/fds/... paths passed by the shell
+will fail the `[ -f "${dtx}" ] && [ -r "${dtx}" ]` check in compile_to_dts,
+but even with this check removed, the function cannot work: hexdump will
+eat up the DTB magic, making the subsequent dtc call fail, as a pipe
+cannot be rewound.
+
+Simply remove this broken example, as there is already an alternative one
+that works fine.
+
+Fixes: 10eadc253ddf ("dtc: create tool to diff device trees")
+Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
+Reviewed-by: Frank Rowand <frank.rowand@sony.com>
+Signed-off-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20220113081918.10387-1-matthias.schiffer@ew.tq-group.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ scripts/dtc/dtx_diff |    8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- a/scripts/dtc/dtx_diff
++++ b/scripts/dtc/dtx_diff
+@@ -56,12 +56,8 @@ Otherwise DTx is treated as a dts source
+    or '/include/' to be processed.
+ 
+    If DTx_1 and DTx_2 are in different architectures, then this script
+-   may not work since \${ARCH} is part of the include path.  Two possible
+-   workarounds:
+-
+-      `basename $0` \\
+-          <(ARCH=arch_of_dtx_1 `basename $0` DTx_1) \\
+-          <(ARCH=arch_of_dtx_2 `basename $0` DTx_2)
++   may not work since \${ARCH} is part of the include path.  The following
++   workaround can be used:
+ 
+       `basename $0` ARCH=arch_of_dtx_1 DTx_1 >tmp_dtx_1.dts
+       `basename $0` ARCH=arch_of_dtx_2 DTx_2 >tmp_dtx_2.dts

diff --git a/queue-4.14/series b/queue-4.14/series
index 052973f59d2bfe89f001e2a18b72a932b486cc27..e6c58957d3e9d2d9e4f6f2acf57b82efada95b00 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -178,3 +178,5 @@ dmaengine-at_xdmac-fix-lld-view-setting.patch
 dmaengine-at_xdmac-fix-at_xdmac_lld-struct-definition.patch
 net_sched-restore-mpu-xxx-handling.patch
 bcmgenet-add-wol-irq-check.patch
+scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch
+lib82596-fix-irq-check-in-sni_82596_probe.patch