From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 22 Sep 2019 08:12:52 +0000 (+0200)
Subject: 5.3-stable patches
X-Git-Tag: v5.3.2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e30e81ab11cab59fabc9e05193ef0b70f2c13a09;p=thirdparty%2Fkernel%2Fstable-queue.git

5.3-stable patches

added patches:
	clocksource-drivers-do-not-warn-on-probe-defer.patch
	clocksource-drivers-timer-of-do-not-warn-on-deferred-probe.patch
---

diff --git a/queue-5.3/clocksource-drivers-do-not-warn-on-probe-defer.patch b/queue-5.3/clocksource-drivers-do-not-warn-on-probe-defer.patch
new file mode 100644
index 00000000000..7945f9fd35e
--- /dev/null
+++ b/queue-5.3/clocksource-drivers-do-not-warn-on-probe-defer.patch
@@ -0,0 +1,33 @@
+From 14e019df1e64c8b19ce8e0b3da25b6f40c8716be Mon Sep 17 00:00:00 2001
+From: Jon Hunter <jonathanh@nvidia.com>
+Date: Wed, 21 Aug 2019 16:02:41 +0100
+Subject: clocksource/drivers: Do not warn on probe defer
+
+From: Jon Hunter <jonathanh@nvidia.com>
+
+commit 14e019df1e64c8b19ce8e0b3da25b6f40c8716be upstream.
+
+Deferred probe is an expected return value on many platforms and so
+there's no need to output a warning that may potentially confuse users.
+
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/clocksource/timer-probe.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/clocksource/timer-probe.c
++++ b/drivers/clocksource/timer-probe.c
+@@ -29,7 +29,9 @@ void __init timer_probe(void)
+ 
+ 		ret = init_func_ret(np);
+ 		if (ret) {
+-			pr_err("Failed to initialize '%pOF': %d\n", np, ret);
++			if (ret != -EPROBE_DEFER)
++				pr_err("Failed to initialize '%pOF': %d\n", np,
++				       ret);
+ 			continue;
+ 		}
+ 
diff --git a/queue-5.3/clocksource-drivers-timer-of-do-not-warn-on-deferred-probe.patch b/queue-5.3/clocksource-drivers-timer-of-do-not-warn-on-deferred-probe.patch
new file mode 100644
index 00000000000..1b01e145a0a
--- /dev/null
+++ b/queue-5.3/clocksource-drivers-timer-of-do-not-warn-on-deferred-probe.patch
@@ -0,0 +1,36 @@
+From 763719771e84b8c8c2f53af668cdc905faa608de Mon Sep 17 00:00:00 2001
+From: Jon Hunter <jonathanh@nvidia.com>
+Date: Wed, 21 Aug 2019 16:02:40 +0100
+Subject: clocksource/drivers/timer-of: Do not warn on deferred probe
+
+From: Jon Hunter <jonathanh@nvidia.com>
+
+commit 763719771e84b8c8c2f53af668cdc905faa608de upstream.
+
+Deferred probe is an expected return value for clk_get() on many
+platforms. The driver deals with it properly, so there's no need
+to output a warning that may potentially confuse users.
+
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/clocksource/timer-of.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/clocksource/timer-of.c
++++ b/drivers/clocksource/timer-of.c
+@@ -113,8 +113,10 @@ static __init int timer_of_clk_init(stru
+ 	of_clk->clk = of_clk->name ? of_clk_get_by_name(np, of_clk->name) :
+ 		of_clk_get(np, of_clk->index);
+ 	if (IS_ERR(of_clk->clk)) {
+-		pr_err("Failed to get clock for %pOF\n", np);
+-		return PTR_ERR(of_clk->clk);
++		ret = PTR_ERR(of_clk->clk);
++		if (ret != -EPROBE_DEFER)
++			pr_err("Failed to get clock for %pOF\n", np);
++		goto out;
+ 	}
+ 
+ 	ret = clk_prepare_enable(of_clk->clk);
diff --git a/queue-5.3/series b/queue-5.3/series
index 12cc92ac29b..4e23bc00c78 100644
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -1 +1,3 @@
 netfilter-add-missing-is_enabled-config_nf_tables-check-to-header-file.patch
+clocksource-drivers-timer-of-do-not-warn-on-deferred-probe.patch
+clocksource-drivers-do-not-warn-on-probe-defer.patch