Merge commit 'v2.6.28-rc2' into tracing/urgent

29 files changed, 366 insertions, 135 deletions

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index a9260e21451e..65730275e012 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -14,6 +14,15 @@
 #       help
 #         This option enables support for the CPCI405 board.
 
+config ACADIA
+        bool "Acadia"
+        depends on 40x
+        default n
+        select PPC40x_SIMPLE
+        select 405EZ
+        help
+          This option enables support for the AMCC 405EZ Acadia evaluation board.
+
 config EP405
         bool "EP405/EP405PC"
         depends on 40x
@@ -23,6 +32,14 @@ config EP405
         help
           This option enables support for the EP405/EP405PC boards.
 
+config HCU4
+        bool "Hcu4"
+        depends on 40x
+        default y
+        select 405GPR
+        help
+          This option enables support for the Nestal Maschinen HCU4 board.
+
 config KILAUEA
         bool "Kilauea"
         depends on 40x
@@ -93,6 +110,13 @@ config XILINX_VIRTEX_GENERIC_BOARD
           Most Virtex designs should use this unless it needs to do some
           special configuration at board probe time.
 
+config PPC40x_SIMPLE
+        bool "Simple PowerPC 40x board support"
+        depends on 40x
+        default n
+        help
+          This option enables the simple PowerPC 40x platform support.
+
 # 40x specific CPU modules, selected based on the board above.
 config NP405H
         bool
@@ -118,6 +142,12 @@ config 405EX
         select IBM_NEW_EMAC_EMAC4
         select IBM_NEW_EMAC_RGMII
 
+config 405EZ
+        bool
+        select IBM_NEW_EMAC_NO_FLOW_CTRL
+        select IBM_NEW_EMAC_MAL_CLR_ICINTSTAT
+        select IBM_NEW_EMAC_MAL_COMMON_ERR
+
 config 405GPR
         bool
 
@@ -139,6 +169,14 @@ config STB03xxx
         select IBM405_ERR77
         select IBM405_ERR51
 
+config PPC4xx_GPIO
+        bool "PPC4xx GPIO support"
+        depends on 40x
+        select ARCH_REQUIRE_GPIOLIB
+        select GENERIC_GPIO
+        help
+          Enable gpiolib support for ppc40x based boards
+
 # 40x errata/workaround config symbols, selected by the CPU models above
 
 # All 405-based cores up until the 405GPR and 405EP have this errata.
diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile
index 5533a5c8ce4e..9bab76a652a6 100644
--- a/arch/powerpc/platforms/40x/Makefile
+++ b/arch/powerpc/platforms/40x/Makefile
@@ -1,5 +1,7 @@
 obj-$(CONFIG_KILAUEA)                           += kilauea.o
+obj-$(CONFIG_HCU4)                              += hcu4.o
 obj-$(CONFIG_MAKALU)                            += makalu.o
 obj-$(CONFIG_WALNUT)                            += walnut.o
 obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)       += virtex.o
 obj-$(CONFIG_EP405)                             += ep405.o
+obj-$(CONFIG_PPC40x_SIMPLE)             += ppc40x_simple.o
diff --git a/arch/powerpc/platforms/40x/hcu4.c b/arch/powerpc/platforms/40x/hcu4.c
new file mode 100644
index 000000000000..60b2afecab75
--- /dev/null
+++ b/arch/powerpc/platforms/40x/hcu4.c
@@ -0,0 +1,61 @@
+/*
+ * Architecture- / platform-specific boot-time initialization code for
+ * IBM PowerPC 4xx based boards. Adapted from original
+ * code by Gary Thomas, Cort Dougan <cort@fsmlabs.com>, and Dan Malek
+ * <dan@net4x.com>.
+ *
+ * Copyright(c) 1999-2000 Grant Erickson <grant@lcse.umn.edu>
+ *
+ * Rewritten and ported to the merged powerpc tree:
+ * Copyright 2007 IBM Corporation
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+#include <asm/ppc4xx.h>
+
+static __initdata struct of_device_id hcu4_of_bus[] = {
+        { .compatible = "ibm,plb3", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        {},
+};
+
+static int __init hcu4_device_probe(void)
+{
+        of_platform_bus_probe(NULL, hcu4_of_bus, NULL);
+        return 0;
+}
+machine_device_initcall(hcu4, hcu4_device_probe);
+
+static int __init hcu4_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "netstal,hcu4"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(hcu4) {
+        .name                   = "HCU4",
+        .probe                  = hcu4_probe,
+        .progress               = udbg_progress,
+        .init_IRQ               = uic_init_tree,
+        .get_irq                = uic_get_irq,
+        .restart                = ppc4xx_reset_system,
+        .calibrate_decr         = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
new file mode 100644
index 000000000000..4498a86b46c3
--- /dev/null
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -0,0 +1,80 @@
+/*
+ * Generic PowerPC 40x platform support
+ *
+ * Copyright 2008 IBM Corporation
+ *
+ * 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; version 2 of the License.
+ *
+ * This implements simple platform support for PowerPC 44x chips.  This is
+ * mostly used for eval boards or other simple and "generic" 44x boards.  If
+ * your board has custom functions or hardware, then you will likely want to
+ * implement your own board.c file to accommodate it.
+ */
+
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/udbg.h>
+#include <asm/uic.h>
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+
+static __initdata struct of_device_id ppc40x_of_bus[] = {
+        { .compatible = "ibm,plb3", },
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init ppc40x_device_probe(void)
+{
+        of_platform_bus_probe(NULL, ppc40x_of_bus, NULL);
+
+        return 0;
+}
+machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
+
+/* This is the list of boards that can be supported by this simple
+ * platform code.  This does _not_ mean the boards are compatible,
+ * as they most certainly are not from a device tree perspective.
+ * However, their differences are handled by the device tree and the
+ * drivers and therefore they don't need custom board support files.
+ *
+ * Again, if your board needs to do things differently then create a
+ * board.c file for it rather than adding it to this list.
+ */
+static char *board[] __initdata = {
+        "amcc,acadia"
+};
+
+static int __init ppc40x_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        int i = 0;
+
+        for (i = 0; i < ARRAY_SIZE(board); i++) {
+                if (of_flat_dt_is_compatible(root, board[i])) {
+                        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+define_machine(ppc40x_simple) {
+        .name = "PowerPC 40x Platform",
+        .probe = ppc40x_probe,
+        .progress = udbg_progress,
+        .init_IRQ = uic_init_tree,
+        .get_irq = uic_get_irq,
+        .restart = ppc4xx_reset_system,
+        .calibrate_decr = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 79c1154f88d4..3496bc05058e 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -167,6 +167,14 @@ config PPC44x_SIMPLE
         help
           This option enables the simple PowerPC 44x platform support.
 
+config PPC4xx_GPIO
+        bool "PPC4xx GPIO support"
+        depends on 44x
+        select ARCH_REQUIRE_GPIOLIB
+        select GENERIC_GPIO
+        help
+          Enable gpiolib support for ppc440 based boards
+
 # 44x specific CPU modules, selected based on the board above.
 config 440EP
         bool
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index 044b4e6e8743..ae7c34f37e1c 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -99,11 +99,14 @@ mpc5200_setup_xlb_arbiter(void)
         out_be32(&xlb->master_pri_enable, 0xff);
         out_be32(&xlb->master_priority, 0x11111111);
 
-        /* Disable XLB pipelining
+        /*
+         * Disable XLB pipelining
          * (cfr errate 292. We could do this only just before ATA PIO
          *  transaction and re-enable it afterwards ...)
+         * Not needed on MPC5200B.
          */
-        out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
+        if ((mfspr(SPRN_SVR) & MPC5200_SVR_MASK) == MPC5200_SVR)
+                out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
 
         iounmap(xlb);
 }
diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c
index 8a3b117b6ce2..81cee7bbf2d2 100644
--- a/arch/powerpc/platforms/85xx/ksi8560.c
+++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -193,7 +193,6 @@ static void __init ksi8560_setup_arch(void)
 static void ksi8560_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
-        uint memsize = total_memory;
 
         pvid = mfspr(SPRN_PVR);
         svid = mfspr(SPRN_SVR);
@@ -215,9 +214,6 @@ static void ksi8560_show_cpuinfo(struct seq_file *m)
         /* Display cpu Pll setting */
         phid1 = mfspr(SPRN_HID1);
         seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-        /* Display the amount of memory */
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 0293e3d3580f..21f009023e26 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -207,7 +207,6 @@ static void __init mpc85xx_ads_setup_arch(void)
 static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
-        uint memsize = total_memory;
 
         pvid = mfspr(SPRN_PVR);
         svid = mfspr(SPRN_SVR);
@@ -219,9 +218,6 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
         /* Display cpu Pll setting */
         phid1 = mfspr(SPRN_HID1);
         seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-        /* Display the amount of memory */
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 50d7ea8f922b..aeb6a5bc5522 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -307,7 +307,6 @@ static void __init mpc85xx_cds_setup_arch(void)
 static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
-        uint memsize = total_memory;
 
         pvid = mfspr(SPRN_PVR);
         svid = mfspr(SPRN_SVR);
@@ -320,9 +319,6 @@ static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)
         /* Display cpu Pll setting */
         phid1 = mfspr(SPRN_HID1);
         seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-        /* Display the amount of memory */
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 
diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c
index b9246ea0928a..7ec77ce12dad 100644
--- a/arch/powerpc/platforms/85xx/sbc8548.c
+++ b/arch/powerpc/platforms/85xx/sbc8548.c
@@ -136,7 +136,6 @@ static void __init sbc8548_setup_arch(void)
 static void sbc8548_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
-        uint memsize = total_memory;
 
         pvid = mfspr(SPRN_PVR);
         svid = mfspr(SPRN_SVR);
@@ -149,9 +148,6 @@ static void sbc8548_show_cpuinfo(struct seq_file *m)
         /* Display cpu Pll setting */
         phid1 = mfspr(SPRN_HID1);
         seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-        /* Display the amount of memory */
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c
index 0c9a856f66b6..472f254a19d2 100644
--- a/arch/powerpc/platforms/85xx/sbc8560.c
+++ b/arch/powerpc/platforms/85xx/sbc8560.c
@@ -194,7 +194,6 @@ static void __init sbc8560_setup_arch(void)
 static void sbc8560_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
-        uint memsize = total_memory;
 
         pvid = mfspr(SPRN_PVR);
         svid = mfspr(SPRN_SVR);
@@ -206,9 +205,6 @@ static void sbc8560_show_cpuinfo(struct seq_file *m)
         /* Display cpu Pll setting */
         phid1 = mfspr(SPRN_HID1);
         seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-        /* Display the amount of memory */
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index 18499d7c9d9e..0cca8f5cb272 100644
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -130,7 +130,6 @@ static void __init stx_gp3_setup_arch(void)
 static void stx_gp3_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
-        uint memsize = total_memory;
 
         pvid = mfspr(SPRN_PVR);
         svid = mfspr(SPRN_SVR);
@@ -142,9 +141,6 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)
         /* Display cpu Pll setting */
         phid1 = mfspr(SPRN_HID1);
         seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-        /* Display the amount of memory */
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index d850880d6964..2933a8e827d9 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -138,7 +138,6 @@ static void __init tqm85xx_setup_arch(void)
 static void tqm85xx_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
-        uint memsize = total_memory;
 
         pvid = mfspr(SPRN_PVR);
         svid = mfspr(SPRN_SVR);
@@ -150,9 +149,6 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m)
         /* Display cpu Pll setting */
         phid1 = mfspr(SPRN_HID1);
         seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-        /* Display the amount of memory */
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index 821c45fac18b..fb371f5ce132 100644
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -127,7 +127,6 @@ static unsigned int gef_sbc610_get_fpga_rev(void)
 
 static void gef_sbc610_show_cpuinfo(struct seq_file *m)
 {
-        uint memsize = total_memory;
         uint svid = mfspr(SPRN_SVR);
 
         seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
@@ -137,7 +136,6 @@ static void gef_sbc610_show_cpuinfo(struct seq_file *m)
         seq_printf(m, "FPGA Revision\t: %u\n", gef_sbc610_get_fpga_rev());
 
         seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev)
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 2672829a71dc..27e0e682d8e1 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -101,13 +101,11 @@ mpc86xx_hpcn_setup_arch(void)
 static void
 mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
 {
-        uint memsize = total_memory;
         uint svid = mfspr(SPRN_SVR);
 
         seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
 
         seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index da677a74e2d1..5fd7ed40986f 100644
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -63,13 +63,11 @@ sbc8641_setup_arch(void)
 static void
 sbc8641_show_cpuinfo(struct seq_file *m)
 {
-        uint memsize = total_memory;
         uint svid = mfspr(SPRN_SVR);
 
         seq_printf(m, "Vendor\t\t: Wind River Systems\n");
 
         seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 2a14b052abcd..665af1c4195b 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -21,6 +21,7 @@
 #include <asm/machdep.h>
 #include <asm/rtas.h>
 #include <asm/cell-regs.h>
+#include <asm/kdump.h>
 
 #include "ras.h"
 
@@ -111,9 +112,8 @@ static int __init cbe_ptcal_enable_on_node(int nid, int order)
         int ret = -ENOMEM;
         unsigned long addr;
 
-#ifdef CONFIG_CRASH_DUMP
-        rtas_call(ptcal_stop_tok, 1, 1, NULL, nid);
-#endif
+        if (__kdump_flag)
+                rtas_call(ptcal_stop_tok, 1, 1, NULL, nid);
 
         area = kmalloc(sizeof(*area), GFP_KERNEL);
         if (!area)
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index efb3964457b1..c0d86e1f56ea 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -54,8 +54,8 @@
 #endif
 
 /*
- * The primary thread of each non-boot processor is recorded here before
- * smp init.
+ * The Primary thread of each non-boot processor was started from the OF client
+ * interface by prom_hold_cpus and is spinning on secondary_hold_spinloop.
  */
 static cpumask_t of_spin_map;
 
@@ -208,11 +208,7 @@ void __init smp_init_cell(void)
         /* Mark threads which are still spinning in hold loops. */
         if (cpu_has_feature(CPU_FTR_SMT)) {
                 for_each_present_cpu(i) {
-                        if (i % 2 == 0)
-                                /*
-                                 * Even-numbered logical cpus correspond to
-                                 * primary threads.
-                                 */
+                        if (cpu_thread_in_core(i) == 0)
                                 cpu_set(i, of_spin_map);
                 }
         } else {
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 010a51f59796..b73c369cc6f1 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -548,6 +548,11 @@ spufs_regs_read(struct file *file, char __user *buffer,
         int ret;
         struct spu_context *ctx = file->private_data;
 
+        /* pre-check for file position: if we'd return EOF, there's no point
+         * causing a deschedule */
+        if (*pos >= sizeof(ctx->csa.lscsa->gprs))
+                return 0;
+
         ret = spu_acquire_saved(ctx);
         if (ret)
                 return ret;
@@ -2426,38 +2431,49 @@ static inline int spufs_switch_log_avail(struct spu_context *ctx)
 static int spufs_switch_log_open(struct inode *inode, struct file *file)
 {
         struct spu_context *ctx = SPUFS_I(inode)->i_ctx;
+        int rc;
+
+        rc = spu_acquire(ctx);
+        if (rc)
+                return rc;
 
-        /*
-         * We (ab-)use the mapping_lock here because it serves the similar
-         * purpose for synchronizing open/close elsewhere.  Maybe it should
-         * be renamed eventually.
-         */
-        mutex_lock(&ctx->mapping_lock);
         if (ctx->switch_log) {
-                spin_lock(&ctx->switch_log->lock);
-                ctx->switch_log->head = 0;
-                ctx->switch_log->tail = 0;
-                spin_unlock(&ctx->switch_log->lock);
-        } else {
-                /*
-                 * We allocate the switch log data structures on first open.
-                 * They will never be free because we assume a context will
-                 * be traced until it goes away.
-                 */
-                ctx->switch_log = kzalloc(sizeof(struct switch_log) +
-                        SWITCH_LOG_BUFSIZE * sizeof(struct switch_log_entry),
-                        GFP_KERNEL);
-                if (!ctx->switch_log)
-                        goto out;
-                spin_lock_init(&ctx->switch_log->lock);
-                init_waitqueue_head(&ctx->switch_log->wait);
+                rc = -EBUSY;
+                goto out;
         }
-        mutex_unlock(&ctx->mapping_lock);
+
+        ctx->switch_log = kmalloc(sizeof(struct switch_log) +
+                SWITCH_LOG_BUFSIZE * sizeof(struct switch_log_entry),
+                GFP_KERNEL);
+
+        if (!ctx->switch_log) {
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        ctx->switch_log->head = ctx->switch_log->tail = 0;
+        init_waitqueue_head(&ctx->switch_log->wait);
+        rc = 0;
+
+out:
+        spu_release(ctx);
+        return rc;
+}
+
+static int spufs_switch_log_release(struct inode *inode, struct file *file)
+{
+        struct spu_context *ctx = SPUFS_I(inode)->i_ctx;
+        int rc;
+
+        rc = spu_acquire(ctx);
+        if (rc)
+                return rc;
+
+        kfree(ctx->switch_log);
+        ctx->switch_log = NULL;
+        spu_release(ctx);
 
         return 0;
- out:
-        mutex_unlock(&ctx->mapping_lock);
-        return -ENOMEM;
 }
 
 static int switch_log_sprint(struct spu_context *ctx, char *tbuf, int n)
@@ -2485,42 +2501,54 @@ static ssize_t spufs_switch_log_read(struct file *file, char __user *buf,
         if (!buf || len < 0)
                 return -EINVAL;
 
+        error = spu_acquire(ctx);
+        if (error)
+                return error;
+
         while (cnt < len) {
                 char tbuf[128];
                 int width;
 
-                if (file->f_flags & O_NONBLOCK) {
-                        if (spufs_switch_log_used(ctx) <= 0)
-                                return cnt ? cnt : -EAGAIN;
-                } else {
-                        /* Wait for data in buffer */
-                        error = wait_event_interruptible(ctx->switch_log->wait,
-                                        spufs_switch_log_used(ctx) > 0);
-                        if (error)
+                if (spufs_switch_log_used(ctx) == 0) {
+                        if (cnt > 0) {
+                                /* If there's data ready to go, we can
+                                 * just return straight away */
+                                break;
+
+                        } else if (file->f_flags & O_NONBLOCK) {
+                                error = -EAGAIN;
                                 break;
-                }
 
-                spin_lock(&ctx->switch_log->lock);
-                if (ctx->switch_log->head == ctx->switch_log->tail) {
-                        /* multiple readers race? */
-                        spin_unlock(&ctx->switch_log->lock);
-                        continue;
+                        } else {
+                                /* spufs_wait will drop the mutex and
+                                 * re-acquire, but since we're in read(), the
+                                 * file cannot be _released (and so
+                                 * ctx->switch_log is stable).
+                                 */
+                                error = spufs_wait(ctx->switch_log->wait,
+                                                spufs_switch_log_used(ctx) > 0);
+
+                                /* On error, spufs_wait returns without the
+                                 * state mutex held */
+                                if (error)
+                                        return error;
+
+                                /* We may have had entries read from underneath
+                                 * us while we dropped the mutex in spufs_wait,
+                                 * so re-check */
+                                if (spufs_switch_log_used(ctx) == 0)
+                                        continue;
+                        }
                 }
 
                 width = switch_log_sprint(ctx, tbuf, sizeof(tbuf));
-                if (width < len) {
+                if (width < len)
                         ctx->switch_log->tail =
                                 (ctx->switch_log->tail + 1) %
                                  SWITCH_LOG_BUFSIZE;
-                }
-
-                spin_unlock(&ctx->switch_log->lock);
-
-                /*
-                 * If the record is greater than space available return
-                 * partial buffer (so far)
-                 */
-                if (width >= len)
+                else
+                        /* If the record is greater than space available return
+                         * partial buffer (so far) */
                         break;
 
                 error = copy_to_user(buf + cnt, tbuf, width);
@@ -2529,6 +2557,8 @@ static ssize_t spufs_switch_log_read(struct file *file, char __user *buf,
                 cnt += width;
         }
 
+        spu_release(ctx);
+
         return cnt == 0 ? error : cnt;
 }
 
@@ -2537,29 +2567,41 @@ static unsigned int spufs_switch_log_poll(struct file *file, poll_table *wait)
         struct inode *inode = file->f_path.dentry->d_inode;
         struct spu_context *ctx = SPUFS_I(inode)->i_ctx;
         unsigned int mask = 0;
+        int rc;
 
         poll_wait(file, &ctx->switch_log->wait, wait);
 
+        rc = spu_acquire(ctx);
+        if (rc)
+                return rc;
+
         if (spufs_switch_log_used(ctx) > 0)
                 mask |= POLLIN;
 
+        spu_release(ctx);
+
         return mask;
 }
 
 static const struct file_operations spufs_switch_log_fops = {
-        .owner  = THIS_MODULE,
-        .open   = spufs_switch_log_open,
-        .read   = spufs_switch_log_read,
-        .poll   = spufs_switch_log_poll,
+        .owner          = THIS_MODULE,
+        .open           = spufs_switch_log_open,
+        .read           = spufs_switch_log_read,
+        .poll           = spufs_switch_log_poll,
+        .release        = spufs_switch_log_release,
 };
 
+/**
+ * Log a context switch event to a switch log reader.
+ *
+ * Must be called with ctx->state_mutex held.
+ */
 void spu_switch_log_notify(struct spu *spu, struct spu_context *ctx,
                 u32 type, u32 val)
 {
         if (!ctx->switch_log)
                 return;
 
-        spin_lock(&ctx->switch_log->lock);
         if (spufs_switch_log_avail(ctx) > 1) {
                 struct switch_log_entry *p;
 
@@ -2573,7 +2615,6 @@ void spu_switch_log_notify(struct spu *spu, struct spu_context *ctx,
                 ctx->switch_log->head =
                         (ctx->switch_log->head + 1) % SWITCH_LOG_BUFSIZE;
         }
-        spin_unlock(&ctx->switch_log->lock);
 
         wake_up(&ctx->switch_log->wait);
 }
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index c9bb7cfd3dca..c58bd36b0c5b 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -249,6 +249,7 @@ static int spu_run_fini(struct spu_context *ctx, u32 *npc,
 
         spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED);
         clear_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags);
+        spu_switch_log_notify(NULL, ctx, SWITCH_LOG_EXIT, *status);
         spu_release(ctx);
 
         if (signal_pending(current))
@@ -417,8 +418,6 @@ long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *event)
         ret = spu_run_fini(ctx, npc, &status);
         spu_yield(ctx);
 
-        spu_switch_log_notify(NULL, ctx, SWITCH_LOG_EXIT, status);
-
         if ((status & SPU_STATUS_STOPPED_BY_STOP) &&
             (((status >> SPU_STOP_STATUS_SHIFT) & 0x3f00) == 0x2100))
                 ctx->stats.libassist++;
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 67595bc380dc..2ad914c47493 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -312,6 +312,15 @@ static struct spu *aff_ref_location(struct spu_context *ctx, int mem_aff,
          */
         node = cpu_to_node(raw_smp_processor_id());
         for (n = 0; n < MAX_NUMNODES; n++, node++) {
+                /*
+                 * "available_spus" counts how many spus are not potentially
+                 * going to be used by other affinity gangs whose reference
+                 * context is already in place. Although this code seeks to
+                 * avoid having affinity gangs with a summed amount of
+                 * contexts bigger than the amount of spus in the node,
+                 * this may happen sporadically. In this case, available_spus
+                 * becomes negative, which is harmless.
+                 */
                 int available_spus;
 
                 node = (node < MAX_NUMNODES) ? node : 0;
@@ -321,12 +330,10 @@ static struct spu *aff_ref_location(struct spu_context *ctx, int mem_aff,
                 available_spus = 0;
                 mutex_lock(&cbe_spu_info[node].list_mutex);
                 list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) {
-                        if (spu->ctx && spu->ctx->gang
-                                        && spu->ctx->aff_offset == 0)
-                                available_spus -=
-                                        (spu->ctx->gang->contexts - 1);
-                        else
-                                available_spus++;
+                        if (spu->ctx && spu->ctx->gang && !spu->ctx->aff_offset
+                                        && spu->ctx->gang->aff_ref_spu)
+                                available_spus -= spu->ctx->gang->contexts;
+                        available_spus++;
                 }
                 if (available_spus < ctx->gang->contexts) {
                         mutex_unlock(&cbe_spu_info[node].list_mutex);
@@ -437,6 +444,11 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx)
                 atomic_dec(&cbe_spu_info[spu->node].reserved_spus);
 
         if (ctx->gang)
+                /*
+                 * If ctx->gang->aff_sched_count is positive, SPU affinity is
+                 * being considered in this gang. Using atomic_dec_if_positive
+                 * allow us to skip an explicit check for affinity in this gang
+                 */
                 atomic_dec_if_positive(&ctx->gang->aff_sched_count);
 
         spu_switch_notify(spu, NULL);
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 8ae8ef9dfc22..15c62d3ca129 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -65,7 +65,6 @@ enum {
 };
 
 struct switch_log {
-        spinlock_t              lock;
         wait_queue_head_t       wait;
         unsigned long           head;
         unsigned long           tail;
diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c
index 2ece399f2862..d0b1f3f4d9c8 100644
--- a/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/arch/powerpc/platforms/cell/spufs/sputrace.c
@@ -40,6 +40,7 @@ static DECLARE_WAIT_QUEUE_HEAD(sputrace_wait);
 static ktime_t sputrace_start;
 static unsigned long sputrace_head, sputrace_tail;
 static struct sputrace *sputrace_log;
+static int sputrace_logging;
 
 static int sputrace_used(void)
 {
@@ -79,6 +80,11 @@ static ssize_t sputrace_read(struct file *file, char __user *buf,
                 char tbuf[128];
                 int width;
 
+                /* If we have data ready to return, don't block waiting
+                 * for more */
+                if (cnt > 0 && sputrace_used() == 0)
+                        break;
+
                 error = wait_event_interruptible(sputrace_wait,
                                                  sputrace_used() > 0);
                 if (error)
@@ -109,24 +115,49 @@ static ssize_t sputrace_read(struct file *file, char __user *buf,
 
 static int sputrace_open(struct inode *inode, struct file *file)
 {
+        int rc;
+
         spin_lock(&sputrace_lock);
+        if (sputrace_logging) {
+                rc = -EBUSY;
+                goto out;
+        }
+
+        sputrace_logging = 1;
         sputrace_head = sputrace_tail = 0;
         sputrace_start = ktime_get();
+        rc = 0;
+
+out:
         spin_unlock(&sputrace_lock);
+        return rc;
+}
 
+static int sputrace_release(struct inode *inode, struct file *file)
+{
+        spin_lock(&sputrace_lock);
+        sputrace_logging = 0;
+        spin_unlock(&sputrace_lock);
         return 0;
 }
 
 static const struct file_operations sputrace_fops = {
-        .owner  = THIS_MODULE,
-        .open   = sputrace_open,
-        .read   = sputrace_read,
+        .owner   = THIS_MODULE,
+        .open    = sputrace_open,
+        .read    = sputrace_read,
+        .release = sputrace_release,
 };
 
 static void sputrace_log_item(const char *name, struct spu_context *ctx,
                 struct spu *spu)
 {
         spin_lock(&sputrace_lock);
+
+        if (!sputrace_logging) {
+                spin_unlock(&sputrace_lock);
+                return;
+        }
+
         if (sputrace_avail() > 1) {
                 struct sputrace *t = sputrace_log + sputrace_head;
 
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index 49c87769b1f8..c23617c6baf3 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -69,9 +69,9 @@ static long do_spu_create(const char __user *pathname, unsigned int flags,
         if (!IS_ERR(tmp)) {
                 struct nameidata nd;
 
-                ret = path_lookup(tmp, LOOKUP_PARENT|
-                                LOOKUP_OPEN|LOOKUP_CREATE, &nd);
+                ret = path_lookup(tmp, LOOKUP_PARENT, &nd);
                 if (!ret) {
+                        nd.flags |= LOOKUP_OPEN | LOOKUP_CREATE;
                         ret = spufs_create(&nd, flags, mode, neighbor);
                         path_put(&nd.path);
                 }
diff --git a/arch/powerpc/platforms/embedded6xx/c2k.c b/arch/powerpc/platforms/embedded6xx/c2k.c
index d0b25b8c39d1..32ba0fa0ad03 100644
--- a/arch/powerpc/platforms/embedded6xx/c2k.c
+++ b/arch/powerpc/platforms/embedded6xx/c2k.c
@@ -116,10 +116,7 @@ static void c2k_restart(char *cmd)
 
 void c2k_show_cpuinfo(struct seq_file *m)
 {
-        uint memsize = total_memory;
-
         seq_printf(m, "Vendor\t\t: GEFanuc\n");
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
         seq_printf(m, "coherency\t: %s\n", COHERENCY_SETTING);
 }
 
diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
index 5a19b9a1457c..4c485e984236 100644
--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@ -119,10 +119,7 @@ static void prpmc2800_restart(char *cmd)
 
 void prpmc2800_show_cpuinfo(struct seq_file *m)
 {
-        uint memsize = total_memory;
-
         seq_printf(m, "Vendor\t\t: Motorola\n");
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
         seq_printf(m, "coherency\t: %s\n", PPRPM2800_COHERENCY_SETTING);
 }
 
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 140d02a5232a..a623ad256e9e 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -22,6 +22,12 @@ static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size)
         int ret;
 
         start_pfn = base >> PAGE_SHIFT;
+
+        if (!pfn_valid(start_pfn)) {
+                lmb_remove(base, lmb_size);
+                return 0;
+        }
+
         zone = page_zone(pfn_to_page(start_pfn));
 
         /*
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index a8c446697f9e..d56491d182d3 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -44,6 +44,7 @@
 #include <asm/tce.h>
 #include <asm/ppc-pci.h>
 #include <asm/udbg.h>
+#include <asm/kdump.h>
 
 #include "plpar_wrappers.h"
 
@@ -291,9 +292,8 @@ static void iommu_table_setparms(struct pci_controller *phb,
 
         tbl->it_base = (unsigned long)__va(*basep);
 
-#ifndef CONFIG_CRASH_DUMP
-        memset((void *)tbl->it_base, 0, *sizep);
-#endif
+        if (!__kdump_flag)
+                memset((void *)tbl->it_base, 0, *sizep);
 
         tbl->it_busno = phb->bus->number;
 
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index e00f96baa381..1a231c389ba0 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -52,8 +52,8 @@
 
 
 /*
- * The primary thread of each non-boot processor is recorded here before
- * smp init.
+ * The Primary thread of each non-boot processor was started from the OF client
+ * interface by prom_hold_cpus and is spinning on secondary_hold_spinloop.
  */
 static cpumask_t of_spin_map;
 
@@ -161,8 +161,7 @@ static void __devinit smp_pSeries_kick_cpu(int nr)
 static int smp_pSeries_cpu_bootable(unsigned int nr)
 {
         /* Special case - we inhibit secondary thread startup
-         * during boot if the user requests it.  Odd-numbered
-         * cpus are assumed to be secondary threads.
+         * during boot if the user requests it.
          */
         if (system_state < SYSTEM_RUNNING &&
             cpu_has_feature(CPU_FTR_SMT) &&
@@ -199,11 +198,7 @@ static void __init smp_init_pseries(void)
         /* Mark threads which are still spinning in hold loops. */
         if (cpu_has_feature(CPU_FTR_SMT)) {
                 for_each_present_cpu(i) { 
-                        if (i % 2 == 0)
-                                /*
-                                 * Even-numbered logical cpus correspond to
-                                 * primary threads.
-                                 */
+                        if (cpu_thread_in_core(i) == 0)
                                 cpu_set(i, of_spin_map);
                 }
         } else {