Skip to content

Commit d6838a6

Browse files
Tushar Beherakgene
Tushar Behera
authored andcommitted
ARM: SAMSUNG: Use spin_lock_{irqsave,irqrestore} in clk_set_rate
The spinlock clocks_lock can be held during ISR, hence it is not safe to hold that lock with disabling interrupts. It fixes following potential deadlock. ========================================================= [ INFO: possible irq lock inversion dependency detected ] 3.6.0-rc4+ #2 Not tainted --------------------------------------------------------- swapper/0/1 just changed the state of lock: (&(&host->lock)->rlock){-.....}, at: [<c027fb0d>] sdhci_irq+0x15/0x564 but this lock took another, HARDIRQ-unsafe lock in the past: (clocks_lock){+.+...} and interrupts could create inverse lock ordering between them. other info that might help us debug this: Possible interrupt unsafe locking scenario: CPU0 CPU1 ---- ---- lock(clocks_lock); local_irq_disable(); lock(&(&host->lock)->rlock); lock(clocks_lock); <Interrupt> lock(&(&host->lock)->rlock); *** DEADLOCK *** Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
1 parent dbc5e1e commit d6838a6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

arch/arm/plat-samsung/clock.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
144144

145145
int clk_set_rate(struct clk *clk, unsigned long rate)
146146
{
147+
unsigned long flags;
147148
int ret;
148149

149150
if (IS_ERR(clk))
@@ -159,9 +160,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
159160
if (clk->ops == NULL || clk->ops->set_rate == NULL)
160161
return -EINVAL;
161162

162-
spin_lock(&clocks_lock);
163+
spin_lock_irqsave(&clocks_lock, flags);
163164
ret = (clk->ops->set_rate)(clk, rate);
164-
spin_unlock(&clocks_lock);
165+
spin_unlock_irqrestore(&clocks_lock, flags);
165166

166167
return ret;
167168
}

0 commit comments

Comments
 (0)