4.19-stable patches

added patches:
	libceph-don-t-omit-recovery_deletes-in-target_copy.patch
	rxrpc-fix-trace-string.patch
	spi-sprd-switch-the-sequence-of-setting-wdg_load_low-and-_high.patch

diff --git a/queue-4.19/libceph-don-t-omit-recovery_deletes-in-target_copy.patch b/queue-4.19/libceph-don-t-omit-recovery_deletes-in-target_copy.patch
new file mode 100644 (file)
index 0000000..33bcc50
--- /dev/null
+++ b/queue-4.19/libceph-don-t-omit-recovery_deletes-in-target_copy.patch
@@ -0,0 +1,32 @@
+From 2f3fead62144002557f322c2a7c15e1255df0653 Mon Sep 17 00:00:00 2001
+From: Ilya Dryomov <idryomov@gmail.com>
+Date: Tue, 9 Jun 2020 11:57:56 +0200
+Subject: libceph: don't omit recovery_deletes in target_copy()
+
+From: Ilya Dryomov <idryomov@gmail.com>
+
+commit 2f3fead62144002557f322c2a7c15e1255df0653 upstream.
+
+Currently target_copy() is used only for sending linger pings, so
+this doesn't come up, but generally omitting recovery_deletes can
+result in unneeded resends (force_resend in calc_target()).
+
+Fixes: ae78dd8139ce ("libceph: make RECOVERY_DELETES feature create a new interval")
+Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+Reviewed-by: Jeff Layton <jlayton@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/ceph/osd_client.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/net/ceph/osd_client.c
++++ b/net/ceph/osd_client.c
+@@ -442,6 +442,7 @@ static void target_copy(struct ceph_osd_
+       dest->size = src->size;
+       dest->min_size = src->min_size;
+       dest->sort_bitwise = src->sort_bitwise;
++      dest->recovery_deletes = src->recovery_deletes;
+ 
+       dest->flags = src->flags;
+       dest->paused = src->paused;

diff --git a/queue-4.19/rxrpc-fix-trace-string.patch b/queue-4.19/rxrpc-fix-trace-string.patch
new file mode 100644 (file)
index 0000000..80d5e5f
--- /dev/null
+++ b/queue-4.19/rxrpc-fix-trace-string.patch
@@ -0,0 +1,34 @@
+From aadf9dcef9d4cd68c73a4ab934f93319c4becc47 Mon Sep 17 00:00:00 2001
+From: David Howells <dhowells@redhat.com>
+Date: Wed, 17 Jun 2020 22:50:33 +0100
+Subject: rxrpc: Fix trace string
+
+From: David Howells <dhowells@redhat.com>
+
+commit aadf9dcef9d4cd68c73a4ab934f93319c4becc47 upstream.
+
+The trace symbol printer (__print_symbolic()) ignores symbols that map to
+an empty string and prints the hex value instead.
+
+Fix the symbol for rxrpc_cong_no_change to " -" instead of "" to avoid
+this.
+
+Fixes: b54a134a7de4 ("rxrpc: Fix handling of enums-to-string translation in tracing")
+Signed-off-by: David Howells <dhowells@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/trace/events/rxrpc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/trace/events/rxrpc.h
++++ b/include/trace/events/rxrpc.h
+@@ -408,7 +408,7 @@ enum rxrpc_tx_point {
+       EM(rxrpc_cong_begin_retransmission,     " Retrans") \
+       EM(rxrpc_cong_cleared_nacks,            " Cleared") \
+       EM(rxrpc_cong_new_low_nack,             " NewLowN") \
+-      EM(rxrpc_cong_no_change,                "") \
++      EM(rxrpc_cong_no_change,                " -") \
+       EM(rxrpc_cong_progress,                 " Progres") \
+       EM(rxrpc_cong_retransmit_again,         " ReTxAgn") \
+       EM(rxrpc_cong_rtt_window_end,           " RttWinE") \

diff --git a/queue-4.19/series b/queue-4.19/series
index 358cc067b0a8169911c5c9f955d0ca00689ff5ff..306ff6db490456cbfdd4abe51cfab4db45a027fb 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -130,3 +130,6 @@ sched-fix-unreliable-rseq-cpu_id-for-new-tasks.patch
 sched-fair-handle-case-of-task_h_load-returning-0.patch
 genirq-affinity-handle-affinity-setting-on-inactive-interrupts-correctly.patch
 printk-queue-wake_up_klogd-irq_work-only-if-per-cpu-areas-are-ready.patch
+libceph-don-t-omit-recovery_deletes-in-target_copy.patch
+rxrpc-fix-trace-string.patch
+spi-sprd-switch-the-sequence-of-setting-wdg_load_low-and-_high.patch

diff --git a/queue-4.19/spi-sprd-switch-the-sequence-of-setting-wdg_load_low-and-_high.patch b/queue-4.19/spi-sprd-switch-the-sequence-of-setting-wdg_load_low-and-_high.patch
new file mode 100644 (file)
index 0000000..35075a6
--- /dev/null
+++ b/queue-4.19/spi-sprd-switch-the-sequence-of-setting-wdg_load_low-and-_high.patch
@@ -0,0 +1,36 @@
+From 8bdd79dae1ff5397351b95e249abcae126572617 Mon Sep 17 00:00:00 2001
+From: Lingling Xu <ling_ling.xu@unisoc.com>
+Date: Tue, 2 Jun 2020 16:24:15 +0800
+Subject: spi: sprd: switch the sequence of setting WDG_LOAD_LOW and _HIGH
+
+From: Lingling Xu <ling_ling.xu@unisoc.com>
+
+commit 8bdd79dae1ff5397351b95e249abcae126572617 upstream.
+
+The watchdog counter consists of WDG_LOAD_LOW and WDG_LOAD_HIGH,
+which would be loaded to watchdog counter once writing WDG_LOAD_LOW.
+
+Fixes: ac1775012058 ("spi: sprd: Add the support of restarting the system")
+Signed-off-by: Lingling Xu <ling_ling.xu@unisoc.com>
+Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
+Link: https://lore.kernel.org/r/20200602082415.5848-1-zhang.lyra@gmail.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/spi/spi-sprd-adi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/spi/spi-sprd-adi.c
++++ b/drivers/spi/spi-sprd-adi.c
+@@ -358,9 +358,9 @@ static int sprd_adi_restart_handler(stru
+       sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOCK, WDG_UNLOCK_KEY);
+ 
+       /* Load the watchdog timeout value, 50ms is always enough. */
++      sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_HIGH, 0);
+       sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_LOW,
+                      WDG_LOAD_VAL & WDG_LOAD_MASK);
+-      sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_HIGH, 0);
+ 
+       /* Start the watchdog to reset system */
+       sprd_adi_read(sadi, sadi->slave_pbase + REG_WDG_CTRL, &val);