2 files changed, 36 insertions, 9 deletions

diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index f968f8697538..fdad4267b447 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -111,13 +111,11 @@ struct spu {
         u8 *local_store;
         unsigned long problem_phys;
         struct spu_problem __iomem *problem;
-        struct spu_priv1 __iomem *priv1;
         struct spu_priv2 __iomem *priv2;
         struct list_head list;
         struct list_head sched_list;
         struct list_head full_list;
         int number;
-        int nid;
         unsigned int irqs[3];
         u32 node;
         u64 flags;
@@ -144,8 +142,7 @@ struct spu {
         char irq_c1[8];
         char irq_c2[8];
 
-        struct device_node *devnode;
-
+        void* pdata; /* platform private data */
         struct sys_device sysdev;
 };
 
diff --git a/include/asm-powerpc/spu_priv1.h b/include/asm-powerpc/spu_priv1.h
index 4f9a04db99f7..69dcb0c53884 100644
--- a/include/asm-powerpc/spu_priv1.h
+++ b/include/asm-powerpc/spu_priv1.h
@@ -21,12 +21,13 @@
 #define _SPU_PRIV1_H
 #if defined(__KERNEL__)
 
+#include <linux/types.h>
+
 struct spu;
 
 /* access to priv1 registers */
 
-struct spu_priv1_ops
-{
+struct spu_priv1_ops {
         void (*int_mask_and) (struct spu *spu, int class, u64 mask);
         void (*int_mask_or) (struct spu *spu, int class, u64 mask);
         void (*int_mask_set) (struct spu *spu, int class, u64 mask);
@@ -171,12 +172,41 @@ spu_resource_allocation_enable_get (struct spu *spu)
         return spu_priv1_ops->resource_allocation_enable_get(spu);
 }
 
-/* The declarations folowing are put here for convenience
- * and only intended to be used by the platform setup code
- * for initializing spu_priv1_ops.
+/* spu management abstraction */
+
+struct spu_management_ops {
+        int (*enumerate_spus)(int (*fn)(void *data));
+        int (*create_spu)(struct spu *spu, void *data);
+        int (*destroy_spu)(struct spu *spu);
+};
+
+extern const struct spu_management_ops* spu_management_ops;
+
+static inline int
+spu_enumerate_spus (int (*fn)(void *data))
+{
+        return spu_management_ops->enumerate_spus(fn);
+}
+
+static inline int
+spu_create_spu (struct spu *spu, void *data)
+{
+        return spu_management_ops->create_spu(spu, data);
+}
+
+static inline int
+spu_destroy_spu (struct spu *spu)
+{
+        return spu_management_ops->destroy_spu(spu);
+}
+
+/*
+ * The declarations folowing are put here for convenience
+ * and only intended to be used by the platform setup code.
  */
 
 extern const struct spu_priv1_ops spu_priv1_mmio_ops;
+extern const struct spu_management_ops spu_management_of_ops;
 
 #endif /* __KERNEL__ */
 #endif