From patchwork Sat Jun 25 22:10:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 918792 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5PMAuR3019534 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 25 Jun 2011 22:11:18 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qab3n-0003Zf-89; Sat, 25 Jun 2011 22:10:39 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qab3m-00031i-R0; Sat, 25 Jun 2011 22:10:38 +0000 Received: from mail-wy0-f177.google.com ([74.125.82.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qab3R-0002xs-EP for linux-arm-kernel@lists.infradead.org; Sat, 25 Jun 2011 22:10:18 +0000 Received: by wyf23 with SMTP id 23so3196016wyf.36 for ; Sat, 25 Jun 2011 15:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=tIx9cx5HbV4kwRc4pzNWbv9uOlsqiVhqF9u0KrtR1ks=; b=ZcwZn7rcUxKMkn3d75fH/c9kMNcz7JA/lJ6nuBkBabC6y4Wj07ttavOZ8GpxowjuhA +evcf48mYACCdBZuY3Qb53mFnNjHeJUZd7utywtF8SE91mtxS54elbblnsAC7r4tsaLi 0Tm9Fo4UBAaKvD4Wa5RqXnWpTbh+aQ4XYAl4k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=Yhm/bKCJS7J4zgiiqkmC0MS2wBS+EZvndTaMmBzTgV2Mm/y+6m6QjE+aTZWqgoqQVy GVNx3XmDjLa5e331l5h4/J3AYlZOCnC9E4v1Hbn6mkPBNxQlMy24Z3goGHBZ07WJ78Yp 6NXMur9kqk4671YCaLIKvmo3j0c8YQT79uQuk= Received: by 10.216.58.138 with SMTP id q10mr909065wec.95.1309039815905; Sat, 25 Jun 2011 15:10:15 -0700 (PDT) Received: from localhost ([89.127.177.74]) by mx.google.com with ESMTPS id fe4sm2174633wbb.11.2011.06.25.15.10.13 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 25 Jun 2011 15:10:15 -0700 (PDT) From: Bryan Wu To: linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, rpurdie@rpsys.net, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] leds: create a trigger for CPU activity Date: Sun, 26 Jun 2011 06:10:01 +0800 Message-Id: <1309039804-659-2-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309039804-659-1-git-send-email-bryan.wu@canonical.com> References: <1309039804-659-1-git-send-email-bryan.wu@canonical.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110625_181017_717305_F6448E15 X-CRM114-Status: GOOD ( 23.71 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.6 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [89.127.177.74 listed in dnsbl.sorbs.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cooloney[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 25 Jun 2011 22:11:18 +0000 (UTC) Attempting to consolidate the ARM LED code, this removes the custom RealView LED trigger code to turn LEDs on and off in response to CPU activity and replace it with a standard trigger. (bryan.wu@canonical.com: It moves arch/arm/kernel/leds.c syscore stubs into this trigger. It also provides ledtrig_cpu trigger event stub in . Although it was inspired by ARM work, it can be used in other arch.) Cc: Richard Purdie Signed-off-by: Linus Walleij Signed-off-by: Bryan Wu --- drivers/leds/Kconfig | 10 +++ drivers/leds/Makefile | 1 + drivers/leds/ledtrig-cpu.c | 145 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/leds.h | 15 +++++ 4 files changed, 171 insertions(+), 0 deletions(-) create mode 100644 drivers/leds/ledtrig-cpu.c diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 713d43b..186000a 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -446,6 +446,16 @@ config LEDS_TRIGGER_BACKLIGHT If unsure, say N. +config LEDS_TRIGGER_CPU + bool "LED CPU Trigger" + depends on LEDS_TRIGGERS + help + This allows LEDs to be controlled by active CPUs. This shows + the active CPUs across an array of LEDs so you can see what + CPUs are active on the system at any given moment. + + If unsure, say N. + config LEDS_TRIGGER_GPIO tristate "LED GPIO Trigger" depends on LEDS_TRIGGERS diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index bbfd2e3..5e70d2e 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -53,4 +53,5 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o +obj-$(CONFIG_LEDS_TRIGGER_CPU) += ledtrig-cpu.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o diff --git a/drivers/leds/ledtrig-cpu.c b/drivers/leds/ledtrig-cpu.c new file mode 100644 index 0000000..b0a89fd --- /dev/null +++ b/drivers/leds/ledtrig-cpu.c @@ -0,0 +1,145 @@ +/* + * ledtrig-cpu.c - LED trigger based on CPU activity + * + * Copyright 2011 Linus Walleij + * Copyright 2011 Bryan Wu + * + * 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 +#include +#include +#include +#include +#include +#include "leds.h" + +struct cpu_trig_data { + struct led_classdev *led; +}; + +static DEFINE_PER_CPU(struct cpu_trig_data *, cpu_triggers); + +void ledtrig_cpu(enum cpu_led_event ledevt) +{ + struct cpu_trig_data *trigdata = __get_cpu_var(cpu_triggers); + + if (!trigdata) + return; + + /* Locate the correct CPU LED */ + + switch (ledevt) { + case CPU_LED_START: + case CPU_LED_IDLE_START: + /* Will turn the LED on, max brightness */ + if (trigdata->led) + led_set_brightness(trigdata->led, + trigdata->led->max_brightness); + break; + + case CPU_LED_STOP: + case CPU_LED_IDLE_END: + case CPU_LED_HALTED: + /* Will turn the LED off */ + if (trigdata->led) + led_set_brightness(trigdata->led, LED_OFF); + break; + + default: + /* Will leave the LED as it is */ + break; + } +} +EXPORT_SYMBOL(ledtrig_cpu); + +static void cpu_trig_activate_cpu(void *data) +{ + struct cpu_trig_data *cpu_data; + struct led_classdev *led = data; + int my_cpu = smp_processor_id(); + unsigned long target_cpu = (unsigned long) led->trigger_data; + + if (target_cpu != my_cpu) + return; + + cpu_data = kzalloc(sizeof(*cpu_data), GFP_KERNEL); + if (!cpu_data) + return; + + dev_info(led->dev, "led %s indicate activity on CPU %d\n", + led->name, my_cpu); + + cpu_data->led = led; + __get_cpu_var(cpu_triggers) = cpu_data; +} + +static void cpu_trig_activate(struct led_classdev *led) +{ + on_each_cpu(cpu_trig_activate_cpu, led, 1); +} + +static void cpu_trig_deactivate(struct led_classdev *led) +{ + struct cpu_trig_data *cpu_data = led->trigger_data; + + if (cpu_data) + kfree(cpu_data); +} + +static struct led_trigger cpu_led_trigger = { + .name = "cpu", + .activate = cpu_trig_activate, + .deactivate = cpu_trig_deactivate, +}; + + +static int cpu_syscore_suspend(void) +{ + ledtrig_cpu(CPU_LED_STOP); + return 0; +} + +static void cpu_syscore_resume(void) +{ + ledtrig_cpu(CPU_LED_START); +} + +static void cpu_syscore_shutdown(void) +{ + ledtrig_cpu(CPU_LED_HALTED); +} + +static struct syscore_ops cpu_syscore_ops = { + .shutdown = cpu_syscore_shutdown, + .suspend = cpu_syscore_suspend, + .resume = cpu_syscore_resume, +}; + +static int __init cpu_trig_init(void) +{ + int ret; + + ret = led_trigger_register(&cpu_led_trigger); + if (!ret) + register_syscore_ops(&cpu_syscore_ops); + + return ret; +} +module_init(cpu_trig_init); + +static void __exit cpu_trig_exit(void) +{ + unregister_syscore_ops(&cpu_syscore_ops); + led_trigger_unregister(&cpu_led_trigger); +} +module_exit(cpu_trig_exit); + +MODULE_AUTHOR("Linus Walleij "); +MODULE_AUTHOR("Bryan Wu "); +MODULE_DESCRIPTION("CPU LED trigger"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/leds.h b/include/linux/leds.h index 5884def..d9e0ebc 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -210,4 +210,19 @@ struct gpio_led_platform_data { struct platform_device *gpio_led_register_device( int id, const struct gpio_led_platform_data *pdata); +#ifdef CONFIG_LEDS_TRIGGER_CPU +enum cpu_led_event { + CPU_LED_IDLE_START, + CPU_LED_IDLE_END, + CPU_LED_START, + CPU_LED_STOP, + CPU_LED_HALTED +}; + +/* Use this routine to handle LEDs */ +extern void ledtrig_cpu(enum cpu_led_event evt); +#else +#define ledtrig_cpu() do {} while(0) +#endif + #endif /* __LINUX_LEDS_H_INCLUDED */