Messages in this thread Patch in this message | | | From | "Rafael J. Wysocki" <> | Subject | Re: [PATCH v3]PM/Sleep: Timer quiesce in freeze state | Date | Mon, 26 Jan 2015 15:21:42 +0100 |
| |
On Monday, January 26, 2015 10:40:24 AM Thomas Gleixner wrote: > On Mon, 26 Jan 2015, Li, Aubrey wrote: > > On 2015/1/22 18:15, Thomas Gleixner wrote: > > > Can we please stop adding more crap to that notifier thing? I rather > > > see that go away than being expanded. > > > > Are you referring to FREEZE_PREPARE or remove all of FREEZE staff at all? > > > > What's the disadvantage of adding more notifier? > > clockevents_notify() is not a notifier. Its a multiplex call and I > want to get rid of it and replace it with explicit functions.
OK, so perhaps we need to move _SUSPEND/_RESUME out of there to start with?
As far as I can say, clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL) and clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL) are each only called from one place and moreover, since they are in syscore_ops, we don't need any locking around them.
So what about the patch below?
--- include/linux/clockchips.h | 2 -- kernel/time/clockevents.c | 9 --------- kernel/time/timekeeping.c | 6 ++++-- 3 files changed, 4 insertions(+), 13 deletions(-)
Index: linux-pm/include/linux/clockchips.h =================================================================== --- linux-pm.orig/include/linux/clockchips.h +++ linux-pm/include/linux/clockchips.h @@ -16,8 +16,6 @@ enum clock_event_nofitiers { CLOCK_EVT_NOTIFY_BROADCAST_FORCE, CLOCK_EVT_NOTIFY_BROADCAST_ENTER, CLOCK_EVT_NOTIFY_BROADCAST_EXIT, - CLOCK_EVT_NOTIFY_SUSPEND, - CLOCK_EVT_NOTIFY_RESUME, CLOCK_EVT_NOTIFY_CPU_DYING, CLOCK_EVT_NOTIFY_CPU_DEAD, }; Index: linux-pm/kernel/time/clockevents.c =================================================================== --- linux-pm.orig/kernel/time/clockevents.c +++ linux-pm/kernel/time/clockevents.c @@ -570,15 +570,6 @@ int clockevents_notify(unsigned long rea tick_handover_do_timer(arg); break; - case CLOCK_EVT_NOTIFY_SUSPEND: - tick_suspend(); - tick_suspend_broadcast(); - break; - - case CLOCK_EVT_NOTIFY_RESUME: - tick_resume(); - break; - case CLOCK_EVT_NOTIFY_CPU_DEAD: tick_shutdown_broadcast_oneshot(arg); tick_shutdown_broadcast(arg); Index: linux-pm/kernel/time/timekeeping.c =================================================================== --- linux-pm.orig/kernel/time/timekeeping.c +++ linux-pm/kernel/time/timekeeping.c @@ -1245,7 +1245,7 @@ static void timekeeping_resume(void) touch_softlockup_watchdog(); - clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL); + tick_resume(); /* Resume hrtimers */ hrtimers_resume(); @@ -1299,7 +1299,9 @@ static int timekeeping_suspend(void) write_seqcount_end(&tk_core.seq); raw_spin_unlock_irqrestore(&timekeeper_lock, flags); - clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL); + tick_suspend(); + tick_suspend_broadcast(); + clocksource_suspend(); clockevents_suspend();
| |