From: Jacek Anaszewski <jacek.anaszewski@gmail.com> To: Zhang Bo <bo.zhang@nxp.com>, linux-arm-kernel@lists.infradead.org Cc: pavel@ucw.cz, Linux LED Subsystem <linux-leds@vger.kernel.org> Subject: Re: [[PATCH]] drivers: leds/trigger: system cannot enter suspend Date: Mon, 5 Jun 2017 21:27:18 +0200 [thread overview] Message-ID: <9d1f4e47-0713-043a-4359-db8f856e0b0e@gmail.com> (raw) In-Reply-To: <1496648191-134355-1-git-send-email-bo.zhang@nxp.com> Hi Zhang, Thanks for the patch. It seems to be almost ready to merge. Just two issues below. Please also always cc linux-leds@vger.kernel.org when modifying LED subsystem. On 06/05/2017 09:36 AM, Zhang Bo wrote: > System cannot enter suspend mode because of heartbeat led trigger. > Heartbeat_pm_notifier is called when system prepare to enter suspend > mode, then call led_trigger_unregister to change the trigger of led device > to none. It will send uevent message and the wakeup source count changed. > > Add suspend/resume ops to the struct led_trigger, implement these two ops > for ledtrig-heartbeat. Add led_trigger_suspend/led_trigger_resume funcitons > to iterate through all LED class devices registered on given trigger and > call their suspend/resume ops and disable/enable sysfs at the same time. > > Call led_trigger_suspend{resuem} API in pm_notifier function to > suspend/resume all led devices listed in given trigger. > > Signed-off-by: Zhang Bo <bo.zhang@nxp.com> > --- > drivers/leds/led-triggers.c | 34 +++++++++++++++++++++++++++++++ > drivers/leds/trigger/ledtrig-heartbeat.c | 35 ++++++++++++++++++++++++++------ > include/linux/leds.h | 6 ++++++ > 3 files changed, 69 insertions(+), 6 deletions(-) > mode change 100644 => 100755 drivers/leds/led-triggers.c > mode change 100644 => 100755 drivers/leds/trigger/ledtrig-heartbeat.c > mode change 100644 => 100755 include/linux/leds.h You accidentally changed file permissions. > diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c > old mode 100644 > new mode 100755 > index 431123b..1cb1674 > --- a/drivers/leds/led-triggers.c > +++ b/drivers/leds/led-triggers.c > @@ -333,6 +333,40 @@ void led_trigger_blink_oneshot(struct led_trigger *trig, > } > EXPORT_SYMBOL_GPL(led_trigger_blink_oneshot); > > +void led_trigger_suspend(struct led_trigger *trig) > +{ > + struct led_classdev *led_cdev; > + > + if (!trig) > + return; > + > + read_lock(&trig->leddev_list_lock); > + list_for_each_entry(led_cdev, &trig->led_cdevs, trig_list) { > + if (led_cdev->trigger->suspend) > + led_cdev->trigger->suspend(led_cdev); > + led_sysfs_disable(led_cdev); Could you share what kind of problem this call to led_syfs_disable() solves? Did you come across one? > + } > + read_unlock(&trig->leddev_list_lock); > +} > +EXPORT_SYMBOL_GPL(led_trigger_suspend); > + > +void led_trigger_resume(struct led_trigger *trig) > +{ > + struct led_classdev *led_cdev; > + > + if (!trig) > + return; > + > + read_lock(&trig->leddev_list_lock); > + list_for_each_entry(led_cdev, &trig->led_cdevs, trig_list) { > + if (led_cdev->trigger->resume) > + led_cdev->trigger->resume(led_cdev); > + led_sysfs_enable(led_cdev); > + } > + read_unlock(&trig->leddev_list_lock); > +} > +EXPORT_SYMBOL_GPL(led_trigger_resume); > + > void led_trigger_register_simple(const char *name, struct led_trigger **tp) > { > struct led_trigger *trig; > diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c > old mode 100644 > new mode 100755 > index afa3b40..8f779dd > --- a/drivers/leds/trigger/ledtrig-heartbeat.c > +++ b/drivers/leds/trigger/ledtrig-heartbeat.c > @@ -142,6 +142,7 @@ static void heartbeat_trig_activate(struct led_classdev *led_cdev) > led_heartbeat_function(heartbeat_data->timer.data); > set_bit(LED_BLINK_SW, &led_cdev->work_flags); > led_cdev->activated = true; > + led_cdev->suspended = false; > } > > static void heartbeat_trig_deactivate(struct led_classdev *led_cdev) > @@ -154,6 +155,30 @@ static void heartbeat_trig_deactivate(struct led_classdev *led_cdev) > kfree(heartbeat_data); > clear_bit(LED_BLINK_SW, &led_cdev->work_flags); > led_cdev->activated = false; > + led_cdev->suspended = false; > + } > +} > + > +static void heartbeat_trig_resume(struct led_classdev *led_cdev) > +{ > + struct heartbeat_trig_data *heartbeat_data = led_cdev->trigger_data; > + > + if (led_cdev->suspended) { > + setup_timer(&heartbeat_data->timer, > + led_heartbeat_function, (unsigned long) led_cdev); > + heartbeat_data->phase = 0; > + led_heartbeat_function(heartbeat_data->timer.data); > + led_cdev->suspended = false; > + } > +} > + > +static void heartbeat_trig_suspend(struct led_classdev *led_cdev) > +{ > + struct heartbeat_trig_data *heartbeat_data = led_cdev->trigger_data; > + > + if (led_cdev->activated && !led_cdev->suspended) { > + del_timer_sync(&heartbeat_data->timer); > + led_cdev->suspended = true; > } > } > > @@ -161,25 +186,23 @@ static void heartbeat_trig_deactivate(struct led_classdev *led_cdev) > .name = "heartbeat", > .activate = heartbeat_trig_activate, > .deactivate = heartbeat_trig_deactivate, > + .suspend = heartbeat_trig_suspend, > + .resume = heartbeat_trig_resume, > }; > > static int heartbeat_pm_notifier(struct notifier_block *nb, > unsigned long pm_event, void *unused) > { > - int rc; > - > switch (pm_event) { > case PM_SUSPEND_PREPARE: > case PM_HIBERNATION_PREPARE: > case PM_RESTORE_PREPARE: > - led_trigger_unregister(&heartbeat_led_trigger); > + led_trigger_suspend(&heartbeat_led_trigger); > break; > case PM_POST_SUSPEND: > case PM_POST_HIBERNATION: > case PM_POST_RESTORE: > - rc = led_trigger_register(&heartbeat_led_trigger); > - if (rc) > - pr_err("could not re-register heartbeat trigger\n"); > + led_trigger_resume(&heartbeat_led_trigger); > break; > default: > break; > diff --git a/include/linux/leds.h b/include/linux/leds.h > old mode 100644 > new mode 100755 > index 64c56d4..b792950 > --- a/include/linux/leds.h > +++ b/include/linux/leds.h > @@ -111,6 +111,7 @@ struct led_classdev { > void *trigger_data; > /* true if activated - deactivate routine uses it to do cleanup */ > bool activated; > + bool suspended; > #endif > > #ifdef CONFIG_LEDS_BRIGHTNESS_HW_CHANGED > @@ -254,6 +255,8 @@ struct led_trigger { > const char *name; > void (*activate)(struct led_classdev *led_cdev); > void (*deactivate)(struct led_classdev *led_cdev); > + void (*suspend)(struct led_classdev *led_cdev); > + void (*resume)(struct led_classdev *led_cdev); > > /* LEDs under control by this trigger (for simple triggers) */ > rwlock_t leddev_list_lock; > @@ -291,6 +294,9 @@ extern void led_trigger_set(struct led_classdev *led_cdev, > struct led_trigger *trigger); > extern void led_trigger_remove(struct led_classdev *led_cdev); > > +extern void led_trigger_suspend(struct led_trigger *trig); > +extern void led_trigger_resume(struct led_trigger *trig); > + > static inline void *led_get_trigger_data(struct led_classdev *led_cdev) > { > return led_cdev->trigger_data; > -- Best regards, Jacek Anaszewski
WARNING: multiple messages have this Message-ID (diff)
From: jacek.anaszewski@gmail.com (Jacek Anaszewski) To: linux-arm-kernel@lists.infradead.org Subject: [[PATCH]] drivers: leds/trigger: system cannot enter suspend Date: Mon, 5 Jun 2017 21:27:18 +0200 [thread overview] Message-ID: <9d1f4e47-0713-043a-4359-db8f856e0b0e@gmail.com> (raw) In-Reply-To: <1496648191-134355-1-git-send-email-bo.zhang@nxp.com> Hi Zhang, Thanks for the patch. It seems to be almost ready to merge. Just two issues below. Please also always cc linux-leds at vger.kernel.org when modifying LED subsystem. On 06/05/2017 09:36 AM, Zhang Bo wrote: > System cannot enter suspend mode because of heartbeat led trigger. > Heartbeat_pm_notifier is called when system prepare to enter suspend > mode, then call led_trigger_unregister to change the trigger of led device > to none. It will send uevent message and the wakeup source count changed. > > Add suspend/resume ops to the struct led_trigger, implement these two ops > for ledtrig-heartbeat. Add led_trigger_suspend/led_trigger_resume funcitons > to iterate through all LED class devices registered on given trigger and > call their suspend/resume ops and disable/enable sysfs at the same time. > > Call led_trigger_suspend{resuem} API in pm_notifier function to > suspend/resume all led devices listed in given trigger. > > Signed-off-by: Zhang Bo <bo.zhang@nxp.com> > --- > drivers/leds/led-triggers.c | 34 +++++++++++++++++++++++++++++++ > drivers/leds/trigger/ledtrig-heartbeat.c | 35 ++++++++++++++++++++++++++------ > include/linux/leds.h | 6 ++++++ > 3 files changed, 69 insertions(+), 6 deletions(-) > mode change 100644 => 100755 drivers/leds/led-triggers.c > mode change 100644 => 100755 drivers/leds/trigger/ledtrig-heartbeat.c > mode change 100644 => 100755 include/linux/leds.h You accidentally changed file permissions. > diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c > old mode 100644 > new mode 100755 > index 431123b..1cb1674 > --- a/drivers/leds/led-triggers.c > +++ b/drivers/leds/led-triggers.c > @@ -333,6 +333,40 @@ void led_trigger_blink_oneshot(struct led_trigger *trig, > } > EXPORT_SYMBOL_GPL(led_trigger_blink_oneshot); > > +void led_trigger_suspend(struct led_trigger *trig) > +{ > + struct led_classdev *led_cdev; > + > + if (!trig) > + return; > + > + read_lock(&trig->leddev_list_lock); > + list_for_each_entry(led_cdev, &trig->led_cdevs, trig_list) { > + if (led_cdev->trigger->suspend) > + led_cdev->trigger->suspend(led_cdev); > + led_sysfs_disable(led_cdev); Could you share what kind of problem this call to led_syfs_disable() solves? Did you come across one? > + } > + read_unlock(&trig->leddev_list_lock); > +} > +EXPORT_SYMBOL_GPL(led_trigger_suspend); > + > +void led_trigger_resume(struct led_trigger *trig) > +{ > + struct led_classdev *led_cdev; > + > + if (!trig) > + return; > + > + read_lock(&trig->leddev_list_lock); > + list_for_each_entry(led_cdev, &trig->led_cdevs, trig_list) { > + if (led_cdev->trigger->resume) > + led_cdev->trigger->resume(led_cdev); > + led_sysfs_enable(led_cdev); > + } > + read_unlock(&trig->leddev_list_lock); > +} > +EXPORT_SYMBOL_GPL(led_trigger_resume); > + > void led_trigger_register_simple(const char *name, struct led_trigger **tp) > { > struct led_trigger *trig; > diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c > old mode 100644 > new mode 100755 > index afa3b40..8f779dd > --- a/drivers/leds/trigger/ledtrig-heartbeat.c > +++ b/drivers/leds/trigger/ledtrig-heartbeat.c > @@ -142,6 +142,7 @@ static void heartbeat_trig_activate(struct led_classdev *led_cdev) > led_heartbeat_function(heartbeat_data->timer.data); > set_bit(LED_BLINK_SW, &led_cdev->work_flags); > led_cdev->activated = true; > + led_cdev->suspended = false; > } > > static void heartbeat_trig_deactivate(struct led_classdev *led_cdev) > @@ -154,6 +155,30 @@ static void heartbeat_trig_deactivate(struct led_classdev *led_cdev) > kfree(heartbeat_data); > clear_bit(LED_BLINK_SW, &led_cdev->work_flags); > led_cdev->activated = false; > + led_cdev->suspended = false; > + } > +} > + > +static void heartbeat_trig_resume(struct led_classdev *led_cdev) > +{ > + struct heartbeat_trig_data *heartbeat_data = led_cdev->trigger_data; > + > + if (led_cdev->suspended) { > + setup_timer(&heartbeat_data->timer, > + led_heartbeat_function, (unsigned long) led_cdev); > + heartbeat_data->phase = 0; > + led_heartbeat_function(heartbeat_data->timer.data); > + led_cdev->suspended = false; > + } > +} > + > +static void heartbeat_trig_suspend(struct led_classdev *led_cdev) > +{ > + struct heartbeat_trig_data *heartbeat_data = led_cdev->trigger_data; > + > + if (led_cdev->activated && !led_cdev->suspended) { > + del_timer_sync(&heartbeat_data->timer); > + led_cdev->suspended = true; > } > } > > @@ -161,25 +186,23 @@ static void heartbeat_trig_deactivate(struct led_classdev *led_cdev) > .name = "heartbeat", > .activate = heartbeat_trig_activate, > .deactivate = heartbeat_trig_deactivate, > + .suspend = heartbeat_trig_suspend, > + .resume = heartbeat_trig_resume, > }; > > static int heartbeat_pm_notifier(struct notifier_block *nb, > unsigned long pm_event, void *unused) > { > - int rc; > - > switch (pm_event) { > case PM_SUSPEND_PREPARE: > case PM_HIBERNATION_PREPARE: > case PM_RESTORE_PREPARE: > - led_trigger_unregister(&heartbeat_led_trigger); > + led_trigger_suspend(&heartbeat_led_trigger); > break; > case PM_POST_SUSPEND: > case PM_POST_HIBERNATION: > case PM_POST_RESTORE: > - rc = led_trigger_register(&heartbeat_led_trigger); > - if (rc) > - pr_err("could not re-register heartbeat trigger\n"); > + led_trigger_resume(&heartbeat_led_trigger); > break; > default: > break; > diff --git a/include/linux/leds.h b/include/linux/leds.h > old mode 100644 > new mode 100755 > index 64c56d4..b792950 > --- a/include/linux/leds.h > +++ b/include/linux/leds.h > @@ -111,6 +111,7 @@ struct led_classdev { > void *trigger_data; > /* true if activated - deactivate routine uses it to do cleanup */ > bool activated; > + bool suspended; > #endif > > #ifdef CONFIG_LEDS_BRIGHTNESS_HW_CHANGED > @@ -254,6 +255,8 @@ struct led_trigger { > const char *name; > void (*activate)(struct led_classdev *led_cdev); > void (*deactivate)(struct led_classdev *led_cdev); > + void (*suspend)(struct led_classdev *led_cdev); > + void (*resume)(struct led_classdev *led_cdev); > > /* LEDs under control by this trigger (for simple triggers) */ > rwlock_t leddev_list_lock; > @@ -291,6 +294,9 @@ extern void led_trigger_set(struct led_classdev *led_cdev, > struct led_trigger *trigger); > extern void led_trigger_remove(struct led_classdev *led_cdev); > > +extern void led_trigger_suspend(struct led_trigger *trig); > +extern void led_trigger_resume(struct led_trigger *trig); > + > static inline void *led_get_trigger_data(struct led_classdev *led_cdev) > { > return led_cdev->trigger_data; > -- Best regards, Jacek Anaszewski
next prev parent reply other threads:[~2017-06-05 19:28 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-05 7:36 [[PATCH]] drivers: leds/trigger: system cannot enter suspend Zhang Bo 2017-06-05 19:27 ` Jacek Anaszewski [this message] 2017-06-05 19:27 ` Jacek Anaszewski 2017-06-06 2:47 ` Bruce Zhang 2017-06-06 2:47 ` Bruce Zhang 2017-06-06 20:00 ` Jacek Anaszewski 2017-06-06 20:00 ` Jacek Anaszewski 2017-06-05 20:05 ` Pavel Machek 2017-06-06 2:11 ` Bruce Zhang 2017-06-09 11:25 ` Linus Walleij 2017-06-09 13:01 ` Bruce Zhang 2017-06-09 13:01 ` Bruce Zhang 2017-06-06 2:36 Zhang Bo 2017-06-06 19:25 ` Pavel Machek 2017-06-06 20:05 ` Jacek Anaszewski 2017-06-06 20:19 ` Grygorii Strashko 2017-06-06 20:34 ` Pavel Machek 2017-06-06 20:38 ` Pavel Machek 2017-06-07 4:24 ` Bruce Zhang 2017-06-07 15:38 ` Grygorii Strashko 2017-06-09 22:16 ` Pavel Machek
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=9d1f4e47-0713-043a-4359-db8f856e0b0e@gmail.com \ --to=jacek.anaszewski@gmail.com \ --cc=bo.zhang@nxp.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-leds@vger.kernel.org \ --cc=pavel@ucw.cz \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.