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

Commit 37e7742c authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Daniel Lezcano
Browse files

clocksource/drivers/sh_cmt: Fix clocksource width for 32-bit machines 



The driver seems to abuse *unsigned long* not only for the (32-bit)
register values but also for the 'sh_cmt_channel::total_cycles' which
needs to always be 64-bit -- as a result, the clocksource's mask is
needlessly clamped down to 32-bits on the 32-bit machines...

Fixes: 19bdc9d0 ("clocksource: sh_cmt clocksource support")
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 22627c6f

drivers/clocksource/sh_cmt.c

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct sh_cmt_channel { 
	raw_spinlock_t lock;

	struct clock_event_device ced;

	struct clocksource cs;

	unsigned long total_cycles;

	u64 total_cycles;

	bool cs_enabled;

};
@@ -605,8 +605,8 @@ static u64 sh_cmt_clocksource_read(struct clocksource *cs) 
{

	struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);

	unsigned long flags;

	unsigned long value;

	u32 has_wrapped;

	u64 value;

	u32 raw;



	raw_spin_lock_irqsave(&ch->lock, flags);
@@ -680,7 +680,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch, 
	cs->disable = sh_cmt_clocksource_disable;

	cs->suspend = sh_cmt_clocksource_suspend;

	cs->resume = sh_cmt_clocksource_resume;

	cs->mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8);

	cs->mask = CLOCKSOURCE_MASK(sizeof(u64) * 8);

	cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;



	dev_info(&ch->cmt->pdev->dev, "ch%u: used as clock source\n",