Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b2463d8 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

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



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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: default avatarWolfram Sang <wsa@sang-engineering.com>
parent 1a5da0e4

drivers/clocksource/sh_mtu2.c

+6 −4
Original line number Diff line number Diff line
@@ -47,14 +47,14 @@ struct sh_mtu2_device { 
	void __iomem *mapbase;

	struct clk *clk;



	raw_spinlock_t lock; /* Protect the shared registers */



	struct sh_mtu2_channel *channels;

	unsigned int num_channels;



	bool has_clockevent;

};



static DEFINE_RAW_SPINLOCK(sh_mtu2_lock);



#define TSTR -1 /* shared register */

#define TCR  0 /* 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;



	/* 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);



	if (start)
@@ -201,7 +201,7 @@ static void sh_mtu2_start_stop_ch(struct sh_mtu2_channel *ch, int start) 
		value &= ~(1 << ch->index);



	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)
@@ -402,6 +402,8 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu, 


	mtu->pdev = pdev;



	raw_spin_lock_init(&mtu->lock);



	/* Get hold of clock. */

	mtu->clk = clk_get(&mtu->pdev->dev, "fck");

	if (IS_ERR(mtu->clk)) {