Skip to contentSkip to conversation

SMU LED driver

PATCH In review Michael Hanselmann 3 participants 8 messages Dec 24, 2006 – Jan 15, 2007 Linux for power macintosh

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SMU LED driver

This patch adds a driver for the front LED in recent PowerMacs which have an SMU.

---

drivers/macintosh/Kconfig +9 -0
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Kconfig linux-2.6.19.1/drivers/macintosh/Kconfig
@@ -107,6 +107,15 @@ config PMAC_SMU
 	  on the "SMU" system control chip which replaces the old PMU.
 	  If you don't know, say Y.
 
+config PMAC_SMU_LED
+	tristate "Support for the PowerMac front LED"
+	depends on PMAC_SMU
+	select NEW_LEDS
+	select LEDS_CLASS
+	help
+	  Support the front LED on PowerMacs as a generic LED that can be
+	  triggered by any of the supported triggers.
+
 config PMAC_APM_EMU
 	tristate "APM emulation"
 	depends on PPC_PMAC && PPC32 && PM && ADB_PMU
drivers/macintosh/Makefile +1 -0
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Makefile linux-2.6.19.1/drivers/macintosh/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_PMAC_BACKLIGHT)	+= via-pmu-
 obj-$(CONFIG_ADB_CUDA)		+= via-cuda.o
 obj-$(CONFIG_PMAC_APM_EMU)	+= apm_emu.o
 obj-$(CONFIG_PMAC_SMU)		+= smu.o
+obj-$(CONFIG_PMAC_SMU_LED)	+= smu-led.o
 
 obj-$(CONFIG_ADB)		+= adb.o
 obj-$(CONFIG_ADB_MACII)		+= via-macii.o
drivers/macintosh/smu-led.c +91 -0

91 lines not on this page · raw message

#1 lore raw
Quoted 2 lines · Michael Hanselmann

This patch adds a driver for the front LED in recent PowerMacs which have an SMU.

As for the PMU driver, I'm pretty unhappy that it sycnhronously waits for the completion. The original code I wrote was fully asynchronous.

Ben.

Quoted 128 lines

---
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Kconfig linux-2.6.19.1/drivers/macintosh/Kconfig

drivers/macintosh/Kconfig +9 -0
@@ -107,6 +107,15 @@ config PMAC_SMU
 	  on the "SMU" system control chip which replaces the old PMU.
 	  If you don't know, say Y.
 
+config PMAC_SMU_LED
+	tristate "Support for the PowerMac front LED"
+	depends on PMAC_SMU
+	select NEW_LEDS
+	select LEDS_CLASS
+	help
+	  Support the front LED on PowerMacs as a generic LED that can be
+	  triggered by any of the supported triggers.
+
 config PMAC_APM_EMU
 	tristate "APM emulation"
 	depends on PPC_PMAC && PPC32 && PM && ADB_PMU

diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Makefile linux-2.6.19.1/drivers/macintosh/Makefile

drivers/macintosh/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-$(CONFIG_PMAC_BACKLIGHT)	+= via-pmu-
 obj-$(CONFIG_ADB_CUDA)		+= via-cuda.o
 obj-$(CONFIG_PMAC_APM_EMU)	+= apm_emu.o
 obj-$(CONFIG_PMAC_SMU)		+= smu.o
+obj-$(CONFIG_PMAC_SMU_LED)	+= smu-led.o
 
 obj-$(CONFIG_ADB)		+= adb.o
 obj-$(CONFIG_ADB_MACII)		+= via-macii.o

diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/smu-led.c linux-2.6.19.1/drivers/macintosh/smu-led.c

drivers/macintosh/smu-led.c +91 -0
@@ -0,0 +1,91 @@
+/*
+ * smu LED class device
+ *
+ * Copyright 2006 Michael Hanselmann <[email protected]>
+ *
+ * This code is based upon via-pmu-led, written by Johannes Berg, and a sample
+ * program written by Benjamin Herrenschmidt.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ * NON INFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/leds.h>
+#include <asm/smu.h>
+
+static void smu_led_set(struct led_classdev *led_cdev,
+		enum led_brightness brightness)
+{
+	struct smu_simple_cmd cmd;
+	DECLARE_COMPLETION_ONSTACK(comp);
+	unsigned int value;
+	int rc;
+
+	switch (brightness) {
+	case LED_OFF:
+		value = 0;
+		break;
+
+	case LED_FULL:
+		value = 1;
+		break;
+
+	default:
+		return;
+	}
+
+	rc = smu_queue_simple(&cmd, SMU_CMD_MISC_ee_COMMAND, 3,
+		smu_done_complete, &comp,
+		SMU_CMD_MISC_ee_LEDS_CTRL, 0x00, value);
+	if (rc) {
+		printk(KERN_ERR "smu-led: "
+			"Queueing failed, error %d\n", rc);
+		return;
+	}
+
+	wait_for_completion(&comp);
+
+	if (cmd.cmd.status != 0) {
+		printk(KERN_ERR "smu-led: Setting LED value failed\n");
+		return;
+	}
+}
+
+static struct led_classdev smu_led = {
+	.name = "smu-front-led",
+	.brightness_set = smu_led_set,
+};
+
+static int __init smu_led_init(void)
+{
+	if (!smu_present())
+		return -ENODEV;
+
+	return led_classdev_register(NULL, &smu_led);
+}
+
+static void __exit smu_led_exit(void)
+{
+}
+
+module_init(smu_led_init);
+module_exit(smu_led_exit);
+
+MODULE_AUTHOR("Michael Hanselmann <[email protected]>");
+MODULE_DESCRIPTION("Front LED support for SMU based PowerMacs");
+MODULE_LICENSE("GPL");
#2 lore raw
Quoted 6 lines · Benjamin Herrenschmidt
Quoted 2 lines · Michael Hanselmann

This patch adds a driver for the front LED in recent PowerMacs which have an SMU.

As for the PMU driver, I'm pretty unhappy that it sycnhronously waits for the completion. The original code I wrote was fully asynchronous.

That'd be my code. I can see if I can somehow get rid of that.

johannes

#3 lore raw
In reply to Benjamin Herrenschmidt
Quoted 6 lines · Benjamin Herrenschmidt
Quoted 2 lines · Michael Hanselmann

This patch adds a driver for the front LED in recent PowerMacs which have an SMU.

As for the PMU driver, I'm pretty unhappy that it sycnhronously waits for the completion. The original code I wrote was fully asynchronous.

Unfortunately, I can't see another way than doing it synchronously when one shouldn't use kmalloc(). The command (struct smu_simple_cmd) is kept on the stack. It contains the buffer used for both sending and retrieving data to/from the SMU. Making it module-global wouldn't work, because one request could conflict with another. struct smu_cmd can't be locked, so we can't check or wait for the status like via-pmu-led does. So, what should I do?

On another note, it seems like the PMU LED driver is already asynchronous.

---

drivers/macintosh/Kconfig +9 -0
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Kconfig linux-2.6.19.1/drivers/macintosh/Kconfig
@@ -107,6 +107,15 @@ config PMAC_SMU
 	  on the "SMU" system control chip which replaces the old PMU.
 	  If you don't know, say Y.
 
+config PMAC_SMU_LED
+	tristate "Support for the PowerMac front LED"
+	depends on PMAC_SMU
+	select NEW_LEDS
+	select LEDS_CLASS
+	help
+	  Support the front LED on PowerMacs as a generic LED that can be
+	  triggered by any of the supported triggers.
+
 config PMAC_APM_EMU
 	tristate "APM emulation"
 	depends on PPC_PMAC && PPC32 && PM && ADB_PMU
drivers/macintosh/Makefile +1 -0
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Makefile linux-2.6.19.1/drivers/macintosh/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_PMAC_BACKLIGHT)	+= via-pmu-
 obj-$(CONFIG_ADB_CUDA)		+= via-cuda.o
 obj-$(CONFIG_PMAC_APM_EMU)	+= apm_emu.o
 obj-$(CONFIG_PMAC_SMU)		+= smu.o
+obj-$(CONFIG_PMAC_SMU_LED)	+= smu-led.o
 
 obj-$(CONFIG_ADB)		+= adb.o
 obj-$(CONFIG_ADB_MACII)		+= via-macii.o
drivers/macintosh/smu-led.c +97 -0

97 lines not on this page · raw message

#4 lore raw
Quoted 16 lines · Michael Hanselmann
Quoted 6 lines · Benjamin Herrenschmidt
Quoted 2 lines · Michael Hanselmann

This patch adds a driver for the front LED in recent PowerMacs which have an SMU.

As for the PMU driver, I'm pretty unhappy that it sycnhronously waits for the completion. The original code I wrote was fully asynchronous.

Unfortunately, I can't see another way than doing it synchronously when one shouldn't use kmalloc(). The command (struct smu_simple_cmd) is kept on the stack. It contains the buffer used for both sending and retrieving data to/from the SMU. Making it module-global wouldn't work, because one request could conflict with another. struct smu_cmd can't be locked, so we can't check or wait for the status like via-pmu-led does. So, what should I do?

Quoted 2 lines

On another note, it seems like the PMU LED driver is already asynchronous.

Just have 1 request allocated once for all. Then, have a global set to what status you want the LED at. Once the completion of any request arrives, if the new status is different from what you want, send a new one to fix it up :-)

That's the easy way.

The old PMU code did something more subtle because it was based on the assumption that the LED was used to emit "pulses" based on HD activity.

Ben.

#5 lore raw
Quoted 4 lines · Benjamin Herrenschmidt

Just have 1 request allocated once for all. Then, have a global set to what status you want the LED at. Once the completion of any request arrives, if the new status is different from what you want, send a new one to fix it up :-)

Implemented that. See below.

There's a race condition between setting the LED value and unloading the module. smu_led_exit can't return an error. Is it possible to prevent unloading the module while an SMU request is still running, and if yes, how?

---

drivers/macintosh/Kconfig +9 -0
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Kconfig linux-2.6.19.1/drivers/macintosh/Kconfig
@@ -107,6 +107,15 @@ config PMAC_SMU
 	  on the "SMU" system control chip which replaces the old PMU.
 	  If you don't know, say Y.
 
+config PMAC_SMU_LED
+	tristate "Support for the PowerMac front LED"
+	depends on PMAC_SMU
+	select NEW_LEDS
+	select LEDS_CLASS
+	help
+	  Support the front LED on PowerMacs as a generic LED that can be
+	  triggered by any of the supported triggers.
+
 config PMAC_APM_EMU
 	tristate "APM emulation"
 	depends on PPC_PMAC && PPC32 && PM && ADB_PMU
drivers/macintosh/Makefile +1 -0
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Makefile linux-2.6.19.1/drivers/macintosh/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_PMAC_BACKLIGHT)	+= via-pmu-
 obj-$(CONFIG_ADB_CUDA)		+= via-cuda.o
 obj-$(CONFIG_PMAC_APM_EMU)	+= apm_emu.o
 obj-$(CONFIG_PMAC_SMU)		+= smu.o
+obj-$(CONFIG_PMAC_SMU_LED)	+= smu-led.o
 
 obj-$(CONFIG_ADB)		+= adb.o
 obj-$(CONFIG_ADB_MACII)		+= via-macii.o
drivers/macintosh/smu-led.c +132 -0

132 lines not on this page · raw message

#6 lore raw
Quoted 6 lines · Michael Hanselmann
Quoted 4 lines · Benjamin Herrenschmidt

Just have 1 request allocated once for all. Then, have a global set to what status you want the LED at. Once the completion of any request arrives, if the new status is different from what you want, send a new one to fix it up :-)

Quoted 6 lines

Implemented that. See below.

There's a race condition between setting the LED value and unloading the module. smu_led_exit can't return an error. Is it possible to prevent unloading the module while an SMU request is still running, and if yes, how?

No, you have to deal with it in the unload. You can for example wait for the SMU request to complete after setting wanted to -1, that sort of thing.

Also, use spin_lock_irqsave/restore or you'll deadlock if the SMU completion interrupt happens to interrupt your request function.

Ben.

#7 lore raw
Quoted 3 lines · Benjamin Herrenschmidt

No, you have to deal with it in the unload. You can for example wait for the SMU request to complete after setting wanted to -1, that sort of thing.

Done in the patch below.

Quoted 2 lines

Also, use spin_lock_irqsave/restore or you'll deadlock if the SMU completion interrupt happens to interrupt your request function.

Okay, didn't notice the done function is called in interrupt context.

---

drivers/macintosh/Kconfig +9 -0
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Kconfig linux-2.6.19.1/drivers/macintosh/Kconfig
@@ -107,6 +107,15 @@ config PMAC_SMU
 	  on the "SMU" system control chip which replaces the old PMU.
 	  If you don't know, say Y.
 
+config PMAC_SMU_LED
+	tristate "Support for the PowerMac front LED"
+	depends on PMAC_SMU
+	select NEW_LEDS
+	select LEDS_CLASS
+	help
+	  Support the front LED on PowerMacs as a generic LED that can be
+	  triggered by any of the supported triggers.
+
 config PMAC_APM_EMU
 	tristate "APM emulation"
 	depends on PPC_PMAC && PPC32 && PM && ADB_PMU
drivers/macintosh/Makefile +1 -0
diff -Nrup --exclude-from linux-exclude-from linux-2.6.19.1.orig/drivers/macintosh/Makefile linux-2.6.19.1/drivers/macintosh/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_PMAC_BACKLIGHT)	+= via-pmu-
 obj-$(CONFIG_ADB_CUDA)		+= via-cuda.o
 obj-$(CONFIG_PMAC_APM_EMU)	+= apm_emu.o
 obj-$(CONFIG_PMAC_SMU)		+= smu.o
+obj-$(CONFIG_PMAC_SMU_LED)	+= smu-led.o
 
 obj-$(CONFIG_ADB)		+= adb.o
 obj-$(CONFIG_ADB_MACII)		+= via-macii.o
drivers/macintosh/smu-led.c +147 -0

147 lines not on this page · raw message