Signed-off-by: Felix Fietkau <[email protected]>
---
compat/compat-2.6.37.c | 172 +++++++++++++++++++++++++++++++++++++++++
include/linux/compat-2.6.37.h | 13 +++
2 files changed, 185 insertions(+), 0 deletions(-)
diff --git a/compat/compat-2.6.37.c b/compat/compat-2.6.37.c
index 81f466f..669402d 100644
--- a/compat/compat-2.6.37.c
+++ b/compat/compat-2.6.37.c
@@ -152,3 +152,175 @@ int compat_genl_unregister_family(struct genl_family *family)
}
EXPORT_SYMBOL(compat_genl_unregister_family);
+#ifdef CONFIG_LEDS_CLASS
+
+#undef led_brightness_set
+#undef led_classdev_unregister
+
+spinlock_t led_lock;
+static LIST_HEAD(led_timers);
+
+struct led_timer {
+ struct list_head list;
+ struct led_classdev *cdev;
+ struct timer_list blink_timer;
+ unsigned long blink_delay_on;
+ unsigned long blink_delay_off;
+ int blink_brightness;
+};
+
+static void led_brightness_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness)
+{
+ led_cdev->brightness = brightness;
+ led_cdev->brightness_set(led_cdev, brightness);
+}
+
+static struct led_timer *led_get_timer(struct led_classdev *led_cdev)
+{
+ struct led_timer *p;
+ unsigned long flags;
+
+ spin_lock_irqsave(&led_lock, flags);
+ list_for_each_entry(p, &led_timers, list) {
+ if (p->cdev == led_cdev)
+ goto found;
+ }
+ p = NULL;
+found:
+ spin_unlock_irqrestore(&led_lock, flags);
+ return p;
+}
+
+static void led_stop_software_blink(struct led_timer *led)
+{
+ del_timer_sync(&led->blink_timer);
+ led->blink_delay_on = 0;
+ led->blink_delay_off = 0;
+}
+
+static void led_timer_function(unsigned long data)
+{
+ struct led_timer *led = (struct led_timer *)data;
+ unsigned long brightness;
+ unsigned long delay;
+
+ if (!led->blink_delay_on || !led->blink_delay_off) {
+ led->cdev->brightness_set(led->cdev, LED_OFF);
+ return;
+ }
+
+ brightness = led->cdev->brightness;
+ if (!brightness) {
+ /* Time to switch the LED on. */
+ brightness = led->blink_brightness;
+ delay = led->blink_delay_on;
+ } else {
+ /* Store the current brightness value to be able
+ * to restore it when the delay_off period is over.
+ */
+ led->blink_brightness = brightness;
+ brightness = LED_OFF;
+ delay = led->blink_delay_off;
+ }
+
+ led_brightness_set(led->cdev, brightness);
+ mod_timer(&led->blink_timer, jiffies + msecs_to_jiffies(delay));
+}
+
+static struct led_timer *led_new_timer(struct led_classdev *led_cdev)
+{
+ struct led_timer *led;
+ unsigned long flags;
+
+ led = kzalloc(sizeof(struct led_timer), GFP_ATOMIC);
+ if (!led)
+ return NULL;
+
+ led->cdev = led_cdev;
+ init_timer(&led->blink_timer);
+ led->blink_timer.function = led_timer_function;
+ led->blink_timer.data = (unsigned long) led;
+
+ spin_lock_irqsave(&led_lock, flags);
+ list_add(&led->list, &led_timers);
+ spin_unlock_irqrestore(&led_lock, flags);
+
+ return led;
+}
+
+void led_blink_set(struct led_classdev *led_cdev,
+ unsigned long *delay_on,
+ unsigned long *delay_off)
+{
+ struct led_timer *led = led_get_timer(led_cdev);
+ int current_brightness;
+
+ if (!led) {
+ led = led_new_timer(led_cdev);
+ if (!led)
+ return;
+ }
+
+ /* blink with 1 Hz as default if nothing specified */
+ if (!*delay_on && !*delay_off)
+ *delay_on = *delay_off = 500;
+
+ if (led->blink_delay_on == *delay_on &&
+ led->blink_delay_off == *delay_off)
+ return;
+
+ current_brightness = led_cdev->brightness;
+ if (current_brightness)
+ led->blink_brightness = current_brightness;
+ if (!led->blink_brightness)
+ led->blink_brightness = led_cdev->max_brightness;
+
+ led_stop_software_blink(led);
+ led->blink_delay_on = *delay_on;
+ led->blink_delay_off = *delay_off;
+
+ /* never on - don't blink */
+ if (!*delay_on)
+ return;
+
+ /* never off - just set to brightness */
+ if (!*delay_off) {
+ led_brightness_set(led_cdev, led->blink_brightness);
+ return;
+ }
+
+ mod_timer(&led->blink_timer, jiffies + 1);
+}
+EXPORT_SYMBOL(led_blink_set);
+
+void compat_led_brightness_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness)
+{
+ struct led_timer *led = led_get_timer(led_cdev);
+
+ if (led)
+ led_stop_software_blink(led);
+
+ return led_cdev->brightness_set(led_cdev, brightness);
+}
+EXPORT_SYMBOL(compat_led_brightness_set);
+
+void compat_led_classdev_unregister(struct led_classdev *led_cdev)
+{
+ struct led_timer *led = led_get_timer(led_cdev);
+ unsigned long flags;
+
+ if (led) {
+ del_timer_sync(&led->blink_timer);
+ spin_lock_irqsave(&led_lock, flags);
+ list_del(&led->list);
+ spin_unlock_irqrestore(&led_lock, flags);
+ kfree(led);
+ }
+
+ led_classdev_unregister(led_cdev);
+}
+EXPORT_SYMBOL(compat_led_classdev_unregister);
+
+#endif
diff --git a/include/linux/compat-2.6.37.h b/include/linux/compat-2.6.37.h
index 6c026a3..502d2b1 100644
--- a/include/linux/compat-2.6.37.h
+++ b/include/linux/compat-2.6.37.h
@@ -6,6 +6,7 @@
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37))
#include <linux/skbuff.h>
+#include <linux/leds.h>
#define SDIO_CLASS_BT_AMP 0x09 /* Type-A Bluetooth AMP interface */
@@ -93,6 +94,18 @@ int genl_unregister_family(struct genl_family *family);
#define genl_register_mc_group(_fam, _grp) genl_register_mc_group(&(_fam)->family, _grp)
#define genl_unregister_mc_group(_fam, _grp) genl_unregister_mc_group(&(_fam)->family, _grp)
+
+extern void led_blink_set(struct led_classdev *led_cdev,
+ unsigned long *delay_on,
+ unsigned long *delay_off);
+
+#define led_classdev_unregister compat_led_classdev_unregister
+extern void compat_led_classdev_unregister(struct led_classdev *led_cdev);
+
+#define led_brightness_set compat_led_brightness_set
+extern void compat_led_brightness_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness);
+
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) */
#endif /* LINUX_26_37_COMPAT_H */
--
1.7.3.2
From: Johannes Berg <[email protected]>
Felix's patch backported my software blink emulation,
but if the kernel is 2.6.25 or newer we can also try
the HW offload first.
Signed-off-by: Johannes Berg <[email protected]>
---
compat/compat-2.6.37.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- compat.orig/compat/compat-2.6.37.c 2010-11-28 13:05:01.000000000 +0100
+++ compat/compat/compat-2.6.37.c 2010-11-28 13:05:56.000000000 +0100
@@ -253,9 +253,16 @@ void led_blink_set(struct led_classdev *
unsigned long *delay_on,
unsigned long *delay_off)
{
- struct led_timer *led = led_get_timer(led_cdev);
+ struct led_timer *led;
int current_brightness;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
+ if (led_cdev->blink_set &&
+ !led_cdev->blink_set(led_cdev, delay_on, delay_off))
+ return;
+#endif
+
+ led = led_get_timer(led_cdev);
if (!led) {
led = led_new_timer(led_cdev);
if (!led)
On Sun, Nov 28, 2010 at 4:17 AM, Johannes Berg
<[email protected]> wrote:
> From: Johannes Berg <[email protected]>
>
> Felix's patch backported my software blink emulation,
> but if the kernel is 2.6.25 or newer we can also try
> the HW offload first.
>
> Signed-off-by: Johannes Berg <[email protected]>
Thanks! Applied and pushed,
Luis
On Sun, Nov 28, 2010 at 4:05 AM, Felix Fietkau <[email protected]> wrote:
> Signed-off-by: Felix Fietkau <[email protected]>
Applied and pushed! Thanks
Luis
> I think this was fixed in Hauke's patch
> 'compat: fix build with CONFIG_LEDS_CLASS=m'
>
> - Felix
You're right. Thanks.
> Signed-off-by: Felix Fietkau <[email protected]>
> ---
> +}
> +EXPORT_SYMBOL(compat_led_brightness_set);
> +
> +void compat_led_classdev_unregister(struct led_classdev
> *led_cdev)
> +{
I think this patch is causing problems in compat-wireless. It compiles fine, but some drivers fail to load:
# modprobe rtl8187
FATAL: Error inserting rtl8187 (/lib/modules/2.6.35-23-generic/updates/drivers/net/wireless/rtl818x/rtl8187.ko): Unknown symbol in module, or unknown parameter (see dmesg)
dmesg:
[22920.062471] rtl8187: Unknown symbol compat_led_classdev_unregister (err 0)
rt2x00 yields similar result:
WARNING: Error inserting rt2x00usb (/lib/modules/2.6.35-23-generic/updates/drivers/net/wireless/rt2x00/rt2x00usb.ko): Unknown symbol in module, or unknown parameter (see dmesg)
WARNING: Error inserting crc_ccitt (/lib/modules/2.6.35-23-generic/kernel/lib/crc-ccitt.ko): Unknown symbol in module, or unknown parameter (see dmesg)
WARNING: Error inserting rt2800lib (/lib/modules/2.6.35-23-generic/updates/drivers/net/wireless/rt2x00/rt2800lib.ko): Unknown symbol in module, or unknown parameter (see dmesg)
FATAL: Error inserting rt2800usb (/lib/modules/2.6.35-23-generic/updates/drivers/net/wireless/rt2x00/rt2800usb.ko): Unknown symbol in module, or unknown parameter (see dmesg)
dmesg:
[23093.077850] rt2x00lib: Unknown symbol compat_led_classdev_unregister (err 0)
Walter.
On 2010-12-02 2:14 PM, Walter Goldens wrote:
>> Signed-off-by: Felix Fietkau <[email protected]>
>> ---
>
>> +}
>> +EXPORT_SYMBOL(compat_led_brightness_set);
>> +
>> +void compat_led_classdev_unregister(struct led_classdev
>> *led_cdev)
>> +{
>
> I think this patch is causing problems in compat-wireless. It compiles fine, but some drivers fail to load:
I think this was fixed in Hauke's patch
'compat: fix build with CONFIG_LEDS_CLASS=m'
- Felix