From: Heiko Stübner Date: Fri, 16 Jan 2015 16:52:44 +0000 (+0100) Subject: clk: rockchip: fix deadlock possibility in cpuclk X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~261^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e1baf7dca10f8cf945394034013260297bc416;p=pandora-kernel.git clk: rockchip: fix deadlock possibility in cpuclk Lockdep reported a possible deadlock between the cpuclk lock and for example the i2c driver. CPU0 CPU1 ---- ---- lock(clk_lock); local_irq_disable(); lock(&(&i2c->lock)->rlock); lock(clk_lock); lock(&(&i2c->lock)->rlock); *** DEADLOCK *** The generic clock-types of the core ccf already use spin_lock_irqsave when touching clock registers, so do the same for the cpuclk. Signed-off-by: Heiko Stuebner Reviewed-by: Doug Anderson Signed-off-by: Michael Turquette [mturquette@linaro.org: removed initialization of "flags"] --- Reading git-diff-tree failed