From patchwork Wed Jul 6 12:34:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 949542 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p66Ca1mV025161 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Jul 2011 12:36:22 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QeRKQ-0004Fh-OG; Wed, 06 Jul 2011 12:35:43 +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 1QeRKQ-0002Oq-5O; Wed, 06 Jul 2011 12:35:42 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QeRKL-0002Nr-Tw for linux-arm-kernel@lists.infradead.org; Wed, 06 Jul 2011 12:35:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QeRKL-0002wm-EL; Wed, 06 Jul 2011 12:35:37 +0000 Received: from [116.227.244.46] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1QeRKG-0007PV-93; Wed, 06 Jul 2011 12:35:37 +0000 From: Bryan Wu To: linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, rpurdie@rpsys.net, linux@arm.linux.org.uk, nicolas.pitre@linaro.org, arnd@arndb.de, eric.y.miao@gmail.com, tony@atomide.com Subject: [PATCH 01/17] leds: create a trigger for CPU activity Date: Wed, 6 Jul 2011 20:34:31 +0800 Message-Id: <1309955687-19365-2-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.5 In-Reply-To: <1309955687-19365-1-git-send-email-bryan.wu@canonical.com> References: <1309955687-19365-1-git-send-email-bryan.wu@canonical.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110706_083538_220087_1F74D98D X-CRM114-Status: GOOD ( 20.36 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [91.189.90.139 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 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 (demeter2.kernel.org [140.211.167.43]); Wed, 06 Jul 2011 12:36:22 +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 | 144 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/leds.h | 15 +++++ 4 files changed, 170 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..4d63ada --- /dev/null +++ b/drivers/leds/ledtrig-cpu.c @@ -0,0 +1,144 @@ +/* + * 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; + + 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..94cdb9a 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(evt) do {} while (0) +#endif + #endif /* __LINUX_LEDS_H_INCLUDED */