Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / cell / spufs / spufs.h

diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index db2601f0abd54db2b3e571bba9c2cb37fa646523..a0f55ca2d488322c1165a82b647eb4196a13d872 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -39,11 +39,18 @@ struct spu_context_ops;
 
 #define SPU_CONTEXT_PREEMPT          0UL
 
+struct spu_gang;
+
 struct spu_context {
        struct spu *spu;                  /* pointer to a physical SPU */
        struct spu_state csa;             /* SPU context save area. */
        spinlock_t mmio_lock;             /* protects mmio access */
-       struct address_space *local_store;/* local store backing store */
+       struct address_space *local_store; /* local store mapping.  */
+       struct address_space *mfc;         /* 'mfc' area mappings. */
+       struct address_space *cntl;        /* 'control' area mappings. */
+       struct address_space *signal1;     /* 'signal1' area mappings. */
+       struct address_space *signal2;     /* 'signal2' area mappings. */
+       u64 object_id;             /* user space pointer for oprofile */
 
        enum { SPU_STATE_RUNNABLE, SPU_STATE_SAVED } state;
        struct rw_semaphore state_sema;
@@ -55,13 +62,38 @@ struct spu_context {
        wait_queue_head_t ibox_wq;
        wait_queue_head_t wbox_wq;
        wait_queue_head_t stop_wq;
+       wait_queue_head_t mfc_wq;
        struct fasync_struct *ibox_fasync;
        struct fasync_struct *wbox_fasync;
+       struct fasync_struct *mfc_fasync;
+       u32 tagwait;
        struct spu_context_ops *ops;
        struct work_struct reap_work;
-       u64 flags;
+       unsigned long flags;
+       unsigned long event_return;
+
+       struct list_head gang_list;
+       struct spu_gang *gang;
+};
+
+struct spu_gang {
+       struct list_head list;
+       struct mutex mutex;
+       struct kref kref;
+       int contexts;
 };
 
+struct mfc_dma_command {
+       int32_t pad;    /* reserved */
+       uint32_t lsa;   /* local storage address */
+       uint64_t ea;    /* effective address */
+       uint16_t size;  /* transfer size */
+       uint16_t tag;   /* command tag */
+       uint16_t class; /* class ID */
+       uint16_t cmd;   /* command opcode */
+};
+
+
 /* SPU context query/set operations. */
 struct spu_context_ops {
        int (*mbox_read) (struct spu_context * ctx, u32 * data);
@@ -84,6 +116,11 @@ struct spu_context_ops {
        char*(*get_ls) (struct spu_context * ctx);
        void (*runcntl_write) (struct spu_context * ctx, u32 data);
        void (*runcntl_stop) (struct spu_context * ctx);
+       int (*set_mfc_query)(struct spu_context * ctx, u32 mask, u32 mode);
+       u32 (*read_mfc_tagstatus)(struct spu_context * ctx);
+       u32 (*get_mfc_free_elements)(struct spu_context *ctx);
+       int (*send_mfc_command)(struct spu_context *ctx,
+                                       struct mfc_dma_command *cmd);
 };
 
 extern struct spu_context_ops spu_hw_ops;
@@ -91,6 +128,7 @@ extern struct spu_context_ops spu_backing_ops;
 
 struct spufs_inode_info {
        struct spu_context *i_ctx;
+       struct spu_gang *i_gang;
        struct inode vfs_inode;
 };
 #define SPUFS_I(inode) \
@@ -101,12 +139,19 @@ extern struct tree_descr spufs_dir_contents[];
 /* system call implementation */
 long spufs_run_spu(struct file *file,
                   struct spu_context *ctx, u32 *npc, u32 *status);
-long spufs_create_thread(struct nameidata *nd,
+long spufs_create(struct nameidata *nd,
                         unsigned int flags, mode_t mode);
 extern struct file_operations spufs_context_fops;
 
+/* gang management */
+struct spu_gang *alloc_spu_gang(void);
+struct spu_gang *get_spu_gang(struct spu_gang *gang);
+int put_spu_gang(struct spu_gang *gang);
+void spu_gang_remove_ctx(struct spu_gang *gang, struct spu_context *ctx);
+void spu_gang_add_ctx(struct spu_gang *gang, struct spu_context *ctx);
+
 /* context management */
-struct spu_context * alloc_spu_context(struct address_space *local_store);
+struct spu_context * alloc_spu_context(struct spu_gang *gang);
 void destroy_spu_context(struct kref *kref);
 struct spu_context * get_spu_context(struct spu_context *ctx);
 int put_spu_context(struct spu_context *ctx);
@@ -159,5 +204,7 @@ size_t spu_ibox_read(struct spu_context *ctx, u32 *data);
 void spufs_ibox_callback(struct spu *spu);
 void spufs_wbox_callback(struct spu *spu);
 void spufs_stop_callback(struct spu *spu);
+void spufs_mfc_callback(struct spu *spu);
+void spufs_dma_callback(struct spu *spu, int type);
 
 #endif