From patchwork Sat Aug 4 16:51:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 143446 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1460741ljj; Sat, 4 Aug 2018 09:52:14 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdPbVWzAYMTLX5cHk7veMpH34JwO2SiA4/eZgu1LrjkkvRO5CO7k0pjrkz3rJJAi5qZ/QOG X-Received: by 2002:a63:f657:: with SMTP id u23-v6mr8349854pgj.258.1533401534623; Sat, 04 Aug 2018 09:52:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533401534; cv=none; d=google.com; s=arc-20160816; b=S76TUfUmnjb31bIsxRxwbsx8RBIaHiSCl8joKM3yHk+pitgS+gWQ5Xz4XkgzWoyNHB JPCkJj6DH/2hmvppuQxBGbJqUHO751kSd+J7a533UU66e2f0OTm0LNG5rNSW2ATOInbN Bz9t72e/3P7WojKOKKwkkisc6QgYrGOXX1Q5aVW2YIOHUaDWVWlE3n15uFkysZmXivzP BCZ45MoXGG2PEYs/sNnBjfPh6iYS/ZHs5cNRqxgoNjXZfOpHU2AUrGCutlhQOcd1nihS 0TLIsY1LzNMdPWWUJ9CIpdVDlioKld4+ogPQOY/AC2HGJww+cAuL/+H/O89Z1Y/P2cid 2A7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=3QhIuH2Ys5g3woVi7j65QFIiNw8ECvu4e8DmWnyMmLs=; b=RTovKFV3zivUMKNhPpOWtPaINDna9s2KECdqBV3hVRAeqPew0DMWVyjIN+uTkpFQIy PiHkD8fLqUkoRRd0s+O+8rMCfzDiMd4dtYMFOa5mcfE2LBF9kcQIcvsOK72kt54n228O T01I4YZcDr/WbFts7ElSjlAMfE5W4FnbzKWlCCpq9rUXQ3lPaiNg8XYnXVNmQyYaeOTx 0owMBxR838RryurgZlNWATKqCqmr1Pk77OX6a9WgWzH24IfRowDtIiObBlnzjskQ47tI TidCFTvxkoHZew/uEI0eaGdTrOyVdjvreh48eJk/rAksxiJPaeU81zvSomYoQUPWwN1q MD2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QTSOOW6g; spf=pass (google.com: best guess record for domain of linux-leds-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-leds-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e132-v6si8456730pfg.171.2018.08.04.09.52.14; Sat, 04 Aug 2018 09:52:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-leds-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QTSOOW6g; spf=pass (google.com: best guess record for domain of linux-leds-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-leds-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728495AbeHDSx3 (ORCPT + 1 other); Sat, 4 Aug 2018 14:53:29 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34455 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728054AbeHDSx3 (ORCPT ); Sat, 4 Aug 2018 14:53:29 -0400 Received: by mail-pf1-f195.google.com with SMTP id k19-v6so4825999pfi.1 for ; Sat, 04 Aug 2018 09:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=3QhIuH2Ys5g3woVi7j65QFIiNw8ECvu4e8DmWnyMmLs=; b=QTSOOW6g3vOe1vkDGMmk0eFX/B3GV86H3DKIqkTMYIxemsTHu3Wa9dxey3+YmP7Zgv Wg3mtzqZait8+BmeOuymD0QP77v0qxk3euE3psl1QSmKBT7i88NrQNjdQRh//rEQfhtz 10PWeInY80HjAEQ8EIjZr30T3MZ/LOwH44m5M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3QhIuH2Ys5g3woVi7j65QFIiNw8ECvu4e8DmWnyMmLs=; b=qcovIkFGixoeJHrAtumB2+e6WhahzNlBx+bZ5/OyJy+U11J61CdHU2FbROFBczZ9PU WSsLgt+0WXDQfOCoasSsbzgNmpfaE0igSD8vgMxJxPgbtzysdTGAjWyS8Gt+V1qjZ8td MxKdbIbRZk6k8gQfs95daDcbeAgg4gGqav8S/pTvCzAkFNC2KXdEOFTtrC32+BzpLyRE TS5Qw3fvTBeFpRl0j/tkqZkmw6Sg/Ie+uVB+x+VcCuv/+WX25ZkATQbqOYwMYEg2+FoA /GVAb1V0F2LSbWkxUuUa9MP1ulhXvsrQVtdMugpbNnyELgTsxfVKYew5s/NuQdXh81Y0 soOA== X-Gm-Message-State: AOUpUlFa93nAOm+yfK9Pi1vY8/8PaHApMUX+aDOQBxgPuM9HA7tjSpaX 1Cr76cDbUTDQE62DGXUI8V9+lVaUwfS70g== X-Received: by 2002:a63:338e:: with SMTP id z136-v6mr8115381pgz.171.1533401532797; Sat, 04 Aug 2018 09:52:12 -0700 (PDT) Received: from ubuntu.localdomain ([45.56.155.8]) by smtp.gmail.com with ESMTPSA id x80-v6sm17880733pfe.129.2018.08.04.09.52.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Aug 2018 09:52:12 -0700 (PDT) From: Baolin Wang To: jacek.anaszewski@gmail.com, pavel@ucw.cz Cc: rteysseyre@gmail.com, bjorn.andersson@linaro.org, baolin.wang@linaro.org, broonie@kernel.org, linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] leds: core: Introduce LED pattern trigger Date: Sat, 4 Aug 2018 09:51:36 -0700 Message-Id: <66b08912a2f9f9f013913162f65abc8f94c066cf.1533400193.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-leds-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org Some LED controllers have support for autonomously controlling brightness over time, according to some preprogrammed pattern or function. This patch adds pattern trigger that LED device can configure the pattern and trigger it. Signed-off-by: Raphael Teysseyre Signed-off-by: Baolin Wang --- Changes from v2: - Remove hardware_pattern boolen. - Chnage the pattern string format. Changes from v1: - Use ATTRIBUTE_GROUPS() to define attributes. - Introduce hardware_pattern flag to determine if software pattern or hardware pattern. - Re-implement pattern_trig_store_pattern() function. - Remove pattern_get() interface. - Improve comments. - Other small optimization. --- .../ABI/testing/sysfs-class-led-trigger-pattern | 21 ++ drivers/leds/trigger/Kconfig | 7 + drivers/leds/trigger/Makefile | 1 + drivers/leds/trigger/ledtrig-pattern.c | 270 +++++++++++++++++++++ include/linux/leds.h | 16 ++ 5 files changed, 315 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-pattern create mode 100644 drivers/leds/trigger/ledtrig-pattern.c -- 1.9.1 diff --git a/Documentation/ABI/testing/sysfs-class-led-trigger-pattern b/Documentation/ABI/testing/sysfs-class-led-trigger-pattern new file mode 100644 index 0000000..40afefe --- /dev/null +++ b/Documentation/ABI/testing/sysfs-class-led-trigger-pattern @@ -0,0 +1,21 @@ +What: /sys/class/leds//pattern +Date: August 2018 +KernelVersion: 4.19 +Description: + Specify a pattern for the LED, for LED hardware that support + altering the brightness as a function of time. + + The pattern is given by a series of tuples, of brightness and + duration (ms). The LED is expected to traverse the series and + each brightness value for the specified duration. Duration of + 0 means brightness should immediately change to new value. + + The format of the pattern values should be: + "brightness_1 duration_1 brightness_2 duration_2 brightness_3 + duration_3 ...". + +What: /sys/class/leds//repeat +Date: August 2018 +KernelVersion: 4.19 +Description: + Specify a pattern repeat number. 0 means repeat indefinitely. diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig index 4018af7..b76fc3c 100644 --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig @@ -129,4 +129,11 @@ config LEDS_TRIGGER_NETDEV This allows LEDs to be controlled by network device activity. If unsure, say Y. +config LEDS_TRIGGER_PATTERN + tristate "LED Pattern Trigger" + help + This allows LEDs to be controlled by a software or hardware pattern + which is a series of tuples, of brightness and duration (ms). + If unsure, say N + endif # LEDS_TRIGGERS diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile index f3cfe19..9bcb64e 100644 --- a/drivers/leds/trigger/Makefile +++ b/drivers/leds/trigger/Makefile @@ -13,3 +13,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o obj-$(CONFIG_LEDS_TRIGGER_CAMERA) += ledtrig-camera.o obj-$(CONFIG_LEDS_TRIGGER_PANIC) += ledtrig-panic.o obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o +obj-$(CONFIG_LEDS_TRIGGER_PATTERN) += ledtrig-pattern.o diff --git a/drivers/leds/trigger/ledtrig-pattern.c b/drivers/leds/trigger/ledtrig-pattern.c new file mode 100644 index 0000000..4e20454 --- /dev/null +++ b/drivers/leds/trigger/ledtrig-pattern.c @@ -0,0 +1,270 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * LED pattern trigger + * + * Idea discussed with Pavel Machek. Raphael Teysseyre implemented + * the first version, Baolin Wang simplified and improved the approach. + */ + +#include +#include +#include +#include +#include +#include + +#define MAX_PATTERNS 1024 + +struct pattern_trig_data { + struct led_classdev *led_cdev; + struct led_pattern patterns[MAX_PATTERNS]; + struct led_pattern *curr; + struct led_pattern *next; + struct mutex lock; + u32 npatterns; + u32 repeat; + bool is_indefinite; + struct timer_list timer; +}; + +static void pattern_trig_update_patterns(struct pattern_trig_data *data) +{ + data->curr = data->next; + if (!data->is_indefinite && data->curr == data->patterns) + data->repeat--; + + if (data->next == data->patterns + data->npatterns - 1) + data->next = data->patterns; + else + data->next++; +} + +static void pattern_trig_timer_function(struct timer_list *t) +{ + struct pattern_trig_data *data = from_timer(data, t, timer); + + mutex_lock(&data->lock); + + if (!data->is_indefinite && !data->repeat) { + mutex_unlock(&data->lock); + return; + } + + led_set_brightness(data->led_cdev, data->curr->brightness); + mod_timer(&data->timer, jiffies + msecs_to_jiffies(data->curr->delta_t)); + pattern_trig_update_patterns(data); + + mutex_unlock(&data->lock); +} + +static int pattern_trig_start_pattern(struct pattern_trig_data *data, + struct led_classdev *led_cdev) +{ + if (!data->npatterns) + return 0; + + if (led_cdev->pattern_set) { + return led_cdev->pattern_set(led_cdev, data->patterns, + data->npatterns, data->repeat); + } + + data->curr = data->patterns; + data->next = data->patterns + 1; + data->timer.expires = jiffies; + add_timer(&data->timer); + + return 0; +} + +static ssize_t pattern_trig_show_repeat(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct pattern_trig_data *data = led_cdev->trigger_data; + u32 repeat; + + mutex_lock(&data->lock); + + repeat = data->repeat; + + mutex_unlock(&data->lock); + + return scnprintf(buf, PAGE_SIZE, "%u\n", repeat); +} + +static ssize_t pattern_trig_store_repeat(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct pattern_trig_data *data = led_cdev->trigger_data; + unsigned long res; + int err; + + err = kstrtoul(buf, 10, &res); + if (err) + return err; + + if (!led_cdev->pattern_set) + del_timer_sync(&data->timer); + + mutex_lock(&data->lock); + + data->repeat = res; + + /* 0 means repeat indefinitely */ + if (!data->repeat) + data->is_indefinite = true; + else + data->is_indefinite = false; + + err = pattern_trig_start_pattern(data, led_cdev); + + mutex_unlock(&data->lock); + return err < 0 ? err : count; +} + +static DEVICE_ATTR(repeat, 0644, pattern_trig_show_repeat, + pattern_trig_store_repeat); + +static ssize_t pattern_trig_show_pattern(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct pattern_trig_data *data = led_cdev->trigger_data; + ssize_t count = 0; + int i; + + mutex_lock(&data->lock); + + if (!data->npatterns) + goto out; + + for (i = 0; i < data->npatterns; i++) { + count += scnprintf(buf + count, PAGE_SIZE - count, + "%d %d ", + data->patterns[i].brightness, + data->patterns[i].delta_t); + } + + buf[count - 1] = '\n'; + +out: + mutex_unlock(&data->lock); + return count; +} + +static ssize_t pattern_trig_store_pattern(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct pattern_trig_data *data = led_cdev->trigger_data; + int ccount, cr, offset = 0, err = 0; + + if (!led_cdev->pattern_set) + del_timer_sync(&data->timer); + + mutex_lock(&data->lock); + + data->npatterns = 0; + while (offset < count - 1 && data->npatterns < MAX_PATTERNS) { + cr = 0; + ccount = sscanf(buf + offset, "%d %d %n", + &data->patterns[data->npatterns].brightness, + &data->patterns[data->npatterns].delta_t, &cr); + if (ccount != 2) { + err = -EINVAL; + goto out; + } + + offset += cr; + data->npatterns++; + } + + err = pattern_trig_start_pattern(data, led_cdev); + +out: + mutex_unlock(&data->lock); + return err < 0 ? err : count; +} + +static DEVICE_ATTR(pattern, 0644, pattern_trig_show_pattern, + pattern_trig_store_pattern); + +static struct attribute *pattern_trig_attrs[] = { + &dev_attr_pattern.attr, + &dev_attr_repeat.attr, + NULL +}; +ATTRIBUTE_GROUPS(pattern_trig); + +static int pattern_trig_activate(struct led_classdev *led_cdev) +{ + struct pattern_trig_data *data; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + if (!!led_cdev->pattern_set ^ !!led_cdev->pattern_clear) { + dev_warn(led_cdev->dev, + "Hardware pattern ops validation failed\n"); + led_cdev->pattern_set = NULL; + led_cdev->pattern_clear = NULL; + } + + data->is_indefinite = true; + mutex_init(&data->lock); + data->led_cdev = led_cdev; + led_set_trigger_data(led_cdev, data); + timer_setup(&data->timer, pattern_trig_timer_function, 0); + led_cdev->activated = true; + + return 0; +} + +static void pattern_trig_deactivate(struct led_classdev *led_cdev) +{ + struct pattern_trig_data *data = led_cdev->trigger_data; + + if (!led_cdev->activated) + return; + + if (led_cdev->pattern_clear) + led_cdev->pattern_clear(led_cdev); + else + del_timer_sync(&data->timer); + + led_set_brightness(led_cdev, LED_OFF); + kfree(data); + led_cdev->activated = false; +} + +static struct led_trigger pattern_led_trigger = { + .name = "pattern", + .activate = pattern_trig_activate, + .deactivate = pattern_trig_deactivate, + .groups = pattern_trig_groups, +}; + +static int __init pattern_trig_init(void) +{ + return led_trigger_register(&pattern_led_trigger); +} + +static void __exit pattern_trig_exit(void) +{ + led_trigger_unregister(&pattern_led_trigger); +} + +module_init(pattern_trig_init); +module_exit(pattern_trig_exit); + +MODULE_AUTHOR("Raphael Teysseyre struct device; +struct led_pattern; /* * LED Core */ @@ -88,6 +89,11 @@ struct led_classdev { unsigned long *delay_on, unsigned long *delay_off); + int (*pattern_set)(struct led_classdev *led_cdev, + struct led_pattern *pattern, int len, + unsigned repeat); + int (*pattern_clear)(struct led_classdev *led_cdev); + struct device *dev; const struct attribute_group **groups; @@ -472,4 +478,14 @@ static inline void led_classdev_notify_brightness_hw_changed( struct led_classdev *led_cdev, enum led_brightness brightness) { } #endif +/** + * struct led_pattern - brightness value in a pattern + * @delta_t: delay until next entry, in milliseconds + * @brightness: brightness at time = 0 + */ +struct led_pattern { + int delta_t; + int brightness; +}; + #endif /* __LINUX_LEDS_H_INCLUDED */