Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
  [POWERPC] Cell IOMMU fixed mapping support
  [POWERPC] Split out the ioid fetching/checking logic
  [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
  [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
  [POWERPC] Split cell_iommu_setup_hardware() into two parts
  [POWERPC] Split out the logic that allocates struct iommus
  [POWERPC] Allocate the hash table under 1G on cell
  [POWERPC] Add set_dma_ops() to match get_dma_ops()
  [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
  [POWERPC] 85xx: Only invalidate TLB0 and TLB1
  [POWERPC] 83xx: Fix typo in mpc837x compatible entries
  [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
  [POWERPC] 83xx: rework platform Kconfig
  [POWERPC] 85xx: rework platform Kconfig
  [POWERPC] 86xx: Remove unused IRQ defines
  [POWERPC] QE: Explicitly set address-cells and size cells for muram
  [POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
  [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
  [PPC] Remove 85xx from arch/ppc
  [PPC] Remove 83xx from arch/ppc
  ...

1 files changed, 23 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 1b010707488d..d351bdebf5f1 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -35,6 +35,7 @@
 #include <asm/firmware.h>
 #include <asm/prom.h>
 
+#include "spufs/spufs.h"
 #include "interrupt.h"
 
 struct device_node *spu_devnode(struct spu *spu)
@@ -345,7 +346,7 @@ static int __init of_create_spu(struct spu *spu, void *data)
                 }
                 ret = spu_map_interrupts_old(spu, spe);
                 if (ret) {
-                        printk(KERN_ERR "%s: could not map interrupts",
+                        printk(KERN_ERR "%s: could not map interrupts\n",
                                 spu->name);
                         goto out_unmap;
                 }
@@ -369,6 +370,16 @@ static int of_destroy_spu(struct spu *spu)
         return 0;
 }
 
+static void enable_spu_by_master_run(struct spu_context *ctx)
+{
+        ctx->ops->master_start(ctx);
+}
+
+static void disable_spu_by_master_run(struct spu_context *ctx)
+{
+        ctx->ops->master_stop(ctx);
+}
+
 /* Hardcoded affinity idxs for qs20 */
 #define QS20_SPES_PER_BE 8
 static int qs20_reg_idxs[QS20_SPES_PER_BE] =   { 0, 2, 4, 6, 7, 5, 3, 1 };
@@ -411,10 +422,15 @@ static void init_affinity_qs20_harcoded(void)
 
 static int of_has_vicinity(void)
 {
-        struct spu* spu;
+        struct device_node *dn;
 
-        spu = list_first_entry(&cbe_spu_info[0].spus, struct spu, cbe_list);
-        return of_find_property(spu_devnode(spu), "vicinity", NULL) != NULL;
+        for_each_node_by_type(dn, "spe") {
+                if (of_find_property(dn, "vicinity", NULL))  {
+                        of_node_put(dn);
+                        return 1;
+                }
+        }
+        return 0;
 }
 
 static struct spu *devnode_spu(int cbe, struct device_node *dn)
@@ -525,7 +541,7 @@ static int __init init_affinity(void)
                 if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
                         init_affinity_qs20_harcoded();
                 else
-                        printk("No affinity configuration found");
+                        printk("No affinity configuration found\n");
         }
 
         return 0;
@@ -535,5 +551,7 @@ const struct spu_management_ops spu_management_of_ops = {
         .enumerate_spus = of_enumerate_spus,
         .create_spu = of_create_spu,
         .destroy_spu = of_destroy_spu,
+        .enable_spu = enable_spu_by_master_run,
+        .disable_spu = disable_spu_by_master_run,
         .init_affinity = init_affinity,
 };