Add fixes for some lockdep warnings showing up on kerneltests.org

4 files changed, 186 insertions, 0 deletions

diff --git a/queue-3.16/mmc-sdhci-s3c-check-if-clk_set_rate-succeeds.patch b/queue-3.16/mmc-sdhci-s3c-check-if-clk_set_rate-succeeds.patch
new file mode 100644
index 00000000..f4c44c35
--- /dev/null
+++ b/queue-3.16/mmc-sdhci-s3c-check-if-clk_set_rate-succeeds.patch
@@ -0,0 +1,41 @@
+From: Mark Brown <broonie@linaro.org>
+Date: Tue, 4 Nov 2014 12:26:42 +0000
+Subject: mmc: sdhci-s3c: Check if clk_set_rate() succeeds
+
+commit cd0cfdd2485e6252b3c69284bf09d06c4d303116 upstream.
+
+It is possible that we may fail to set the clock rate, if we do so then
+log the failure and don't bother reprogramming the IP.
+
+Signed-off-by: Mark Brown <broonie@linaro.org>
+Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/mmc/host/sdhci-s3c.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/drivers/mmc/host/sdhci-s3c.c
++++ b/drivers/mmc/host/sdhci-s3c.c
+@@ -300,6 +300,7 @@ static void sdhci_cmu_set_clock(struct s
+ 	struct device *dev = &ourhost->pdev->dev;
+ 	unsigned long timeout;
+ 	u16 clk = 0;
++	int ret;
+ 
+ 	host->mmc->actual_clock = 0;
+ 
+@@ -311,7 +312,12 @@ static void sdhci_cmu_set_clock(struct s
+ 
+ 	sdhci_s3c_set_clock(host, clock);
+ 
+-	clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock);
++	ret = clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock);
++	if (ret != 0) {
++		dev_err(dev, "%s: failed to set clock rate %uHz\n",
++			mmc_hostname(host->mmc), clock);
++		return;
++	}
+ 
+ 	clk = SDHCI_CLOCK_INT_EN;
+ 	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
diff --git a/queue-3.16/mmc-sdhci-s3c-solve-problem-with-sleeping-in-atomic-context.patch b/queue-3.16/mmc-sdhci-s3c-solve-problem-with-sleeping-in-atomic-context.patch
new file mode 100644
index 00000000..7e4c346f
--- /dev/null
+++ b/queue-3.16/mmc-sdhci-s3c-solve-problem-with-sleeping-in-atomic-context.patch
@@ -0,0 +1,93 @@
+From: Paul Osmialowski <p.osmialowsk@samsung.com>
+Date: Wed, 4 Feb 2015 10:16:59 +0100
+Subject: mmc: sdhci-s3c: solve problem with sleeping in atomic context
+
+commit 017210d1c0dc2e2d3b142985cb31d90b98dc0f0f upstream.
+
+This change addresses following problem:
+
+[    2.560726] ------------[ cut here ]------------
+[    2.565341] WARNING: CPU: 0 PID: 1 at kernel/locking/lockdep.c:2744 lockdep_trace_alloc+0xec/0x118()
+[    2.574439] DEBUG_LOCKS_WARN_ON(irqs_disabled_flags(flags))
+[    2.579821] Modules linked in:
+[    2.583038] CPU: 0 PID: 1 Comm: swapper/0 Tainted: G        W      3.18.0-next-20141216-00002-g4ff197fc1902-dirty #1318
+[    2.593796] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree)
+[    2.599892] [<c0014c44>] (unwind_backtrace) from [<c0011bbc>] (show_stack+0x10/0x14)
+[    2.607612] [<c0011bbc>] (show_stack) from [<c04953b8>] (dump_stack+0x70/0xbc)
+[    2.614822] [<c04953b8>] (dump_stack) from [<c0023444>] (warn_slowpath_common+0x74/0xb0)
+[    2.622885] [<c0023444>] (warn_slowpath_common) from [<c0023514>] (warn_slowpath_fmt+0x30/0x40)
+[    2.631569] [<c0023514>] (warn_slowpath_fmt) from [<c0063644>] (lockdep_trace_alloc+0xec/0x118)
+[    2.640246] [<c0063644>] (lockdep_trace_alloc) from [<c00df52c>] (__kmalloc+0x3c/0x1cc)
+[    2.648240] [<c00df52c>] (__kmalloc) from [<c0394970>] (clk_fetch_parent_index+0xb8/0xd4)
+[    2.656390] [<c0394970>] (clk_fetch_parent_index) from [<c0394a6c>] (clk_calc_new_rates+0xe0/0x1fc)
+[    2.665415] [<c0394a6c>] (clk_calc_new_rates) from [<c0394b40>] (clk_calc_new_rates+0x1b4/0x1fc)
+[    2.674181] [<c0394b40>] (clk_calc_new_rates) from [<c0395408>] (clk_set_rate+0x50/0xc8)
+[    2.682265] [<c0395408>] (clk_set_rate) from [<c0377708>] (sdhci_cmu_set_clock+0x68/0x16c)
+[    2.690503] [<c0377708>] (sdhci_cmu_set_clock) from [<c03735cc>] (sdhci_do_set_ios+0xf0/0x64c)
+[    2.699095] [<c03735cc>] (sdhci_do_set_ios) from [<c0373b48>] (sdhci_set_ios+0x20/0x2c)
+[    2.707080] [<c0373b48>] (sdhci_set_ios) from [<c035ddf0>] (mmc_power_up+0x118/0x1fc)
+[    2.714889] [<c035ddf0>] (mmc_power_up) from [<c035ecd0>] (mmc_start_host+0x44/0x6c)
+[    2.722615] [<c035ecd0>] (mmc_start_host) from [<c035fd60>] (mmc_add_host+0x58/0x7c)
+[    2.730341] [<c035fd60>] (mmc_add_host) from [<c037454c>] (sdhci_add_host+0x968/0xd94)
+[    2.738240] [<c037454c>] (sdhci_add_host) from [<c0377b60>] (sdhci_s3c_probe+0x354/0x52c)
+[    2.746406] [<c0377b60>] (sdhci_s3c_probe) from [<c0283b58>] (platform_drv_probe+0x48/0xa4)
+[    2.754733] [<c0283b58>] (platform_drv_probe) from [<c02824e8>] (driver_probe_device+0x13c/0x37c)
+[    2.763585] [<c02824e8>] (driver_probe_device) from [<c02827bc>] (__driver_attach+0x94/0x98)
+[    2.772003] [<c02827bc>] (__driver_attach) from [<c0280a60>] (bus_for_each_dev+0x54/0x88)
+[    2.780163] [<c0280a60>] (bus_for_each_dev) from [<c0281b48>] (bus_add_driver+0xe4/0x200)
+[    2.788322] [<c0281b48>] (bus_add_driver) from [<c0282dfc>] (driver_register+0x78/0xf4)
+[    2.796308] [<c0282dfc>] (driver_register) from [<c00089b0>] (do_one_initcall+0xac/0x1f0)
+[    2.804473] [<c00089b0>] (do_one_initcall) from [<c0673d94>] (kernel_init_freeable+0x10c/0x1d8)
+[    2.813153] [<c0673d94>] (kernel_init_freeable) from [<c0490058>] (kernel_init+0x28/0x108)
+[    2.821398] [<c0490058>] (kernel_init) from [<c000f268>] (ret_from_fork+0x14/0x2c)
+[    2.828939] ---[ end trace 03cc00e539849d1f ]---
+
+clk_set_rate() tries to take clk's prepare_lock mutex while being in atomic
+context entered in sdhci_do_set_ios().
+
+The solution is inspired by similar situation in sdhci_set_power() also called
+from sdhci_do_set_ios():
+
+                spin_unlock_irq(&host->lock);
+                mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
+                spin_lock_irq(&host->lock);
+
+Note that since sdhci_s3c_set_clock() sets SDHCI_CLOCK_CARD_EN, proposed change
+first resets this bit. It is reset anyway (by setting SDHCI_CLOCK_INT_EN bit
+only) after call to clk_set_rate() in order to wait for the clock to stabilize
+and is set again as soon as the clock becomes stable.
+
+Signed-off-by: Paul Osmialowski <p.osmialowsk@samsung.com>
+Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
+Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/mmc/host/sdhci-s3c.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/mmc/host/sdhci-s3c.c
++++ b/drivers/mmc/host/sdhci-s3c.c
+@@ -12,6 +12,7 @@
+  * published by the Free Software Foundation.
+  */
+ 
++#include <linux/spinlock.h>
+ #include <linux/delay.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/platform_device.h>
+@@ -312,7 +313,14 @@ static void sdhci_cmu_set_clock(struct s
+ 
+ 	sdhci_s3c_set_clock(host, clock);
+ 
++	/* Reset SD Clock Enable */
++	clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
++	clk &= ~SDHCI_CLOCK_CARD_EN;
++	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
++
++	spin_unlock_irq(&host->lock);
+ 	ret = clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock);
++	spin_lock_irq(&host->lock);
+ 	if (ret != 0) {
+ 		dev_err(dev, "%s: failed to set clock rate %uHz\n",
+ 			mmc_hostname(host->mmc), clock);
diff --git a/queue-3.16/s390-fix-unmatched-preempt-disable.patch b/queue-3.16/s390-fix-unmatched-preempt-disable.patch
new file mode 100644
index 00000000..98db8469
--- /dev/null
+++ b/queue-3.16/s390-fix-unmatched-preempt-disable.patch
@@ -0,0 +1,49 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Thu, 06 Feb 2020 15:17:16 +0000
+Subject: s390: Fix unmatched preempt_disable() on exit
+
+exit_thread_runtime_instr() may return with preemption disabled,
+leading to the following lockdep splat:
+
+BUG: sleeping function called from invalid context at kernel/locking/mutex.c:586
+in_atomic(): 1, irqs_disabled(): 0, pid: 565, name: kworker/u2:0
+no locks held by kworker/u2:0/565.
+CPU: 0 PID: 565 Comm: kworker/u2:0 Not tainted 3.16.81-00145-gafe1c874fa44 #1
+       00000000025dbbd8 00000000025dbbe8 0000000000000002 0000000000000000 
+       00000000025dbc78 00000000025dbbf0 00000000025dbbf0 000000000098c55c 
+       0000000000000000 00000000025d05b8 00000000025d1590 0000000000000000 
+       0000000000000000 000000000000000c 00000000025dbbd8 0000000000000070 
+       00000000009b7220 000000000098c55c 00000000025dbbd8 00000000025dbc20 
+Call Trace:
+([<000000000098c4ce>] show_trace+0xb6/0xd8)
+ [<000000000098c592>] show_stack+0xa2/0xd8
+ [<0000000000992c04>] dump_stack+0xc4/0x118
+ [<0000000000191e20>] __might_sleep+0x230/0x238
+ [<000000000099fbb0>] mutex_lock_nested+0x48/0x3d8
+ [<000000000025e33e>] perf_event_exit_task+0x36/0x398
+ [<0000000000158536>] do_exit+0x3ae/0xca0
+ [<0000000000175826>] ____call_usermodehelper+0x136/0x148
+ [<00000000009a550a>] kernel_thread_starter+0x6/0xc
+ [<00000000009a5504>] kernel_thread_starter+0x0/0xc
+
+This was fixed by commit 8d9047f8b967 "s390/runtime instrumentation:
+simplify task exit handling" upstream, but that won't apply here.
+
+Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
+Cc: Vasily Gorbik <gor@linux.ibm.com>
+Cc: Christian Borntraeger <borntraeger@de.ibm.com>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/arch/s390/kernel/runtime_instr.c
++++ b/arch/s390/kernel/runtime_instr.c
+@@ -53,9 +53,9 @@ void exit_thread_runtime_instr(void)
+ {
+ 	struct task_struct *task = current;
+ 
+-	preempt_disable();
+ 	if (!task->thread.ri_cb)
+ 		return;
++	preempt_disable();
+ 	disable_runtime_instr();
+ 	kfree(task->thread.ri_cb);
+ 	task->thread.ri_signum = 0;
diff --git a/queue-3.16/series b/queue-3.16/series
index 9f303bd4..f95bba73 100644
--- a/queue-3.16/series
+++ b/queue-3.16/series
@@ -143,3 +143,6 @@ tcp-fix-rejected-syncookies-due-to-stale-timestamps.patch
 tcp-protect-accesses-to-.ts_recent_stamp-with-read-write-_once.patch
 inet-protect-against-too-small-mtu-values.patch
 deb-pkg-remove-obsolete-isp-option-to-dpkg-gencontrol.patch
+mmc-sdhci-s3c-check-if-clk_set_rate-succeeds.patch
+mmc-sdhci-s3c-solve-problem-with-sleeping-in-atomic-context.patch
+s390-fix-unmatched-preempt-disable.patch