lkml.org 
[lkml]   [2011]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC PATCH 04/34] msm: clock: Support one lock per clock
Date
From: Stephen Boyd <sboyd@codeaurora.org>

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
---
arch/arm/mach-msm/clock.c | 19 +++++++++++--------
arch/arm/mach-msm/clock.h | 2 ++
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
index a9dabde..aa4a450 100644
--- a/arch/arm/mach-msm/clock.c
+++ b/arch/arm/mach-msm/clock.c
@@ -26,19 +26,17 @@

#include "clock.h"

-static DEFINE_SPINLOCK(clocks_lock);
-
/*
* Standard clock functions defined in include/linux/clk.h
*/
int clk_enable(struct clk *clk)
{
unsigned long flags;
- spin_lock_irqsave(&clocks_lock, flags);
+ spin_lock_irqsave(&clk->lock, flags);
clk->count++;
if (clk->count == 1)
clk->ops->enable(clk);
- spin_unlock_irqrestore(&clocks_lock, flags);
+ spin_unlock_irqrestore(&clk->lock, flags);
return 0;
}
EXPORT_SYMBOL(clk_enable);
@@ -46,12 +44,12 @@ EXPORT_SYMBOL(clk_enable);
void clk_disable(struct clk *clk)
{
unsigned long flags;
- spin_lock_irqsave(&clocks_lock, flags);
+ spin_lock_irqsave(&clk->lock, flags);
BUG_ON(clk->count == 0);
clk->count--;
if (clk->count == 0)
clk->ops->disable(clk);
- spin_unlock_irqrestore(&clocks_lock, flags);
+ spin_unlock_irqrestore(&clk->lock, flags);
}
EXPORT_SYMBOL(clk_disable);

@@ -137,8 +135,13 @@ static unsigned msm_num_clocks;

void __init msm_clock_init(struct clk_lookup *clock_tbl, size_t num_clocks)
{
+ unsigned n;
+
clkdev_add_table(clock_tbl, num_clocks);

+ for (n = 0; n < num_clocks; n++)
+ spin_lock_init(&clock_tbl[n].clk->lock);
+
ebi1_clk = clk_get(NULL, "ebi1_clk");
BUG_ON(ebi1_clk == NULL);

@@ -161,12 +164,12 @@ static int __init clock_late_init(void)

clock_debug_add(clk);
if (clk->flags & CLKFLAG_AUTO_OFF) {
- spin_lock_irqsave(&clocks_lock, flags);
+ spin_lock_irqsave(&clk->lock, flags);
if (!clk->count) {
count++;
clk->ops->auto_off(clk);
}
- spin_unlock_irqrestore(&clocks_lock, flags);
+ spin_unlock_irqrestore(&clk->lock, flags);
}
}
pr_info("clock_late_init() disabled %d unused clocks\n", count);
diff --git a/arch/arm/mach-msm/clock.h b/arch/arm/mach-msm/clock.h
index 7fe1598..89506a8 100644
--- a/arch/arm/mach-msm/clock.h
+++ b/arch/arm/mach-msm/clock.h
@@ -19,6 +19,7 @@

#include <linux/init.h>
#include <linux/list.h>
+#include <linux/spinlock.h>
#include <mach/clk.h>

#define CLKFLAG_INVERT 0x00000001
@@ -53,6 +54,7 @@ struct clk {
uint32_t flags;
struct clk_ops *ops;
const char *dbg_name;
+ spinlock_t lock;
};

#define OFF CLKFLAG_AUTO_OFF
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.


\
 
 \ /
  Last update: 2011-11-02 19:39    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site