3 files changed, 139 insertions, 47 deletions
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index 74eed6b74cd..d6641549105 100644
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
@@ -10,19 +10,32 @@
 #include <linux/kernel.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
+#include <linux/adb.h>
+#include <linux/pmu.h>
+#include <asm/atomic.h>
 #include <asm/prom.h>
 #include <asm/backlight.h>
 #define OLD_BACKLIGHT_MAX 15
 static void pmac_backlight_key_worker(void *data);
+static void pmac_backlight_set_legacy_worker(void *data);
 static DECLARE_WORK(pmac_backlight_key_work, pmac_backlight_key_worker, NULL);
+static DECLARE_WORK(pmac_backlight_set_legacy_work, pmac_backlight_set_legacy_worker, NULL);
-/* Although this variable is used in interrupt context, it makes no sense to
+/* Although these variables are used in interrupt context, it makes no sense to
- * protect it. No user is able to produce enough key events per second and
+ * protect them. No user is able to produce enough key events per second and
 * notice the errors that might happen.
 */
 static int pmac_backlight_key_queued;
+static int pmac_backlight_set_legacy_queued;
+/* The via-pmu code allows the backlight to be grabbed, in which case the
+ * in-kernel control of the brightness needs to be disabled. This should
+ * only be used by really old PowerBooks.
+ */
+static atomic_t kernel_backlight_disabled = ATOMIC_INIT(0);
 /* Protect the pmac_backlight variable */
 DEFINE_MUTEX(pmac_backlight_mutex);
@@ -82,6 +95,9 @@ int pmac_backlight_curve_lookup(struct fb_info *info, int value)
 static void pmac_backlight_key_worker(void *data)
 {
+        if (atomic_read(&kernel_backlight_disabled))
+                return;
        mutex_lock(&pmac_backlight_mutex);
        if (pmac_backlight) {
                struct backlight_properties *props;
@@ -107,8 +123,12 @@ static void pmac_backlight_key_worker(void *data)
        mutex_unlock(&pmac_backlight_mutex);
 }
+/* This function is called in interrupt context */
 void pmac_backlight_key(int direction)
 {
+        if (atomic_read(&kernel_backlight_disabled))
+                return;
        /* we can receive multiple interrupts here, but the scheduled work
         * will run only once, with the last value
         */
@@ -116,7 +136,7 @@ void pmac_backlight_key(int direction)
        schedule_work(&pmac_backlight_key_work);
 }
-int pmac_backlight_set_legacy_brightness(int brightness)
+static int __pmac_backlight_set_legacy_brightness(int brightness)
 {
        int error = -ENXIO;
@@ -145,6 +165,28 @@ int pmac_backlight_set_legacy_brightness(int brightness)
        return error;
 }
+static void pmac_backlight_set_legacy_worker(void *data)
+{
+        if (atomic_read(&kernel_backlight_disabled))
+                return;
+        __pmac_backlight_set_legacy_brightness(pmac_backlight_set_legacy_queued);
+}
+/* This function is called in interrupt context */
+void pmac_backlight_set_legacy_brightness_pmu(int brightness) {
+        if (atomic_read(&kernel_backlight_disabled))
+                return;
+        pmac_backlight_set_legacy_queued = brightness;
+        schedule_work(&pmac_backlight_set_legacy_work);
+}
+int pmac_backlight_set_legacy_brightness(int brightness)
+{
+        return __pmac_backlight_set_legacy_brightness(brightness);
+}
 int pmac_backlight_get_legacy_brightness()
 {
        int result = -ENXIO;
@@ -167,6 +209,16 @@ int pmac_backlight_get_legacy_brightness()
        return result;
 }
+void pmac_backlight_disable()
+{
+        atomic_inc(&kernel_backlight_disabled);
+}
+void pmac_backlight_enable()
+{
+        atomic_dec(&kernel_backlight_disabled);
+}
 EXPORT_SYMBOL_GPL(pmac_backlight);
 EXPORT_SYMBOL_GPL(pmac_backlight_mutex);
 EXPORT_SYMBOL_GPL(pmac_has_backlight_type);
diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c
index 871b002c9f9..9d73d0234c5 100644
--- a/arch/powerpc/platforms/powermac/bootx_init.c
+++ b/arch/powerpc/platforms/powermac/bootx_init.c
@@ -181,13 +181,18 @@ static void __init bootx_add_chosen_props(unsigned long base,
 }
 static void __init bootx_add_display_props(unsigned long base,
-                                           unsigned long *mem_end)
+                                           unsigned long *mem_end,
+                                           int has_real_node)
 {
        boot_infos_t *bi = bootx_info;
        u32 tmp;
-        bootx_dt_add_prop("linux,boot-display", NULL, 0, mem_end);
+        if (has_real_node) {
-        bootx_dt_add_prop("linux,opened", NULL, 0, mem_end);
+                bootx_dt_add_prop("linux,boot-display", NULL, 0, mem_end);
+                bootx_dt_add_prop("linux,opened", NULL, 0, mem_end);
+        } else
+                bootx_dt_add_prop("linux,bootx-noscreen", NULL, 0, mem_end);
        tmp = bi->dispDeviceDepth;
        bootx_dt_add_prop("linux,bootx-depth", &tmp, 4, mem_end);
        tmp = bi->dispDeviceRect[2] - bi->dispDeviceRect[0];
@@ -241,11 +246,6 @@ static void __init bootx_scan_dt_build_strings(unsigned long base,
                DBG(" detected display ! adding properties names !\n");
                bootx_dt_add_string("linux,boot-display", mem_end);
                bootx_dt_add_string("linux,opened", mem_end);
-                bootx_dt_add_string("linux,bootx-depth", mem_end);
-                bootx_dt_add_string("linux,bootx-width", mem_end);
-                bootx_dt_add_string("linux,bootx-height", mem_end);
-                bootx_dt_add_string("linux,bootx-linebytes", mem_end);
-                bootx_dt_add_string("linux,bootx-addr", mem_end);
                strncpy(bootx_disp_path, namep, 255);
        }
@@ -329,10 +329,13 @@ static void __init bootx_scan_dt_build_struct(unsigned long base,
                ppp = &pp->next;
        }
-        if (node == bootx_node_chosen)
+        if (node == bootx_node_chosen) {
                bootx_add_chosen_props(base, mem_end);
-        if (node == bootx_info->dispDeviceRegEntryOffset)
+                if (bootx_info->dispDeviceRegEntryOffset == 0)
-                bootx_add_display_props(base, mem_end);
+                        bootx_add_display_props(base, mem_end, 0);
+        }
+        else if (node == bootx_info->dispDeviceRegEntryOffset)
+                bootx_add_display_props(base, mem_end, 1);
        /* do all our children */
        cpp = &np->child;
@@ -374,6 +377,14 @@ static unsigned long __init bootx_flatten_dt(unsigned long start)
        mem_end += 4;
        bootx_dt_strend = mem_end;
        bootx_scan_dt_build_strings(base, 4, &mem_end);
+        /* Add some strings */
+        bootx_dt_add_string("linux,bootx-noscreen", &mem_end);
+        bootx_dt_add_string("linux,bootx-depth", &mem_end);
+        bootx_dt_add_string("linux,bootx-width", &mem_end);
+        bootx_dt_add_string("linux,bootx-height", &mem_end);
+        bootx_dt_add_string("linux,bootx-linebytes", &mem_end);
+        bootx_dt_add_string("linux,bootx-addr", &mem_end);
+        /* Wrap up strings */
        hdr->off_dt_strings = bootx_dt_strbase - mem_start;
        hdr->dt_strings_size = bootx_dt_strend - bootx_dt_strbase;
@@ -400,8 +411,15 @@ static unsigned long __init bootx_flatten_dt(unsigned long start)
        DBG("End of boot params: %x\n", mem_end);
        rsvmap[0] = mem_start;
        rsvmap[1] = mem_end;
-        rsvmap[2] = 0;
+        if (bootx_info->ramDisk) {
-        rsvmap[3] = 0;
+                rsvmap[2] = ((unsigned long)bootx_info) + bootx_info->ramDisk;
+                rsvmap[3] = rsvmap[2] + bootx_info->ramDiskSize;
+                rsvmap[4] = 0;
+                rsvmap[5] = 0;
+        } else {
+                rsvmap[2] = 0;
+                rsvmap[3] = 0;
+        }
        return (unsigned long)hdr;
 }
@@ -471,6 +489,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
        if (bi->dispDeviceDepth == 16)
                bi->dispDeviceDepth = 15;
 #ifdef CONFIG_BOOTX_TEXT
        ptr = (unsigned long)bi->logicalDisplayBase;
        ptr += bi->dispDeviceRect[1] * bi->dispDeviceRowBytes;
@@ -508,6 +527,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
 #ifdef CONFIG_BOOTX_TEXT
        btext_welcome(bi);
 #endif
        /* New BootX enters kernel with MMU off, i/os are not allowed
         * here. This hack will have been done by the boostrap anyway.
         */
@@ -530,12 +550,12 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
         */
        if (bi->version < 5) {
                space = bi->deviceTreeOffset + bi->deviceTreeSize;
-                if (bi->ramDisk)
+                if (bi->ramDisk >= space)
                        space = bi->ramDisk + bi->ramDiskSize;
        } else
                space = bi->totalParamsSize;
-        bootx_printf("Total space used by parameters & ramdisk: %x \n", space);
+        bootx_printf("Total space used by parameters & ramdisk: 0x%x \n", space);
        /* New BootX will have flushed all TLBs and enters kernel with
         * MMU switched OFF, so this should not be useful anymore.
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index f08a1451613..7b1156ea534 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -10,6 +10,8 @@
 * that is iMac G5 and latest single CPU desktop.
 */
+#undef DEBUG
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -30,13 +32,7 @@
 #include <asm/smu.h>
 #include <asm/pmac_pfunc.h>
-#undef DEBUG
+#define DBG(fmt...) pr_debug(fmt)
-#ifdef DEBUG
-#define DBG(fmt...) printk(fmt)
-#else
-#define DBG(fmt...)
-#endif
 /* see 970FX user manual */
@@ -82,8 +78,6 @@ static struct freq_attr* g5_cpu_freqs_attr[] = {
 /* Power mode data is an array of the 32 bits PCR values to use for
 * the various frequencies, retrieved from the device-tree
 */
-static u32 *g5_pmode_data;
-static int g5_pmode_max;
 static int g5_pmode_cur;
 static void (*g5_switch_volt)(int speed_mode);
@@ -93,6 +87,11 @@ static int (*g5_query_freq)(void);
 static DEFINE_MUTEX(g5_switch_mutex);
+#ifdef CONFIG_PMAC_SMU
+static u32 *g5_pmode_data;
+static int g5_pmode_max;
 static struct smu_sdbp_fvt *g5_fvt_table;       /* table of op. points */
 static int g5_fvt_count;                        /* number of op. points */
 static int g5_fvt_cur;                          /* current op. point */
@@ -210,6 +209,16 @@ static int g5_scom_query_freq(void)
 }
 /*
+ * Fake voltage switching for platforms with missing support
+ */
+static void g5_dummy_switch_volt(int speed_mode)
+{
+}
+#endif /* CONFIG_PMAC_SMU */
+/*
 * Platform function based voltage switching for PowerMac7,2 & 7,3
 */
@@ -248,6 +257,9 @@ static int g5_pfunc_switch_freq(int speed_mode)
        struct pmf_args args;
        u32 done = 0;
        unsigned long timeout;
+        int rc;
+        DBG("g5_pfunc_switch_freq(%d)\n", speed_mode);
        /* If frequency is going up, first ramp up the voltage */
        if (speed_mode < g5_pmode_cur)
@@ -255,9 +267,12 @@ static int g5_pfunc_switch_freq(int speed_mode)
        /* Do it */
        if (speed_mode == CPUFREQ_HIGH)
-                pmf_call_one(pfunc_cpu_setfreq_high, NULL);
+                rc = pmf_call_one(pfunc_cpu_setfreq_high, NULL);
        else
-                pmf_call_one(pfunc_cpu_setfreq_low, NULL);
+                rc = pmf_call_one(pfunc_cpu_setfreq_low, NULL);
+        if (rc)
+                printk(KERN_WARNING "cpufreq: pfunc switch error %d\n", rc);
        /* It's an irq GPIO so we should be able to just block here,
         * I'll do that later after I've properly tested the IRQ code for
@@ -296,13 +311,6 @@ static int g5_pfunc_query_freq(void)
        return val ? CPUFREQ_HIGH : CPUFREQ_LOW;
 }
-/*
- * Fake voltage switching for platforms with missing support
- */
-static void g5_dummy_switch_volt(int speed_mode)
-{
-}
 /*
 * Common interface to the cpufreq core
@@ -375,6 +383,8 @@ static struct cpufreq_driver g5_cpufreq_driver = {
 };
+#ifdef CONFIG_PMAC_SMU
 static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
 {
        struct device_node *cpunode;
@@ -525,6 +535,9 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
        return rc;
 }
+#endif /* CONFIG_PMAC_SMU */
 static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
 {
        struct device_node *cpuid = NULL, *hwclock = NULL, *cpunode = NULL;
@@ -533,6 +546,9 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
        u64 max_freq, min_freq, ih, il;
        int has_volt = 1, rc = 0;
+        DBG("cpufreq: Initializing for PowerMac7,2, PowerMac7,3 and"
+            " RackMac3,1...\n");
        /* Get first CPU node */
        for (cpunode = NULL;
             (cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
@@ -636,6 +652,15 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
         */
        ih = *((u32 *)(eeprom + 0x10));
        il = *((u32 *)(eeprom + 0x20));
+        /* Check for machines with no useful settings */
+        if (il == ih) {
+                printk(KERN_WARNING "cpufreq: No low frequency mode available"
+                       " on this model !\n");
+                rc = -ENODEV;
+                goto bail;
+        }
        min_freq = 0;
        if (ih != 0 && il != 0)
                min_freq = (max_freq * il) / ih;
@@ -643,7 +668,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
        /* Sanity check */
        if (min_freq >= max_freq || min_freq < 1000) {
                printk(KERN_ERR "cpufreq: Can't calculate low frequency !\n");
-                rc = -ENODEV;
+                rc = -ENXIO;
                goto bail;
        }
        g5_cpu_freqs[0].frequency = max_freq;
@@ -690,16 +715,10 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
        return rc;
 }
-static int __init g5_rm31_cpufreq_init(struct device_node *cpus)
-{
-        /* NYI */
-        return 0;
-}
 static int __init g5_cpufreq_init(void)
 {
        struct device_node *cpus;
-        int rc;
+        int rc = 0;
        cpus = of_find_node_by_path("/cpus");
        if (cpus == NULL) {
@@ -708,12 +727,13 @@ static int __init g5_cpufreq_init(void)
        }
        if (machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3"))
+            machine_is_compatible("PowerMac7,3") ||
+            machine_is_compatible("RackMac3,1"))
                rc = g5_pm72_cpufreq_init(cpus);
-        else if (machine_is_compatible("RackMac3,1"))
+#ifdef CONFIG_PMAC_SMU
-                rc = g5_rm31_cpufreq_init(cpus);
        else
                rc = g5_neo2_cpufreq_init(cpus);
+#endif /* CONFIG_PMAC_SMU */
        of_node_put(cpus);
        return rc;