android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clocksource: sh_mtu2: Replace global spinlock with a per-device spinlock

Browse Source 
The global spinlock is used to protect the shared start/stop register.
Now that all MTU2 channels are handled by a single device instance, use
a per-device spinlock.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Wolfram Sang <wsa@sang-engineering.com>
This commit is contained in:
Laurent Pinchart 2014-03-04 15:25:56 +01:00
parent 1a5da0e43b
commit 8b2463d8ca
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/clocksource/sh_mtu2.c
View File

@ -47,14 +47,14 @@ struct sh_mtu2_device {
void __iomem *mapbase; void __iomem *mapbase;
struct clk *clk; struct clk *clk;
raw_spinlock_t lock; /* Protect the shared registers */
struct sh_mtu2_channel *channels; struct sh_mtu2_channel *channels;
unsigned int num_channels; unsigned int num_channels;
bool has_clockevent; bool has_clockevent;
}; };
static DEFINE_RAW_SPINLOCK(sh_mtu2_lock);
#define TSTR -1 /* shared register */ #define TSTR -1 /* shared register */
#define TCR 0 /* channel register */ #define TCR 0 /* channel register */
#define TMDR 1 /* channel register */ #define TMDR 1 /* channel register */
@ -192,7 +192,7 @@ static void sh_mtu2_start_stop_ch(struct sh_mtu2_channel *ch, int start)
unsigned long flags, value; unsigned long flags, value;
/* start stop register shared by multiple timer channels */ /* start stop register shared by multiple timer channels */
raw_spin_lock_irqsave(&sh_mtu2_lock, flags); raw_spin_lock_irqsave(&ch->mtu->lock, flags);
value = sh_mtu2_read(ch, TSTR); value = sh_mtu2_read(ch, TSTR);
if (start) if (start)
@ -201,7 +201,7 @@ static void sh_mtu2_start_stop_ch(struct sh_mtu2_channel *ch, int start)
value &= ~(1 << ch->index); value &= ~(1 << ch->index);
sh_mtu2_write(ch, TSTR, value); sh_mtu2_write(ch, TSTR, value);
raw_spin_unlock_irqrestore(&sh_mtu2_lock, flags); raw_spin_unlock_irqrestore(&ch->mtu->lock, flags);
} }
static int sh_mtu2_enable(struct sh_mtu2_channel *ch) static int sh_mtu2_enable(struct sh_mtu2_channel *ch)
@ -402,6 +402,8 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu,
mtu->pdev = pdev; mtu->pdev = pdev;
raw_spin_lock_init(&mtu->lock);
/* Get hold of clock. */ /* Get hold of clock. */
mtu->clk = clk_get(&mtu->pdev->dev, "fck"); mtu->clk = clk_get(&mtu->pdev->dev, "fck");
if (IS_ERR(mtu->clk)) { if (IS_ERR(mtu->clk)) {