Skip to contentSkip to conversation

clockevents/arm: Implement ->set_state_oneshot_stopped()

PATCH In review Viresh Kumar 2 participants 5 messages Dec 23, 2015 – Feb 17, 2016

Subsystems (4)
Arm Samsung Exynos Clocksource, clockevent drivers Arm/STI architecture Arm architected timer driver
lore
Share & tools
lore

Viresh Kumar

author
#0 lore raw

cover clockevents/arm: Implement ->set_state_oneshot_stopped()

Hi Daniel/Thomas,

ONESHOT-STOPPED state was merged into mainline sometime back and doesn't have any users until now.

This series implements the set_state_oneshot_stopped() callback for few ARM clkevt drivers.

Which other clkevt drivers will you advice to update, if any?

Tested on ARM Exynos 5250 dual A15 board (1/3 and 3/3, 2/3 is compile tested only but is changed as many ARM SoCs use it). Rebased on v4.4-rc6.

Viresh Kumar (3):
clockevents/arm_arch_timer: Implement ->set_state_oneshot_stopped() clockevents/arm_global_timer: Implement ->set_state_oneshot_stopped() clockevents/exynos_mct: Implement ->set_state_oneshot_stopped()

 drivers/clocksource/arm_arch_timer.c   | 4 ++++
 drivers/clocksource/arm_global_timer.c | 1 +
 drivers/clocksource/exynos_mct.c       | 2 ++
 3 files changed, 7 insertions(+)
Signature · 1 line
2.7.0.rc1.186.g94414c4
author
#1 lore raw

PATCH 1/3 clockevents/arm_arch_timer: Implement ->set_state_oneshot_stopped()

set_state_oneshot_stopped() is called by the clkevt core, when the next event is required at an expiry time of 'KTIME_MAX'. This normally happens with NO_HZ_{IDLE|FULL} in both LOWRES/HIGHRES modes.

This patch makes the clockevent device to stop on such an event, to avoid spurious interrupts, as explained by: commit 8fff52fd5093 ("clockevents: Introduce CLOCK_EVT_STATE_ONESHOT_STOPPED state").

Signed-off-by Viresh Kumar <[email protected]>
---
 drivers/clocksource/arm_arch_timer.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/clocksource/arm_arch_timer.c +4 -0
index c64d543d64bf..c816823888c0 100644
@@ -266,10 +266,12 @@ static void __arch_timer_setup(unsigned type,
 		if (arch_timer_use_virtual) {
 			clk->irq = arch_timer_ppi[VIRT_PPI];
 			clk->set_state_shutdown = arch_timer_shutdown_virt;
+			clk->set_state_oneshot_stopped = arch_timer_shutdown_virt;
 			clk->set_next_event = arch_timer_set_next_event_virt;
 		} else {
 			clk->irq = arch_timer_ppi[PHYS_SECURE_PPI];
 			clk->set_state_shutdown = arch_timer_shutdown_phys;
+			clk->set_state_oneshot_stopped = arch_timer_shutdown_phys;
 			clk->set_next_event = arch_timer_set_next_event_phys;
 		}
 	} else {

@@ -279,10 +281,12 @@ static void __arch_timer_setup(unsigned type,
 		clk->cpumask = cpu_all_mask;
 		if (arch_timer_mem_use_virtual) {
 			clk->set_state_shutdown = arch_timer_shutdown_virt_mem;
+			clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem;
 			clk->set_next_event =
 				arch_timer_set_next_event_virt_mem;
 		} else {
 			clk->set_state_shutdown = arch_timer_shutdown_phys_mem;
+			clk->set_state_oneshot_stopped = arch_timer_shutdown_phys_mem;
 			clk->set_next_event =
 				arch_timer_set_next_event_phys_mem;
 		}
Signature · 1 line
2.7.0.rc1.186.g94414c4
author
#2 lore raw

PATCH 2/3 clockevents/arm_global_timer: Implement ->set_state_oneshot_stopped()

In reply to Viresh Kumar

set_state_oneshot_stopped() is called by the clkevt core, when the next event is required at an expiry time of 'KTIME_MAX'. This normally happens with NO_HZ_{IDLE|FULL} in both LOWRES/HIGHRES modes.

This patch makes the clockevent device to stop on such an event, to avoid spurious interrupts, as explained by: commit 8fff52fd5093 ("clockevents: Introduce CLOCK_EVT_STATE_ONESHOT_STOPPED state").

Signed-off-by Viresh Kumar <[email protected]>
---
 drivers/clocksource/arm_global_timer.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clocksource/arm_global_timer.c +1 -0
index a2cb6fae9295..801cfe5833c1 100644
@@ -174,6 +174,7 @@ static int gt_clockevents_init(struct clock_event_device *clk)
 	clk->set_state_shutdown = gt_clockevent_shutdown;
 	clk->set_state_periodic = gt_clockevent_set_periodic;
 	clk->set_state_oneshot = gt_clockevent_shutdown;
+	clk->set_state_oneshot_stopped = gt_clockevent_shutdown;
 	clk->set_next_event = gt_clockevent_set_next_event;
 	clk->cpumask = cpumask_of(cpu);
 	clk->rating = 300;
Signature · 1 line
2.7.0.rc1.186.g94414c4
author
#3 lore raw

PATCH 3/3 clockevents/exynos_mct: Implement ->set_state_oneshot_stopped()

In reply to Viresh Kumar

set_state_oneshot_stopped() is called by the clkevt core, when the next event is required at an expiry time of 'KTIME_MAX'. This normally happens with NO_HZ_{IDLE|FULL} in both LOWRES/HIGHRES modes.

This patch makes the clockevent device to stop on such an event, to avoid spurious interrupts, as explained by: commit 8fff52fd5093 ("clockevents: Introduce CLOCK_EVT_STATE_ONESHOT_STOPPED state").

Signed-off-by Viresh Kumar <[email protected]>
---
 drivers/clocksource/exynos_mct.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/clocksource/exynos_mct.c +2 -0
index ff44082a0827..be09bc0b5e26 100644
@@ -313,6 +313,7 @@ static struct clock_event_device mct_comp_device = {
 	.set_state_periodic	= mct_set_state_periodic,
 	.set_state_shutdown	= mct_set_state_shutdown,
 	.set_state_oneshot	= mct_set_state_shutdown,
+	.set_state_oneshot_stopped = mct_set_state_shutdown,
 	.tick_resume		= mct_set_state_shutdown,
 };
 

@@ -452,6 +453,7 @@ static int exynos4_local_timer_setup(struct mct_clock_event_device *mevt)
 	evt->set_state_periodic = set_state_periodic;
 	evt->set_state_shutdown = set_state_shutdown;
 	evt->set_state_oneshot = set_state_shutdown;
+	evt->set_state_oneshot_stopped = set_state_shutdown;
 	evt->tick_resume = set_state_shutdown;
 	evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
 	evt->rating = 450;
Signature · 1 line
2.7.0.rc1.186.g94414c4
#4 lore raw
In reply to Viresh Kumar
Quoted 5 lines · Viresh Kumar

Hi Daniel/Thomas,

ONESHOT-STOPPED state was merged into mainline sometime back and doesn't have any users until now.

Quoted 8 lines

This series implements the set_state_oneshot_stopped() callback for few ARM clkevt drivers.

Which other clkevt drivers will you advice to update, if any?

Tested on ARM Exynos 5250 dual A15 board (1/3 and 3/3, 2/3 is compile tested only but is changed as many ARM SoCs use it). Rebased on v4.4-rc6.

Applied for 4.6.

Thanks !

-- Daniel

Signature · 5 lines
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog