7cfe749fad
Commit76931edd54
("leds: fix brightness changing when software blinking is active") changed the semantics of led_set_brightness() which according to the documentation should disable blinking upon any brightness setting. Moreover it made it different for soft blink case, where it was possible to change blink brightness, and for hardware blink case, where setting any brightness greater than 0 was ignored. While the change itself is against the documentation claims, it was driven also by the fact that timer trigger remained active after turning blinking off. Fixing that would have required major refactoring in the led-core, led-class, and led-triggers because of cyclic dependencies. Finally, it has been decided that allowing for brightness change during blinking is beneficial as it can be accomplished without disturbing blink rhythm. The change in brightness setting semantics will not affect existing LED class drivers that implement blink_set op thanks to the LED_BLINK_SW flag introduced by this patch. The flag state will be from now on checked in led_set_brightness() which will allow to distinguish between software and hardware blink mode. In the latter case the control will be passed directly to the drivers which apply their semantics on brightness set, which is disable the blinking in case of most such drivers. New drivers will apply new semantics and just change the brightness while hardware blinking is on, if possible. The issue was smuggled by subsequent LED core improvements, which modified the code that originally introduced the problem. Fixes:f1e80c0741
("leds: core: Add two new LED_BLINK_ flags") Signed-off-by: Tony Makkiel <tony.makkiel@daqri.com> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
328 lines
8.5 KiB
C
328 lines
8.5 KiB
C
/*
|
|
* LED Class Core
|
|
*
|
|
* Copyright 2005-2006 Openedhand Ltd.
|
|
*
|
|
* Author: Richard Purdie <rpurdie@openedhand.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/leds.h>
|
|
#include <linux/list.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/rwsem.h>
|
|
#include "leds.h"
|
|
|
|
DECLARE_RWSEM(leds_list_lock);
|
|
EXPORT_SYMBOL_GPL(leds_list_lock);
|
|
|
|
LIST_HEAD(leds_list);
|
|
EXPORT_SYMBOL_GPL(leds_list);
|
|
|
|
static int __led_set_brightness(struct led_classdev *led_cdev,
|
|
enum led_brightness value)
|
|
{
|
|
if (!led_cdev->brightness_set)
|
|
return -ENOTSUPP;
|
|
|
|
led_cdev->brightness_set(led_cdev, value);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __led_set_brightness_blocking(struct led_classdev *led_cdev,
|
|
enum led_brightness value)
|
|
{
|
|
if (!led_cdev->brightness_set_blocking)
|
|
return -ENOTSUPP;
|
|
|
|
return led_cdev->brightness_set_blocking(led_cdev, value);
|
|
}
|
|
|
|
static void led_timer_function(unsigned long data)
|
|
{
|
|
struct led_classdev *led_cdev = (void *)data;
|
|
unsigned long brightness;
|
|
unsigned long delay;
|
|
|
|
if (!led_cdev->blink_delay_on || !led_cdev->blink_delay_off) {
|
|
led_set_brightness_nosleep(led_cdev, LED_OFF);
|
|
led_cdev->flags &= ~LED_BLINK_SW;
|
|
return;
|
|
}
|
|
|
|
if (led_cdev->flags & LED_BLINK_ONESHOT_STOP) {
|
|
led_cdev->flags &= ~(LED_BLINK_ONESHOT_STOP | LED_BLINK_SW);
|
|
return;
|
|
}
|
|
|
|
brightness = led_get_brightness(led_cdev);
|
|
if (!brightness) {
|
|
/* Time to switch the LED on. */
|
|
brightness = led_cdev->blink_brightness;
|
|
delay = led_cdev->blink_delay_on;
|
|
} else {
|
|
/* Store the current brightness value to be able
|
|
* to restore it when the delay_off period is over.
|
|
* Do it only if there is no pending blink brightness
|
|
* change, to avoid overwriting the new value.
|
|
*/
|
|
if (!(led_cdev->flags & LED_BLINK_BRIGHTNESS_CHANGE))
|
|
led_cdev->blink_brightness = brightness;
|
|
else
|
|
led_cdev->flags &= ~LED_BLINK_BRIGHTNESS_CHANGE;
|
|
brightness = LED_OFF;
|
|
delay = led_cdev->blink_delay_off;
|
|
}
|
|
|
|
led_set_brightness_nosleep(led_cdev, brightness);
|
|
|
|
/* Return in next iteration if led is in one-shot mode and we are in
|
|
* the final blink state so that the led is toggled each delay_on +
|
|
* delay_off milliseconds in worst case.
|
|
*/
|
|
if (led_cdev->flags & LED_BLINK_ONESHOT) {
|
|
if (led_cdev->flags & LED_BLINK_INVERT) {
|
|
if (brightness)
|
|
led_cdev->flags |= LED_BLINK_ONESHOT_STOP;
|
|
} else {
|
|
if (!brightness)
|
|
led_cdev->flags |= LED_BLINK_ONESHOT_STOP;
|
|
}
|
|
}
|
|
|
|
mod_timer(&led_cdev->blink_timer, jiffies + msecs_to_jiffies(delay));
|
|
}
|
|
|
|
static void set_brightness_delayed(struct work_struct *ws)
|
|
{
|
|
struct led_classdev *led_cdev =
|
|
container_of(ws, struct led_classdev, set_brightness_work);
|
|
int ret = 0;
|
|
|
|
if (led_cdev->flags & LED_BLINK_DISABLE) {
|
|
led_cdev->delayed_set_value = LED_OFF;
|
|
led_stop_software_blink(led_cdev);
|
|
led_cdev->flags &= ~LED_BLINK_DISABLE;
|
|
}
|
|
|
|
ret = __led_set_brightness(led_cdev, led_cdev->delayed_set_value);
|
|
if (ret == -ENOTSUPP)
|
|
ret = __led_set_brightness_blocking(led_cdev,
|
|
led_cdev->delayed_set_value);
|
|
if (ret < 0 &&
|
|
/* LED HW might have been unplugged, therefore don't warn */
|
|
!(ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING) &&
|
|
(led_cdev->flags & LED_HW_PLUGGABLE)))
|
|
dev_err(led_cdev->dev,
|
|
"Setting an LED's brightness failed (%d)\n", ret);
|
|
}
|
|
|
|
static void led_set_software_blink(struct led_classdev *led_cdev,
|
|
unsigned long delay_on,
|
|
unsigned long delay_off)
|
|
{
|
|
int current_brightness;
|
|
|
|
current_brightness = led_get_brightness(led_cdev);
|
|
if (current_brightness)
|
|
led_cdev->blink_brightness = current_brightness;
|
|
if (!led_cdev->blink_brightness)
|
|
led_cdev->blink_brightness = led_cdev->max_brightness;
|
|
|
|
led_cdev->blink_delay_on = delay_on;
|
|
led_cdev->blink_delay_off = delay_off;
|
|
|
|
/* never on - just set to off */
|
|
if (!delay_on) {
|
|
led_set_brightness_nosleep(led_cdev, LED_OFF);
|
|
return;
|
|
}
|
|
|
|
/* never off - just set to brightness */
|
|
if (!delay_off) {
|
|
led_set_brightness_nosleep(led_cdev,
|
|
led_cdev->blink_brightness);
|
|
return;
|
|
}
|
|
|
|
led_cdev->flags |= LED_BLINK_SW;
|
|
mod_timer(&led_cdev->blink_timer, jiffies + 1);
|
|
}
|
|
|
|
|
|
static void led_blink_setup(struct led_classdev *led_cdev,
|
|
unsigned long *delay_on,
|
|
unsigned long *delay_off)
|
|
{
|
|
if (!(led_cdev->flags & LED_BLINK_ONESHOT) &&
|
|
led_cdev->blink_set &&
|
|
!led_cdev->blink_set(led_cdev, delay_on, delay_off))
|
|
return;
|
|
|
|
/* blink with 1 Hz as default if nothing specified */
|
|
if (!*delay_on && !*delay_off)
|
|
*delay_on = *delay_off = 500;
|
|
|
|
led_set_software_blink(led_cdev, *delay_on, *delay_off);
|
|
}
|
|
|
|
void led_init_core(struct led_classdev *led_cdev)
|
|
{
|
|
INIT_WORK(&led_cdev->set_brightness_work, set_brightness_delayed);
|
|
|
|
setup_timer(&led_cdev->blink_timer, led_timer_function,
|
|
(unsigned long)led_cdev);
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_init_core);
|
|
|
|
void led_blink_set(struct led_classdev *led_cdev,
|
|
unsigned long *delay_on,
|
|
unsigned long *delay_off)
|
|
{
|
|
del_timer_sync(&led_cdev->blink_timer);
|
|
|
|
led_cdev->flags &= ~LED_BLINK_ONESHOT;
|
|
led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
|
|
|
|
led_blink_setup(led_cdev, delay_on, delay_off);
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_blink_set);
|
|
|
|
void led_blink_set_oneshot(struct led_classdev *led_cdev,
|
|
unsigned long *delay_on,
|
|
unsigned long *delay_off,
|
|
int invert)
|
|
{
|
|
if ((led_cdev->flags & LED_BLINK_ONESHOT) &&
|
|
timer_pending(&led_cdev->blink_timer))
|
|
return;
|
|
|
|
led_cdev->flags |= LED_BLINK_ONESHOT;
|
|
led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
|
|
|
|
if (invert)
|
|
led_cdev->flags |= LED_BLINK_INVERT;
|
|
else
|
|
led_cdev->flags &= ~LED_BLINK_INVERT;
|
|
|
|
led_blink_setup(led_cdev, delay_on, delay_off);
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_blink_set_oneshot);
|
|
|
|
void led_stop_software_blink(struct led_classdev *led_cdev)
|
|
{
|
|
del_timer_sync(&led_cdev->blink_timer);
|
|
led_cdev->blink_delay_on = 0;
|
|
led_cdev->blink_delay_off = 0;
|
|
led_cdev->flags &= ~LED_BLINK_SW;
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_stop_software_blink);
|
|
|
|
void led_set_brightness(struct led_classdev *led_cdev,
|
|
enum led_brightness brightness)
|
|
{
|
|
/*
|
|
* If software blink is active, delay brightness setting
|
|
* until the next timer tick.
|
|
*/
|
|
if (led_cdev->flags & LED_BLINK_SW) {
|
|
/*
|
|
* If we need to disable soft blinking delegate this to the
|
|
* work queue task to avoid problems in case we are called
|
|
* from hard irq context.
|
|
*/
|
|
if (brightness == LED_OFF) {
|
|
led_cdev->flags |= LED_BLINK_DISABLE;
|
|
schedule_work(&led_cdev->set_brightness_work);
|
|
} else {
|
|
led_cdev->flags |= LED_BLINK_BRIGHTNESS_CHANGE;
|
|
led_cdev->blink_brightness = brightness;
|
|
}
|
|
return;
|
|
}
|
|
|
|
led_set_brightness_nosleep(led_cdev, brightness);
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_set_brightness);
|
|
|
|
void led_set_brightness_nopm(struct led_classdev *led_cdev,
|
|
enum led_brightness value)
|
|
{
|
|
/* Use brightness_set op if available, it is guaranteed not to sleep */
|
|
if (!__led_set_brightness(led_cdev, value))
|
|
return;
|
|
|
|
/* If brightness setting can sleep, delegate it to a work queue task */
|
|
led_cdev->delayed_set_value = value;
|
|
schedule_work(&led_cdev->set_brightness_work);
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_set_brightness_nopm);
|
|
|
|
void led_set_brightness_nosleep(struct led_classdev *led_cdev,
|
|
enum led_brightness value)
|
|
{
|
|
led_cdev->brightness = min(value, led_cdev->max_brightness);
|
|
|
|
if (led_cdev->flags & LED_SUSPENDED)
|
|
return;
|
|
|
|
led_set_brightness_nopm(led_cdev, led_cdev->brightness);
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_set_brightness_nosleep);
|
|
|
|
int led_set_brightness_sync(struct led_classdev *led_cdev,
|
|
enum led_brightness value)
|
|
{
|
|
if (led_cdev->blink_delay_on || led_cdev->blink_delay_off)
|
|
return -EBUSY;
|
|
|
|
led_cdev->brightness = min(value, led_cdev->max_brightness);
|
|
|
|
if (led_cdev->flags & LED_SUSPENDED)
|
|
return 0;
|
|
|
|
return __led_set_brightness_blocking(led_cdev, led_cdev->brightness);
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_set_brightness_sync);
|
|
|
|
int led_update_brightness(struct led_classdev *led_cdev)
|
|
{
|
|
int ret = 0;
|
|
|
|
if (led_cdev->brightness_get) {
|
|
ret = led_cdev->brightness_get(led_cdev);
|
|
if (ret >= 0) {
|
|
led_cdev->brightness = ret;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_update_brightness);
|
|
|
|
/* Caller must ensure led_cdev->led_access held */
|
|
void led_sysfs_disable(struct led_classdev *led_cdev)
|
|
{
|
|
lockdep_assert_held(&led_cdev->led_access);
|
|
|
|
led_cdev->flags |= LED_SYSFS_DISABLE;
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_sysfs_disable);
|
|
|
|
/* Caller must ensure led_cdev->led_access held */
|
|
void led_sysfs_enable(struct led_classdev *led_cdev)
|
|
{
|
|
lockdep_assert_held(&led_cdev->led_access);
|
|
|
|
led_cdev->flags &= ~LED_SYSFS_DISABLE;
|
|
}
|
|
EXPORT_SYMBOL_GPL(led_sysfs_enable);
|