cell patches for 2.6.20
Subsystems (4)
cover cell patches for 2.6.20
These are the patches I have queued for 2.6.20 for cell, as I got them after the merge window closed.
They apply on the current powerpc.git with the bug fixes applied that I sent earlier.
Please review for inclusion.
Arnd <><
PATCH 1/16 spufs: wrap mfc sdr access
From: Masato Noguchi <[email protected]>
SPRN_SDR1 and the SPE's MFC SDR are hypervisor resources and are not accessible from a logical partition. This change adds an access wrapper.
When running on bare H/W, the spufs needs to only set the SPE's MFC SDR to the value of the PPE's SPRN_SDR1 once at SPE initialization, so this change renames mfc_sdr_set() to mfc_sdr_setup() and moves the access of SPRN_SDR1 into the mmio wrapper. It also removes the now unneeded member mfc_sdr_RW from struct spu_priv1_collapsed.
--
arch/powerpc/platforms/cell/spu_base.c +1 -1
@@ -805,7 +805,7 @@ static int __init create_spu(struct deviif (ret) goto out_unmap;spin_lock_init (&spu->register_lock); -spu_mfc_sdr_set (spu,mfspr (SPRN_SDR1 )); +spu_mfc_sdr_setup (spu);spu_mfc_sr1_set (spu,0x33 );mutex_lock (&spu_mutex);
arch/powerpc/platforms/cell/spu_priv1_mmio.c +3 -3
@@ -84,9 +84,9 @@ static void mfc_dsisr_set(struct spu *spout_be64 (&spu->priv1->mfc_dsisr_RW, dsisr); } -static void mfc_sdr_set (struct spu *spu,u64 sdr) +static void mfc_sdr_setup (struct spu *spu) { -out_be64 (&spu->priv1->mfc_sdr_RW, sdr); +out_be64 (&spu->priv1->mfc_sdr_RW,mfspr (SPRN_SDR1 )); }static void mfc_sr1_set (struct spu *spu,u64 sr1)
@@ -146,7 +146,7 @@ const struct spu_priv1_ops spu_priv1_mmi .mfc_dar_get = mfc_dar_get, .mfc_dsisr_get = mfc_dsisr_get, .mfc_dsisr_set = mfc_dsisr_set, - .mfc_sdr_set = mfc_sdr_set, + .mfc_sdr_setup = mfc_sdr_setup, .mfc_sr1_set = mfc_sr1_set, .mfc_sr1_get = mfc_sr1_get, .mfc_tclass_id_set = mfc_tclass_id_set,
arch/powerpc/platforms/cell/spufs/switch.c +0 -3
@@ -2165,9 +2165,6 @@ static void init_priv1(struct spu_stateMFC_STATE1_PROBLEM_STATE_MASK |MFC_STATE1_RELOCATE_MASK |MFC_STATE1_BUS_TLBIE_MASK ; -/* Set storage description. */ - csa->priv1.mfc_sdr_RW =mfspr (SPRN_SDR1 ); -/* Enable OS-specific set of interrupts. */ csa->priv1.int_mask_class0_RW =CLASS0_ENABLE_DMA_ALIGNMENT_INTR | CLASS0_ENABLE_INVALID_DMA_COMMAND_INTR |
include/asm-powerpc/spu_csa.h +0 -1
@@ -151,7 +151,6 @@ struct spu_priv1_collapsed {u64 mfc_fir_chkstp_enable_RW;u64 smf_sbi_signal_sel;u64 smf_ato_signal_sel; -u64 mfc_sdr_RW;u64 tlb_index_hint_RO;u64 tlb_index_W;u64 tlb_vpn_RW;
include/asm-powerpc/spu_priv1.h +3 -3
@@ -37,7 +37,7 @@ struct spu_priv1_opsu64 (*mfc_dar_get) (struct spu *spu);u64 (*mfc_dsisr_get) (struct spu *spu);void (*mfc_dsisr_set) (struct spu *spu,u64 dsisr); -void (*mfc_sdr_set) (struct spu *spu,u64 sdr); +void (*mfc_sdr_setup) (struct spu *spu);void (*mfc_sr1_set) (struct spu *spu,u64 sr1);u64 (*mfc_sr1_get) (struct spu *spu);void (*mfc_tclass_id_set) (struct spu *spu,u64 tclass_id);
@@ -112,9 +112,9 @@ spu_mfc_dsisr_set (struct spu *spu, u64 }static inline void -spu_mfc_sdr_set (struct spu *spu,u64 sdr) +spu_mfc_sdr_setup (struct spu *spu) { - spu_priv1_ops->mfc_sdr_set (spu, sdr); + spu_priv1_ops->mfc_sdr_setup (spu); } static inline void
--
PATCH 2/16 cell: remove unused struct spu variable
In reply to [email protected]From: Geoff Levand <[email protected]>
Remove the mostly unused variable isrc from struct spu and a forgotten function declaration.
---
arch/powerpc/platforms/cell/spu_base.c +3 -18
@@ -364,8 +364,7 @@ struct spu *spu_alloc_node(int node)if (!list_empty (&spu_list[node])) { spu = list_entry(spu_list[node].next, struct spu, list);list_del_init (&spu->list); -pr_debug ("Got SPU %x %d %d\n" , - spu->isrc, spu->number, spu->node); +pr_debug ("Got SPU %d %d\n" , spu->number, spu->node);spu_init_channels (spu); }mutex_unlock (&spu_mutex);
@@ -591,7 +590,6 @@ static int __init spu_map_interrupts_old/* Add the node number */ isrc |= spu->node <<IIC_IRQ_NODE_SHIFT ; - spu->isrc = isrc;/* Now map interrupts of all 3 classes */ spu->irqs[0 ] =irq_create_mapping (NULL ,IIC_IRQ_CLASS_0 | isrc);
@@ -733,16 +731,6 @@ struct sysdev_class spu_sysdev_class = { set_kset_name("spu") }; -static ssize_t spu_show_isrc (struct sys_device *sysdev,char *buf) -{ - struct spu *spu = container_of(sysdev, struct spu, sysdev); -return sprintf (buf,"%d\n" , spu->isrc); - -} -static SYSDEV_ATTR(isrc, 0400, spu_show_isrc, NULL); - -extern int attach_sysdev_to_node (struct sys_device *dev,int nid); -static int spu_create_sysdev (struct spu *spu) {int ret;
@@ -756,8 +744,6 @@ static int spu_create_sysdev(struct spureturn ret; } -if (spu->isrc !=0 ) -sysdev_create_file (&spu->sysdev, &attr_isrc);sysfs_add_device_to_node (&spu->sysdev, spu->nid);return 0 ;
@@ -765,7 +751,6 @@ static int spu_create_sysdev(struct spustatic void spu_destroy_sysdev (struct spu *spu) { -sysdev_remove_file (&spu->sysdev, &attr_isrc);sysfs_remove_device_from_node (&spu->sysdev, spu->nid);sysdev_unregister (&spu->sysdev); }
@@ -821,8 +806,8 @@ static int __init create_spu(struct devilist_add (&spu->list, &spu_list[spu->node]);mutex_unlock (&spu_mutex); -pr_debug (KERN_DEBUG "Using SPE %s %02x %p %p %p %p %d\n" , - spu->name, spu->isrc, spu->local_store, +pr_debug (KERN_DEBUG "Using SPE %s %p %p %p %p %d\n" , + spu->name, spu->local_store, spu->problem, spu->priv1, spu->priv2, spu->number); goto out;
include/asm-powerpc/spu.h +0 -1
@@ -118,7 +118,6 @@ struct spu {int number;int nid;unsigned int irqs[3 ]; -u32 isrc;u32 node;u64 flags;u64 dar;
--
PATCH 3/16 spufs: add support for nonschedulable contexts
In reply to [email protected]From: Mark Nutter <[email protected]>
This adds two new flags to spu_create:
SPU_CREATE_NONSCHED: create a context that is never moved away from an SPE once it has started running. This flag can only be used by tasks with the CAP_SYS_NICE capability.
SPU_CREATE_ISOLATED: create a nonschedulable context that enters isolation mode upon first run. This requires the SPU_CREATE_NONSCHED flag.
---
Update: add psmap file.
arch/powerpc/platforms/cell/spufs/file.c | 22 ++++++++++++ arch/powerpc/platforms/cell/spufs/hw_ops.c | 5 ++ arch/powerpc/platforms/cell/spufs/inode.c | 17 +++++++++ arch/powerpc/platforms/cell/spufs/run.c | 10 ++++- arch/powerpc/platforms/cell/spufs/spufs.h | 1 arch/powerpc/platforms/cell/spufs/switch.c | 50 +++++++++++++++++++++++++++-- include/asm-powerpc/spu.h | 5 ++ 7 files changed, 103 insertions(+), 7 deletions(-)
arch/powerpc/platforms/cell/spufs/file.c +22 -0
@@ -1531,3 +1531,25 @@ struct tree_descr spufs_dir_contents[] = { "object-id", &spufs_object_id_ops, 0666, }, {}, }; + +struct tree_descr spufs_dir_nosched_contents[] = { + {"mem" , &spufs_mem_fops,0666 , }, + {"mbox" , &spufs_mbox_fops,0444 , }, + {"ibox" , &spufs_ibox_fops,0444 , }, + {"wbox" , &spufs_wbox_fops,0222 , }, + {"mbox_stat" , &spufs_mbox_stat_fops,0444 , }, + {"ibox_stat" , &spufs_ibox_stat_fops,0444 , }, + {"wbox_stat" , &spufs_wbox_stat_fops,0444 , }, + {"signal1" , &spufs_signal1_fops,0666 , }, + {"signal2" , &spufs_signal2_fops,0666 , }, + {"signal1_type" , &spufs_signal1_type,0666 , }, + {"signal2_type" , &spufs_signal2_type,0666 , }, + {"mss" , &spufs_mss_fops,0666 , }, + {"mfc" , &spufs_mfc_fops,0666 , }, + {"cntl" , &spufs_cntl_fops,0666 , }, + {"npc" , &spufs_npc_ops,0666 , }, + {"psmap" , &spufs_psmap_fops,0666 , }, + {"phys-id" , &spufs_id_ops,0666 , }, + {"object-id" , &spufs_object_id_ops,0666 , }, + {}, +};
arch/powerpc/platforms/cell/spufs/hw_ops.c +4 -1
@@ -219,8 +219,11 @@ static char *spu_hw_get_ls(struct spu_costatic void spu_hw_runcntl_write (struct spu_context *ctx,u32 val) { -eieio (); +spin_lock_irq (&ctx->spu->register_lock); +if (val &SPU_RUNCNTL_ISOLATE ) +out_be64 (&ctx->spu->priv2->spu_privcntl_RW,4LL );out_be32 (&ctx->spu->problem->spu_runcntl_RW, val); +spin_unlock_irq (&ctx->spu->register_lock); }static void spu_hw_runcntl_stop (struct spu_context *ctx)
arch/powerpc/platforms/cell/spufs/inode.c +16 -1
@@ -258,7 +258,12 @@ spufs_mkdir(struct inode *dir, struct de inode->i_op = &spufs_dir_inode_operations; inode->i_fop = &simple_dir_operations; - ret =spufs_fill_dir (dentry, spufs_dir_contents, mode, ctx); +if (flags &SPU_CREATE_NOSCHED ) + ret =spufs_fill_dir (dentry, spufs_dir_nosched_contents, + mode, ctx); +else + ret =spufs_fill_dir (dentry, spufs_dir_contents, mode, ctx); +if (ret) goto out_free_ctx;
@@ -307,6 +312,16 @@ static int spufs_create_context(struct i {int ret; + ret = -EPERM ; +if ((flags &SPU_CREATE_NOSCHED ) && + !capable (CAP_SYS_NICE )) + goto out_unlock; + + ret = -EINVAL ; +if ((flags & (SPU_CREATE_NOSCHED |SPU_CREATE_ISOLATE )) + ==SPU_CREATE_ISOLATE ) + goto out_unlock; + ret =spufs_mkdir (inode, dentry, flags, mode &S_IRWXUGO );if (ret) goto out_unlock;
arch/powerpc/platforms/cell/spufs/run.c +8 -2
@@ -51,11 +51,17 @@ static inline int spu_stopped(struct spustatic inline int spu_run_init (struct spu_context *ctx,u32 * npc) {int ret; +unsigned long runcntl =SPU_RUNCNTL_RUNNABLE ;if ((ret =spu_acquire_runnable (ctx)) !=0 )return ret; - ctx->ops->npc_write (ctx, *npc); - ctx->ops->runcntl_write (ctx,SPU_RUNCNTL_RUNNABLE ); + +if (ctx->flags &SPU_CREATE_ISOLATE ) + runcntl |=SPU_RUNCNTL_ISOLATE ; +else + ctx->ops->npc_write (ctx, *npc); + + ctx->ops->runcntl_write (ctx, runcntl);return 0 ; }
arch/powerpc/platforms/cell/spufs/spufs.h +1 -0
@@ -135,6 +135,7 @@ struct spufs_inode_info { container_of(inode, struct spufs_inode_info, vfs_inode)extern struct tree_descr spufs_dir_contents[]; +extern struct tree_descr spufs_dir_nosched_contents[];/* system call implementation */ long spufs_run_spu(struct file *file,
arch/powerpc/platforms/cell/spufs/switch.c +48 -2
71 lines not on this page · raw message
include/asm-powerpc/spu.h +4 -1
@@ -181,8 +181,10 @@ extern struct spufs_calls {*/ #define SPU_CREATE_EVENTS_ENABLED 0x0001#define SPU_CREATE_GANG 0x0002 +#define SPU_CREATE_NOSCHED 0x0004 +#define SPU_CREATE_ISOLATE 0x0008 -#define SPU_CREATE_FLAG_ALL 0x0003/* mask of all valid flags */ +#define SPU_CREATE_FLAG_ALL 0x000f/* mask of all valid flags */ #ifdef CONFIG_SPU_FS_MODULE
@@ -276,6 +278,7 @@ struct spu_problem {u32 spu_runcntl_RW;/* 0x401c */ #define SPU_RUNCNTL_STOP 0L#define SPU_RUNCNTL_RUNNABLE 1L +#define SPU_RUNCNTL_ISOLATE 2Lu8 pad_0x4020_0x4024[0x4 ];/* 0x4020 */ u32 spu_status_R;/* 0x4024 */ #define SPU_STOP_STATUS_SHIFT 16
--
PATCH 4/16 spufs: "stataus" isnt a word.
In reply to [email protected]arch/powerpc/platforms/cell/spufs/switch.c +5 -5
@@ -102,7 +102,7 @@ static inline int check_spu_isolate(stru* saved at this time. */ isolate_state =SPU_STATUS_ISOLATED_STATE | -SPU_STATUS_ISOLATED_LOAD_STAUTUS |SPU_STATUS_ISOLATED_EXIT_STAUTUS ; +SPU_STATUS_ISOLATED_LOAD_STATUS |SPU_STATUS_ISOLATED_EXIT_STATUS ;return (in_be32 (&prob->spu_status_R) & isolate_state) ?1 :0 ; }
@@ -1046,12 +1046,12 @@ static inline int suspend_spe(struct spu*/ if (in_be32 (&prob->spu_status_R) &SPU_STATUS_RUNNING ) {if (in_be32 (&prob->spu_status_R) & -SPU_STATUS_ISOLATED_EXIT_STAUTUS ) { +SPU_STATUS_ISOLATED_EXIT_STATUS ) {POLL_WHILE_TRUE (in_be32 (&prob->spu_status_R) &SPU_STATUS_RUNNING ); }if ((in_be32 (&prob->spu_status_R) & -SPU_STATUS_ISOLATED_LOAD_STAUTUS ) +SPU_STATUS_ISOLATED_LOAD_STATUS ) || (in_be32 (&prob->spu_status_R) &SPU_STATUS_ISOLATED_STATE )) {out_be32 (&prob->spu_runcntl_RW,SPU_RUNCNTL_STOP );
@@ -1085,7 +1085,7 @@ static inline void clear_spu_status(stru*/ if (!(in_be32 (&prob->spu_status_R) &SPU_STATUS_RUNNING )) {if (in_be32 (&prob->spu_status_R) & -SPU_STATUS_ISOLATED_EXIT_STAUTUS ) { +SPU_STATUS_ISOLATED_EXIT_STATUS ) {spu_mfc_sr1_set (spu,MFC_STATE1_MASTER_RUN_CONTROL_MASK );eieio ();
@@ -1095,7 +1095,7 @@ static inline void clear_spu_status(stru SPU_STATUS_RUNNING); }if ((in_be32 (&prob->spu_status_R) & -SPU_STATUS_ISOLATED_LOAD_STAUTUS ) +SPU_STATUS_ISOLATED_LOAD_STATUS ) || (in_be32 (&prob->spu_status_R) &SPU_STATUS_ISOLATED_STATE )) { spu_mfc_sr1_set(spu,
include/asm-powerpc/spu.h +2 -2
@@ -291,8 +291,8 @@ struct spu_problem {#define SPU_STATUS_INVALID_INSTR 0x20#define SPU_STATUS_INVALID_CH 0x40#define SPU_STATUS_ISOLATED_STATE 0x80 -#define SPU_STATUS_ISOLATED_LOAD_STAUTUS 0x200 -#define SPU_STATUS_ISOLATED_EXIT_STAUTUS 0x400 +#define SPU_STATUS_ISOLATED_LOAD_STATUS 0x200 +#define SPU_STATUS_ISOLATED_EXIT_STATUS 0x400u8 pad_0x4028_0x402c[0x4 ];/* 0x4028 */ u32 spu_spe_R;/* 0x402c */ u8 pad_0x4030_0x4034[0x4 ];/* 0x4030 */
--
PATCH 5/16 spufs: allow isolated mode apps by starting the SPE loader
In reply to [email protected]This patch adds general support for isolated mode SPE apps.
Isolated apps are started indirectly, by a dedicated loader "kernel". This patch starts the loader when spe_create is invoked with the ISOLATE flag. We do this at spe_create time to allow libspe to pass the isolated app in before calling spe_run.
The loader is read from the device tree, at the location "/spu-isolation/loader". If the loader is not present, an attempt to start an isolated SPE binary will fail with -ENODEV.
Update: loader needs to be correctly aligned - copy to a kmalloced buf.
Update: remove workaround for systemsim/spurom 'L-bit' bug, which has
been fixed.
Update: don't write to runcntl on spu_run_init: SPU is already running.
Update: do spu_setup_isolated earlier
Tested on systemsim.
---
arch/powerpc/platforms/cell/spu_base.c | 35 ++++++-- arch/powerpc/platforms/cell/spufs/inode.c | 117 ++++++++++++++++++++++++++++++ arch/powerpc/platforms/cell/spufs/run.c | 12 +-- 3 files changed, 148 insertions(+), 16 deletions(-)
arch/powerpc/platforms/cell/spu_base.c +24 -11
@@ -89,7 +89,30 @@ static int __spu_trap_data_seg(struct spprintk ("%s: invalid access during switch!\n" , __func__);return 1 ; } -if (!mm || (REGION_ID (ea) !=USER_REGION_ID )) { + esid = (ea &ESID_MASK ) |SLB_ESID_V ; + +switch (REGION_ID (ea)) { +case USER_REGION_ID : +#ifdef CONFIG_HUGETLB_PAGE +if (in_hugepage_area (mm->context, ea)) + llp = mmu_psize_defs[mmu_huge_psize].sllp; + else +#endif + llp = mmu_psize_defs[mmu_virtual_psize].sllp; + vsid = (get_vsid (mm->context.id, ea) <<SLB_VSID_SHIFT ) | +SLB_VSID_USER | llp; +break ; +case VMALLOC_REGION_ID : + llp = mmu_psize_defs[mmu_virtual_psize].sllp; + vsid = (get_kernel_vsid (ea) <<SLB_VSID_SHIFT ) | +SLB_VSID_KERNEL | llp; +break ; +case KERNEL_REGION_ID : + llp = mmu_psize_defs[mmu_linear_psize].sllp; + vsid = (get_kernel_vsid (ea) <<SLB_VSID_SHIFT ) | +SLB_VSID_KERNEL | llp; +break ; +default :/* Future: support kernel segments so that drivers * can use SPUs. */
@@ -97,16 +120,6 @@ static int __spu_trap_data_seg(struct spreturn 1 ; } - esid = (ea &ESID_MASK ) |SLB_ESID_V ; -#ifdef CONFIG_HUGETLB_PAGE -if (in_hugepage_area (mm->context, ea)) - llp = mmu_psize_defs[mmu_huge_psize].sllp; - else -#endif - llp = mmu_psize_defs[mmu_virtual_psize].sllp; - vsid = (get_vsid (mm->context.id, ea) <<SLB_VSID_SHIFT ) | -SLB_VSID_USER | llp; -out_be64 (&priv2->slb_index_W, spu->slb_replace);out_be64 (&priv2->slb_vsid_RW, vsid);out_be64 (&priv2->slb_esid_RW, esid);
arch/powerpc/platforms/cell/spufs/inode.c +117 -0
153 lines not on this page · raw message
arch/powerpc/platforms/cell/spufs/run.c +7 -5
@@ -1,3 +1,5 @@ +#define DEBUG +#include <linux/wait.h> #include <linux/ptrace.h>
@@ -56,12 +58,12 @@ static inline int spu_run_init(struct spif ((ret =spu_acquire_runnable (ctx)) !=0 )return ret; -if (ctx->flags &SPU_CREATE_ISOLATE ) - runcntl |=SPU_RUNCNTL_ISOLATE ; -else +/* if we're in isolated mode, we would have started the SPU +* earlier, so don't do it again now. */ +if (!(ctx->flags &SPU_CREATE_ISOLATE )) { ctx->ops->npc_write (ctx, *npc); - - ctx->ops->runcntl_write (ctx, runcntl); + ctx->ops->runcntl_write (ctx, runcntl); + }return 0 ; }
--
PATCH 6/16 spufs: Add isolated-mode SPE recycling support
In reply to [email protected]From: Jeremy Kerr <[email protected]>
When in isolated mode, SPEs have access to an area of persistent storage, which is per-SPE. In order for isolated-mode apps to communicate arbitrary data through this storage, we need to ensure that isolated physical SPEs can be reused for subsequent applications.
Add a file ("recycle") in a spethread dir to enable isolated-mode recycling. By writing to this file, the kernel will reload the isolated-mode loader kernel, allowing a new app to be run on the same physical SPE.
This requires the spu_acquire_exclusive function to enforce exclusive access to the SPE while the loader is initialised.
---
Update: clarify locking, remove unnecessary yield, require >0 bytes
when writing to recycle file.
arch/powerpc/platforms/cell/spufs/context.c | 27 +++++++++++++++++++++++ arch/powerpc/platforms/cell/spufs/file.c | 32 ++++++++++++++++++++++++++++ arch/powerpc/platforms/cell/spufs/inode.c | 23 +++++++++++++------- arch/powerpc/platforms/cell/spufs/spufs.h | 7 ++++++ 4 files changed, 81 insertions(+), 8 deletions(-)
arch/powerpc/platforms/cell/spufs/context.c +27 -0
@@ -120,6 +120,33 @@ void spu_unmap_mappings(struct spu_conteunmap_mapping_range (ctx->signal2,0 ,0x4000 ,1 ); } +int spu_acquire_exclusive (struct spu_context *ctx) +{ +int ret =0 ; + +down_write (&ctx->state_sema); +/* ctx is about to be freed, can't acquire any more */ +if (!ctx->owner) { + ret = -EINVAL ; + goto out; + } + +if (ctx->state ==SPU_STATE_SAVED ) { + ret =spu_activate (ctx,0 ); +if (ret) + goto out; + ctx->state =SPU_STATE_RUNNABLE ; + }else { +/* We need to exclude userspace access to the context. */ +spu_unmap_mappings (ctx); + } + +out: +if (ret) +up_write (&ctx->state_sema); +return ret; +} +int spu_acquire_runnable (struct spu_context *ctx) {int ret =0 ;
arch/powerpc/platforms/cell/spufs/file.c +32 -0
@@ -1343,6 +1343,37 @@ static struct file_operations spufs_mfc_ .mmap = spufs_mfc_mmap, }; + +static int spufs_recycle_open (struct inode *inode,struct file *file) +{ + file->private_data =SPUFS_I (inode)->i_ctx; +return nonseekable_open (inode, file); +} + +static ssize_t spufs_recycle_write (struct file *file, +const char __user *buffer,size_t size,loff_t *pos) +{ +struct spu_context *ctx = file->private_data; +int ret; + +if (!(ctx->flags &SPU_CREATE_ISOLATE )) +return -EINVAL ; + +if (size <1 ) +return -EINVAL ; + + ret =spu_recycle_isolated (ctx); + +if (ret) +return ret; +return size; +} + +static struct file_operations spufs_recycle_fops = { + .open = spufs_recycle_open, + .write = spufs_recycle_write, +}; +static void spufs_npc_set (void *data,u64 val) {struct spu_context *ctx = data;
@@ -1551,5 +1582,6 @@ struct tree_descr spufs_dir_nosched_cont { "psmap", &spufs_psmap_fops, 0666, }, { "phys-id", &spufs_id_ops, 0666, }, { "object-id", &spufs_object_id_ops, 0666, }, + { "recycle", &spufs_recycle_fops, 0222, }, {}, };
arch/powerpc/platforms/cell/spufs/inode.c +15 -8
@@ -248,7 +248,7 @@ static int spu_setup_isolated(struct spuif (!isolated_loader)return -ENODEV ; -if ((ret =spu_acquire_runnable (ctx)) !=0 ) +if ((ret =spu_acquire_exclusive (ctx)) !=0 )return ret; mfc_cntl = &ctx->spu->priv2->mfc_control_RW;
@@ -314,10 +314,16 @@ out_drop_priv:spu_mfc_sr1_set (ctx->spu, sr1); out_unlock: -up_write (&ctx->state_sema); +spu_release_exclusive (ctx);return ret; } +int spu_recycle_isolated (struct spu_context *ctx) +{ + ctx->ops->runcntl_stop (ctx); +return spu_setup_isolated (ctx); +} +static int spufs_mkdir (struct inode *dir,struct dentry *dentry,unsigned int flags,int mode)
@@ -341,12 +347,6 @@ spufs_mkdir(struct inode *dir, struct de goto out_iput; ctx->flags = flags; -if (flags &SPU_CREATE_ISOLATE ) { - ret =spu_setup_isolated (ctx); -if (ret) - goto out_iput; - } - inode->i_op = &spufs_dir_inode_operations; inode->i_fop = &simple_dir_operations;if (flags &SPU_CREATE_NOSCHED )
@@ -432,6 +432,13 @@ static int spufs_create_context(struct i out_unlock:mutex_unlock (&inode->i_mutex); out: +if (ret >=0 && (flags &SPU_CREATE_ISOLATE )) { +int setup_err =spu_setup_isolated ( +SPUFS_I (dentry->d_inode)->i_ctx); +if (setup_err) + ret = setup_err; + } +dput (dentry);return ret; }
arch/powerpc/platforms/cell/spufs/spufs.h +7 -0
@@ -163,6 +163,12 @@ void spu_acquire(struct spu_context *ctxvoid spu_release (struct spu_context *ctx);int spu_acquire_runnable (struct spu_context *ctx);void spu_acquire_saved (struct spu_context *ctx); +int spu_acquire_exclusive (struct spu_context *ctx); + +static inline void spu_release_exclusive (struct spu_context *ctx) +{ +up_write (&ctx->state_sema); +}int spu_activate (struct spu_context *ctx,u64 flags);void spu_deactivate (struct spu_context *ctx);
@@ -170,6 +176,7 @@ void spu_yield(struct spu_context *ctx);int __init spu_sched_init (void ); void __exit spu_sched_exit(void); +int spu_recycle_isolated (struct spu_context *ctx);/* * spufs_wait * Same as wait_event_interruptible(), except that here
--
PATCH 7/16 cell: update cell be register definitions
In reply to [email protected]From: David Erb <[email protected]>
There are a few definitions that are required by subsequent patches, so add them here.
The original patch is from David Erb, but is significantly cleaned up by Kevon Corry.
arch/powerpc/platforms/cell/cbe_regs.h +126 -35
@@ -4,6 +4,11 @@* This file is intended to hold the various register definitions for CBE * on-chip system devices (memory controller, IO controller, etc...) * +* (C) Copyright IBM Corporation 2001,2006 +* +* Authors: Maximino Aguilar ([email protected]) +* David J. Erb ([email protected]) +* * (c) 2006 Benjamin Herrenschmidt <[email protected]>, IBM Corp. */
@@ -22,6 +27,7 @@#define HID0_CBE_THERM_INT_EN 0x0000000400000000ul#define HID0_CBE_SYSERR_INT_EN 0x0000000200000000ul +#define MAX_CBE 2/* *
@@ -29,45 +35,86 @@* */ +union spe_reg { +u64 val; +u8 spe[8 ]; +}; + +union ppe_spe_reg { +u64 val; +struct { +u32 ppe; +u32 spe; + }; +}; + +struct cbe_pmd_regs { -u8 pad_0x0000_0x0800[0x0800 -0x0000 ];/* 0x0000 */ +/* Debug Bus Control */ +u64 pad_0x0000;/* 0x0000 */ + +u64 group_control;/* 0x0008 */ + +u8 pad_0x0010_0x00a8 [0x00a8 -0x0010 ];/* 0x0010 */ + +u64 debug_bus_control;/* 0x00a8 */ + +u8 pad_0x00b0_0x0100 [0x0100 -0x00b0 ];/* 0x00b0 */ + +u64 trace_aux_data;/* 0x0100 */ +u64 trace_buffer_0_63;/* 0x0108 */ +u64 trace_buffer_64_127;/* 0x0110 */ +u64 trace_address;/* 0x0118 */ +u64 ext_tr_timer;/* 0x0120 */ + +u8 pad_0x0128_0x0400 [0x0400 -0x0128 ];/* 0x0128 */ + +/* Performance Monitor */ +u64 pm_status;/* 0x0400 */ +u64 pm_control;/* 0x0408 */ +u64 pm_interval;/* 0x0410 */ +u64 pm_ctr[4 ];/* 0x0418 */ +u64 pm_start_stop;/* 0x0438 */ +u64 pm07_control[8 ];/* 0x0440 */ + +u8 pad_0x0480_0x0800 [0x0800 -0x0480 ];/* 0x0480 */ /* Thermal Sensor Registers */ -u64 ts_ctsr1;/* 0x0800 */ -u64 ts_ctsr2;/* 0x0808 */ -u64 ts_mtsr1;/* 0x0810 */ -u64 ts_mtsr2;/* 0x0818 */ -u64 ts_itr1;/* 0x0820 */ -u64 ts_itr2;/* 0x0828 */ -u64 ts_gitr;/* 0x0830 */ -u64 ts_isr;/* 0x0838 */ -u64 ts_imr;/* 0x0840 */ -u64 tm_cr1;/* 0x0848 */ -u64 tm_cr2;/* 0x0850 */ -u64 tm_simr;/* 0x0858 */ -u64 tm_tpr;/* 0x0860 */ -u64 tm_str1;/* 0x0868 */ -u64 tm_str2;/* 0x0870 */ -u64 tm_tsr;/* 0x0878 */ +union spe_reg ts_ctsr1;/* 0x0800 */ +u64 ts_ctsr2;/* 0x0808 */ +union spe_reg ts_mtsr1;/* 0x0810 */ +u64 ts_mtsr2;/* 0x0818 */ +union spe_reg ts_itr1;/* 0x0820 */ +u64 ts_itr2;/* 0x0828 */ +u64 ts_gitr;/* 0x0830 */ +u64 ts_isr;/* 0x0838 */ +u64 ts_imr;/* 0x0840 */ +union spe_reg tm_cr1;/* 0x0848 */ +u64 tm_cr2;/* 0x0850 */ +u64 tm_simr;/* 0x0858 */ +union ppe_spe_reg tm_tpr;/* 0x0860 */ +union spe_reg tm_str1;/* 0x0868 */ +u64 tm_str2;/* 0x0870 */ +union ppe_spe_reg tm_tsr;/* 0x0878 */ /* Power Management */ -u64 pm_control;/* 0x0880 */ -#define CBE_PMD_PAUSE_ZERO_CONTROL 0x10000 -u64 pm_status;/* 0x0888 */ +u64 pmcr;/* 0x0880 */ +#define CBE_PMD_PAUSE_ZERO_CONTROL 0x10000 +u64 pmsr;/* 0x0888 */ /* Time Base Register */ -u64 tbr;/* 0x0890 */ +u64 tbr;/* 0x0890 */ -u8 pad_0x0898_0x0c00 [0x0c00 -0x0898 ];/* 0x0898 */ +u8 pad_0x0898_0x0c00 [0x0c00 -0x0898 ];/* 0x0898 */ /* Fault Isolation Registers */ -u64 checkstop_fir;/* 0x0c00 */ -u64 recoverable_fir; -u64 spec_att_mchk_fir; -u64 fir_mode_reg; -u64 fir_enable_mask; +u64 checkstop_fir;/* 0x0c00 */ +u64 recoverable_fir;/* 0x0c08 */ +u64 spec_att_mchk_fir;/* 0x0c10 */ +u64 fir_mode_reg;/* 0x0c18 */ +u64 fir_enable_mask;/* 0x0c20 */ -u8 pad_0x0c28_0x1000 [0x1000 -0x0c28 ];/* 0x0c28 */ +u8 pad_0x0c28_0x1000 [0x1000 -0x0c28 ];/* 0x0c28 */ };extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs (struct device_node *np);
@@ -102,18 +149,20 @@ struct cbe_iic_regs {/* IIC interrupt registers */ struct cbe_iic_thread_regs thread[2 ];/* 0x0400 */ -u64 iic_ir;/* 0x0440 */ -u64 iic_is;/* 0x0448 */ + +u64 iic_ir;/* 0x0440 */ +u64 iic_is;/* 0x0448 */ +#define CBE_IIC_IS_PMI 0x2u8 pad_0x0450_0x0500[0x0500 -0x0450 ];/* 0x0450 */ /* IOC FIR */ u64 ioc_fir_reset;/* 0x0500 */ -u64 ioc_fir_set; -u64 ioc_checkstop_enable; -u64 ioc_fir_error_mask; -u64 ioc_syserr_enable; -u64 ioc_fir; +u64 ioc_fir_set;/* 0x0508 */ +u64 ioc_checkstop_enable;/* 0x0510 */ +u64 ioc_fir_error_mask;/* 0x0518 */ +u64 ioc_syserr_enable;/* 0x0520 */ +u64 ioc_fir;/* 0x0528 */ u8 pad_0x0530_0x1000[0x1000 -0x0530 ];/* 0x0530 */ };
@@ -122,6 +171,48 @@ extern struct cbe_iic_regs __iomem *cbe_extern struct cbe_iic_regs __iomem *cbe_get_cpu_iic_regs (int cpu); +struct cbe_mic_tm_regs { +u8 pad_0x0000_0x0040[0x0040 -0x0000 ];/* 0x0000 */ + +u64 mic_ctl_cnfg2;/* 0x0040 */ +#define CBE_MIC_ENABLE_AUX_TRC 0x8000000000000000LL +#define CBE_MIC_DISABLE_PWR_SAV_2 0x0200000000000000LL +#define CBE_MIC_DISABLE_AUX_TRC_WRAP 0x0100000000000000LL +#define CBE_MIC_ENABLE_AUX_TRC_INT 0x0080000000000000LL + +u64 pad_0x0048;/* 0x0048 */ + +u64 mic_aux_trc_base;/* 0x0050 */ +u64 mic_aux_trc_max_addr;/* 0x0058 */ +u64 mic_aux_trc_cur_addr;/* 0x0060 */ +u64 mic_aux_trc_grf_addr;/* 0x0068 */ +u64 mic_aux_trc_grf_data;/* 0x0070 */ + +u64 pad_0x0078;/* 0x0078 */ + +u64 mic_ctl_cnfg_0;/* 0x0080 */ +#define CBE_MIC_DISABLE_PWR_SAV_0 0x8000000000000000LL + +u64 pad_0x0088;/* 0x0088 */ + +u64 slow_fast_timer_0;/* 0x0090 */ +u64 slow_next_timer_0;/* 0x0098 */ + +u8 pad_0x00a0_0x01c0[0x01c0 -0x0a0 ];/* 0x00a0 */ + +u64 mic_ctl_cnfg_1;/* 0x01c0 */ +#define CBE_MIC_DISABLE_PWR_SAV_1 0x8000000000000000LL +u64 pad_0x01c8;/* 0x01c8 */ + +u64 slow_fast_timer_1;/* 0x01d0 */ +u64 slow_next_timer_1;/* 0x01d8 */ + +u8 pad_0x01e0_0x1000[0x1000 -0x01e0 ];/* 0x01e0 */ +}; + +extern struct cbe_mic_tm_regs __iomem *cbe_get_mic_tm_regs (struct device_node *np); +extern struct cbe_mic_tm_regs __iomem *cbe_get_cpu_mic_tm_regs (int cpu); +/* Init this module early */ extern void cbe_regs_init (void );
arch/powerpc/platforms/cell/cbe_regs.c +41 -3
98 lines not on this page · raw message
arch/powerpc/platforms/cell/pervasive.c +3 -3
@@ -54,9 +54,9 @@ static void __init cbe_enable_pause_zeropr_debug ("Power Management: CPU %d\n" ,smp_processor_id ());/* Enable Pause(0) control bit */ - temp_register =in_be64 (&pregs->pm_control); + temp_register =in_be64 (&pregs->pmcr); -out_be64 (&pregs->pm_control, +out_be64 (&pregs->pmcr, temp_register |CBE_PMD_PAUSE_ZERO_CONTROL );/* Enable DEC and EE interrupt request */
@@ -87,7 +87,7 @@ static void cbe_idle(void)unsigned long ctrl;/* Why do we do that on every idle ? Couldn't that be done once for -* all or do we lose the state some way ? Also, the pm_control +* all or do we lose the state some way ? Also, the pmcr * register setting, that can't be set once at boot ? We really want * to move that away in order to implement a simple powersave */
--
PATCH 8/16 cell: add shadow registers for pmd_reg
In reply to [email protected]From: Kevin Corry <[email protected]>
Many of the registers in the performance monitoring unit are write-only. We need to save a "shadow" copy when we write to those registers so we can retrieve the values if we need them later.
The new cbe_pmd_shadow_regs structure is added to the cbe_regs_map structure so we have the appropriate per-node copies of these shadow values.
arch/powerpc/platforms/cell/cbe_regs.c +17 -0
@@ -30,6 +30,7 @@ static struct cbe_regs_mapstruct cbe_pmd_regs __iomem *pmd_regs;struct cbe_iic_regs __iomem *iic_regs;struct cbe_mic_tm_regs __iomem *mic_tm_regs; +struct cbe_pmd_shadow_regs pmd_shadow_regs; } cbe_regs_maps[MAX_CBE ];static int cbe_regs_map_count;
@@ -80,6 +81,22 @@ struct cbe_pmd_regs __iomem *cbe_get_cpu }EXPORT_SYMBOL_GPL (cbe_get_cpu_pmd_regs); +struct cbe_pmd_shadow_regs *cbe_get_pmd_shadow_regs (struct device_node *np) +{ +struct cbe_regs_map *map =cbe_find_map (np); +if (map ==NULL ) +return NULL ; +return &map->pmd_shadow_regs; +} + +struct cbe_pmd_shadow_regs *cbe_get_cpu_pmd_shadow_regs (int cpu) +{ +struct cbe_regs_map *map = cbe_thread_map[cpu].regs; +if (map ==NULL ) +return NULL ; +return &map->pmd_shadow_regs; +} +struct cbe_iic_regs __iomem *cbe_get_iic_regs (struct device_node *np) {struct cbe_regs_map *map =cbe_find_map (np);
arch/powerpc/platforms/cell/cbe_regs.h +35 -0
@@ -121,6 +121,41 @@ extern struct cbe_pmd_regs __iomem *cbe_extern struct cbe_pmd_regs __iomem *cbe_get_cpu_pmd_regs (int cpu);/* +* PMU shadow registers +* +* Many of the registers in the performance monitoring unit are write-only, +* so we need to save a copy of what we write to those registers. +* +* The actual data counters are read/write. However, writing to the counters +* only takes effect if the PMU is enabled. Otherwise the value is stored in +* a hardware latch until the next time the PMU is enabled. So we save a copy +* of the counter values if we need to read them back while the PMU is +* disabled. The counter_value_in_latch field is a bitmap indicating which +* counters currently have a value waiting to be written. +*/ + +#define NR_PHYS_CTRS 4 +#define NR_CTRS (NR_PHYS_CTRS * 2) + +struct cbe_pmd_shadow_regs { +u32 group_control; +u32 debug_bus_control; +u32 trace_address; +u32 ext_tr_timer; +u32 pm_status; +u32 pm_control; +u32 pm_interval; +u32 pm_start_stop; +u32 pm07_control[NR_CTRS ]; + +u32 pm_ctr[NR_PHYS_CTRS ]; +u32 counter_value_in_latch; +}; + +extern struct cbe_pmd_shadow_regs *cbe_get_pmd_shadow_regs (struct device_node *np); +extern struct cbe_pmd_shadow_regs *cbe_get_cpu_pmd_shadow_regs (int cpu); + +/* * * IIC unit register definitions *
--
PATCH 9/16 cell: add low-level performance monitoring code
In reply to [email protected]From: Kevin Corry <[email protected]>
Add routines for accessing the registers and counters in the performance monitoring unit.
arch/powerpc/platforms/cell/Makefile +2 -1
@@ -1,5 +1,6 @@ obj-$(CONFIG_PPC_CELL_NATIVE) += interrupt.o iommu.o setup.o \ - cbe_regs.o spider-pic.o pervasive.o + cbe_regs.o spider-pic.o pervasive.o \ + pmu.o obj-$(CONFIG_CBE_RAS) += ras.o ifeq ($(CONFIG_SMP),y)
arch/powerpc/platforms/cell/cbe_regs.h +5 -0
@@ -35,6 +35,11 @@* */ +/* Macros for the pm_control register. */ +#define CBE_PM_16BIT_CTR (ctr) (1 << (24 - ((ctr) & (NR_PHYS_CTRS - 1)))) +#define CBE_PM_ENABLE_PERF_MON 0x80000000 + +union spe_reg {u64 val;u8 spe[8 ];
arch/powerpc/platforms/cell/pmu.c new file +328 -0
328 lines not on this page · raw message
arch/powerpc/platforms/cell/pmu.h new file +57 -0
57 lines not on this page · raw message
--
PATCH 10/16 cell: add support for registering sysfs attributes to spus
In reply to [email protected]From: Christian Krafft <[email protected]>
In order to add sysfs attributes to all spu's, there is a need for a list of all available spu's. Adding the device_node makes also sense, as it is needed for proper register access. This patch also adds two functions to create and remove sysfs attributes and attribute_groups to all spus.
That allows to group spu attributes in a subdirectory like:/sys/devices/system/spu/spuX/group_name/what_ever
This will be used by cbe_thermal to group all attributes dealing with thermal support in one directory.
include/asm-powerpc/spu.h +9 -0
@@ -115,6 +115,7 @@ struct spu {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 ];
@@ -143,6 +144,8 @@ struct spu {char irq_c1[8 ];char irq_c2[8 ]; +struct device_node *devnode; +struct sys_device sysdev; };
@@ -200,6 +203,12 @@ static inline void unregister_spu_syscal }#endif /* MODULE */ +int spu_add_sysdev_attr (struct sysdev_attribute *attr); +void spu_remove_sysdev_attr (struct sysdev_attribute *attr); + +int spu_add_sysdev_attr_group (struct attribute_group *attrs); +void spu_remove_sysdev_attr_group (struct attribute_group *attrs); +/* * Notifier blocks:
arch/powerpc/platforms/cell/spu_base.c +58 -0
82 lines not on this page · raw message
--
PATCH 11/16 sysfs: add support for adding/removing spu sysfs attributes
In reply to [email protected]From: Christian Krafft <[email protected]>
This patch adds two functions to create and remove sysfs attributes and attribute_group to all cpus. That allows to register sysfs attributes in a subdirectory like: /sys/devices/system/cpu/cpuX/group_name/what_ever This will be used by cbe_thermal to group all attributes dealing with thermal support in one directory.
arch/powerpc/kernel/sysfs.c +66 -0
@@ -299,6 +299,72 @@ static struct notifier_block __cpuinitda .notifier_call = sysfs_cpu_notify, }; +static DEFINE_MUTEX (cpu_mutex); + +int cpu_add_sysdev_attr (struct sysdev_attribute *attr) +{ +int cpu; + +mutex_lock (&cpu_mutex); + +for_each_possible_cpu (cpu) { +sysdev_create_file (get_cpu_sysdev (cpu), attr); + } + +mutex_unlock (&cpu_mutex); +return 0 ; +} +EXPORT_SYMBOL_GPL (cpu_add_sysdev_attr); + +int cpu_add_sysdev_attr_group (struct attribute_group *attrs) +{ +int cpu; +struct sys_device *sysdev; + +mutex_lock (&cpu_mutex); + +for_each_possible_cpu (cpu) { + sysdev =get_cpu_sysdev (cpu); +sysfs_create_group (&sysdev->kobj, attrs); + } + +mutex_unlock (&cpu_mutex); +return 0 ; +} +EXPORT_SYMBOL_GPL (cpu_add_sysdev_attr_group); + + +void cpu_remove_sysdev_attr (struct sysdev_attribute *attr) +{ +int cpu; + +mutex_lock (&cpu_mutex); + +for_each_possible_cpu (cpu) { +sysdev_remove_file (get_cpu_sysdev (cpu), attr); + } + +mutex_unlock (&cpu_mutex); +} +EXPORT_SYMBOL_GPL (cpu_remove_sysdev_attr); + +void cpu_remove_sysdev_attr_group (struct attribute_group *attrs) +{ +int cpu; +struct sys_device *sysdev; + +mutex_lock (&cpu_mutex); + +for_each_possible_cpu (cpu) { + sysdev =get_cpu_sysdev (cpu); +sysfs_remove_group (&sysdev->kobj, attrs); + } + +mutex_unlock (&cpu_mutex); +} +EXPORT_SYMBOL_GPL (cpu_remove_sysdev_attr_group); + +/* NUMA stuff */ #ifdef CONFIG_NUMA
include/linux/cpu.h +8 -0
@@ -33,6 +33,14 @@ struct cpu {extern int register_cpu (struct cpu *cpu,int num);extern struct sys_device *get_cpu_sysdev (unsigned cpu); + +extern int cpu_add_sysdev_attr (struct sysdev_attribute *attr); +extern void cpu_remove_sysdev_attr (struct sysdev_attribute *attr); + +extern int cpu_add_sysdev_attr_group (struct attribute_group *attrs); +extern void cpu_remove_sysdev_attr_group (struct attribute_group *attrs); + +#ifdef CONFIG_HOTPLUG_CPU extern void unregister_cpu (struct cpu *cpu);#endif
--
Re: [PATCH 11/16] sysfs: add support for adding/removing spu sysfs attributes
arch/powerpc/kernel/sysfs.c static struct notifier_block __cpuinitda · line 316
Quoted 13 lines
arch/powerpc/kernel/sysfs.c +13
-0+int cpu_add_sysdev_attr (struct sysdev_attribute *attr) +{ +int cpu; + +mutex_lock (&cpu_mutex); + +for_each_possible_cpu (cpu) { +sysdev_create_file (get_cpu_sysdev (cpu), attr); + } + +mutex_unlock (&cpu_mutex); +return 0 ; +}
You probably should check for errors on sysdev_create_file, clean up and return an error number instead of always 0.
This is true for all the new functions here.
Re: [PATCH 11/16] sysfs: add support for adding/removing spu sysfs attributes
Quoted 3 lines · Heiko Carstens
You probably should check for errors on
sysdev_create_file, clean up and return an error number instead of always 0.
This is true for all the new functions here.
Right, thanks for the review.
Christian or I will take care of this.
Arnd <><
PATCH 12/16 cell: add temperature to SPU and CPU sysfs entries
In reply to [email protected]From: Christian Krafft <[email protected]>
This patch adds a module that registers sysfs attributes to CPU and SPU containing the temperature of the CBE.
They can be found under /sys/devices/system/spu/cpuX/thermal/temperature[0|1] /sys/devices/system/spu/spuX/thermal/temperature
The temperature is read from the on-chip temperature sensors.
arch/powerpc/platforms/cell/Kconfig +5 -0
@@ -20,4 +20,9 @@ config CBE_RAS bool "RAS features for bare metal Cell BE" default y +config CBE_THERM + tristate "CBE thermal support" + default m + depends on CBE_RAS + endmenu
arch/powerpc/platforms/cell/Makefile +2 -0
@@ -3,6 +3,8 @@ obj-$(CONFIG_PPC_CELL_NATIVE) += interr pmu.o obj-$(CONFIG_CBE_RAS) += ras.o +obj-$(CONFIG_CBE_THERM) += cbe_thermal.o + ifeq ($(CONFIG_SMP),y) obj-$(CONFIG_PPC_CELL_NATIVE) += smp.o endif
arch/powerpc/configs/cell_defconfig +1 -0
@@ -149,6 +149,7 @@ CONFIG_MMIO_NVRAM=y CONFIG_SPU_FS=m CONFIG_SPU_BASE=y CONFIG_CBE_RAS=y +CONFIG_CBE_THERM=m # # Kernel options
arch/powerpc/platforms/cell/cbe_thermal.c new file +225 -0
225 lines not on this page · raw message
--
Re: [PATCH 12/16] cell: add temperature to SPU and CPU sysfs entries
Quoted 1 line · On Tue, Oct 24, 2006 at 06:31:25PM +0200, [email protected] wrote:
+ * (C) Copyright IBM Deutschland Entwicklung GmbH 2005
IBM Corp. instead of IBM DE? 2006?
arch/powerpc/platforms/cell/cbe_thermal.c line 213
Quoted 9 lines
arch/powerpc/platforms/cell/cbe_thermal.c new file +9
-0+static int __init thermal_init (void ) +{ +init_default_values (); + +spu_add_sysdev_attr_group (&spu_attribute_group); +cpu_add_sysdev_attr_group (&ppe_attribute_group); + +return 0 ; +}
Same here: check for errors on spu_add_sysdev_attr_group and cpu_add_sysdev_attr_group.
arch/powerpc/platforms/cell/cbe_thermal.c line 219
Quoted 4 lines
arch/powerpc/platforms/cell/cbe_thermal.c new file +4
-0+static void __exit thermal_exit(void) +{ +spu_remove_sysdev_attr_group (&spu_attribute_group); +cpu_remove_sysdev_attr_group (&ppe_attribute_group);
Will crash if cpu_add_sysdev_attr_group failed...
Re: [Cbe-oss-dev] [PATCH 12/16] cell: add temperature to SPU and CPU sysfs entries
Quoted 19 lines · Heiko Carstens
Quoted 1 line · On Tue, Oct 24, 2006 at 06:31:25PM +0200, [email protected] wrote:
+ * (C) Copyright IBM Deutschland Entwicklung GmbH 2005
IBM Corp. instead of IBM DE? 2006?
arch/powerpc/platforms/cell/cbe_thermal.c line 213
Quoted 9 lines
arch/powerpc/platforms/cell/cbe_thermal.c new file +9
-0+static int __init thermal_init (void ) +{ +init_default_values (); + +spu_add_sysdev_attr_group (&spu_attribute_group); +cpu_add_sysdev_attr_group (&ppe_attribute_group); + +return 0 ; +}Same here: check for errors on
spu_add_sysdev_attr_groupandcpu_add_sysdev_attr_group.
Quoted 6 lines
arch/powerpc/platforms/cell/cbe_thermal.c line 219
Quoted 4 lines
arch/powerpc/platforms/cell/cbe_thermal.c new file +4
-0+static void __exit thermal_exit(void) +{ +spu_remove_sysdev_attr_group (&spu_attribute_group); +cpu_remove_sysdev_attr_group (&ppe_attribute_group);Will crash if
cpu_add_sysdev_attr_groupfailed...
Which is a total PITA. If this is the case, then we should modify the add calls to at least initialize enough fields before they can fail for the remove calls not to crash. You don't want to keep track precisely of what file was added and what not and test all of that in your exit code path, it's just insane.
Ben.
Re: [Cbe-oss-dev] [PATCH 12/16] cell: add temperature to SPU and CPU sysfs entries
Quoted 9 lines · Benjamin Herrenschmidt
Quoted 2 lines
Will crash if
cpu_add_sysdev_attr_groupfailed...Which is a total PITA. If this is the case, then we should modify the add calls to at least initialize enough fields before they can fail for the remove calls not to crash. You don't want to keep track precisely of what file was added and what not and test all of that in your exit code path, it's just insane.
Heiko suggested that earlied in http://lkml.org/lkml/2006/10/9/22,
but Andrew didn't like it.
Currently, the worst is that sysfs_remove_file can be used on a nonexisting file, but sysfs_remove_group cannot, which is inconsistent. Either sysfs_remove_file should WARN_ON or sysfs_remove_group should silently return, and I'd prefer the latter, as it makes users simpler.
Arnd <><
Re: [Cbe-oss-dev] [PATCH 12/16] cell: add temperature to SPU and CPU sysfs entries
Quoted 11 lines · Arnd Bergmann
Quoted 9 lines · Benjamin Herrenschmidt
Quoted 2 lines
Will crash if
cpu_add_sysdev_attr_groupfailed...Which is a total PITA. If this is the case, then we should modify the add calls to at least initialize enough fields before they can fail for the remove calls not to crash. You don't want to keep track precisely of what file was added and what not and test all of that in your exit code path, it's just insane.
Quoted 8 lines
Heiko suggested that earlied in http://lkml.org/lkml/2006/10/9/22,
but Andrew didn't like it.Currently, the worst is that
sysfs_remove_filecan be used on a nonexisting file, butsysfs_remove_groupcannot, which is inconsistent. Eithersysfs_remove_fileshouldWARN_ONorsysfs_remove_groupshould silently return, and I'd prefer the latter, as it makes users simpler.
We need to argue with Andrew then. I'll have a go tomorrow
Ben.
PATCH 13/16 cell: use ppc_md->power_save instead of cbe_idle_loop
In reply to [email protected]This moves the cell idle function to use the default cpu_idle with a special power_save callback, like all other platforms except iSeries already do.
It also makes it possible to disable this power_save function with a new powerpc-specific boot option "powersave=off".
arch/powerpc/kernel/idle.c +7 -0
@@ -39,6 +39,13 @@#define cpu_should_die () 0#endif +static int __init powersave_off (char *arg) +{ + ppc_md.power_save =NULL ; +return 0 ; +} +__setup ("powersave=off" , powersave_off); +/* * The body of the idle task. */
arch/powerpc/platforms/cell/pervasive.c +27 -69
126 lines not on this page · raw message
--
PATCH 14/16 add support for stopping spus from xmon
In reply to [email protected]From: Michael Ellerman <[email protected]>
This patch adds support for stopping, and restarting, spus from xmon. We use the spu master runcntl bit to stop execution, this is apparently the "right" way to control spu execution and spufs will be changed in the future to use this bit.
Testing has shown that to restart execution we have to turn the master runcntl bit on and also rewrite the spu runcntl bit, even if it is already set to 1 (running).
Stopping spus is triggered by the xmon command 'ss' - "spus stop" perhaps. Restarting them is triggered via 'sr'. Restart doesn't start execution on spus unless they were running prior to being stopped by xmon.
Walking the spu->full_list in xmon after a panic, would mean corruption of any spu struct would make all the others inaccessible. To avoid this, and also to make the next patch easier, we cache pointers to all spus during boot.
We attempt to catch and recover from errors while stopping and restarting the spus, but as with most xmon functionality there are no guarantees that performing these operations won't crash xmon itself.
---
arch/powerpc/platforms/cell/spu_base.c | 4 arch/powerpc/xmon/xmon.c | 142 ++++++++++++++++++++++++++++++++- include/asm-powerpc/xmon.h | 2 3 files changed, 146 insertions(+), 2 deletions(-)
arch/powerpc/platforms/cell/spu_base.c +4 -0
@@ -38,6 +38,7 @@#include <asm/spu.h> #include <asm/spu_priv1.h> #include <asm/mmu_context.h> +#include <asm/xmon.h> #include "interrupt.h"
@@ -943,6 +944,9 @@ static int __init init_spu_base(void)break ; } } + +xmon_register_spus (&spu_full_list); +return ret; }module_init (init_spu_base);
arch/powerpc/xmon/xmon.c +140 -2
175 lines not on this page · raw message
include/asm-powerpc/xmon.h +2 -0
@@ -14,8 +14,10 @@#ifdef CONFIG_XMON extern void xmon_setup (void ); +extern void xmon_register_spus (struct list_head *list);#else static inline void xmon_setup (void ) { }; +static inline void xmon_register_spus (struct list_head *list) { };#endif #endif /* __KERNEL __ */
--
PATCH 15/16 add support for dumping spu info from xmon
In reply to [email protected]From: Michael Ellerman <[email protected]>
This patch adds a command to xmon for dumping information about spu structs. The command is 'sf' for "spu fields" perhaps, and takes the spu number as an argument. This is the same value as the spu->number field, or the "phys-id" value of a context when it is bound to a physical spu.
We try to catch memory errors as we dump each field, hopefully this will make the command reasonably robust, but YMMV. If people see a need we can easily add more fields to the dump in future.
Output looks something like this:
0:mon> sf 0
Dumping spu fields at address c00000001ffd9e80:
number = 0x0 name = spe devnode->full_name = /cpus/PowerPC,BE@0/spes/spe@0 nid = 0x0 local_store_phys = 0x20000000000 local_store = 0xd0000800801e0000 ls_size = 0x0 isrc = 0x4 node = 0x0 flags = 0x0 dar = 0x0 dsisr = 0x0 class_0_pending = 0 irqs[0] = 0x16 irqs[1] = 0x17 irqs[2] = 0x24 slb_replace = 0x0 pid = 0 prio = 0 mm = 0x0000000000000000 ctx = 0x0000000000000000 rq = 0x0000000000000000 timestamp = 0x0000000000000000 problem_phys = 0x20000040000 problem = 0xd000080080220000 problem->spu_runcntl_RW = 0x0 problem->spu_status_R = 0x0 problem->spu_npc_RW = 0x0 priv1 = 0xd000080080240000 priv1->mfc_sr1_RW = 0x33 priv2 = 0xd000080080250000
---
arch/powerpc/xmon/xmon.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-)
arch/powerpc/xmon/xmon.c +66 -1
@@ -216,7 +216,8 @@ Commands:\n\ s single step\n"#ifdef CONFIG_PPC_CELL " ss stop execution on all spus\n\ -sr restore execution on stopped spus\n" +sr restore execution on stopped spus\n\ +sf # dump spu fields for spu # (in hex)\n" #endif" S print special registers\n\ t print backtrace\n\
@@ -2744,8 +2745,66 @@ static void restart_spus(void) } } +#define DUMP_WIDTH 23 +#define DUMP_FIELD (obj, format, field) \ +do { \ + if (setjmp(bus_error_jmp) == 0) { \ + catch_memory_errors = 1; \ + sync(); \ + printf(" %-*s = "format"\n", DUMP_WIDTH, \ + #field, obj->field); \ + sync(); \ + __delay(200); \ + } else { \ + catch_memory_errors = 0; \ + printf(" %-*s = *** Error reading field.\n", \ + DUMP_WIDTH, #field); \ + } \ + catch_memory_errors = 0; \ +} while (0) + +static void dump_spu_fields (struct spu *spu) +{ +printf ("Dumping spu fields at address %p:\n" , spu); + +DUMP_FIELD (spu,"0x%x" , number); +DUMP_FIELD (spu,"%s" , name); +DUMP_FIELD (spu,"%s" , devnode->full_name); +DUMP_FIELD (spu,"0x%x" , nid); +DUMP_FIELD (spu,"0x%lx" , local_store_phys); +DUMP_FIELD (spu,"0x%p" , local_store); +DUMP_FIELD (spu,"0x%lx" , ls_size); +DUMP_FIELD (spu,"0x%x" , node); +DUMP_FIELD (spu,"0x%lx" , flags); +DUMP_FIELD (spu,"0x%lx" , dar); +DUMP_FIELD (spu,"0x%lx" , dsisr); +DUMP_FIELD (spu,"%d" , class_0_pending); +DUMP_FIELD (spu,"0x%lx" , irqs[0 ]); +DUMP_FIELD (spu,"0x%lx" , irqs[1 ]); +DUMP_FIELD (spu,"0x%lx" , irqs[2 ]); +DUMP_FIELD (spu,"0x%x" , slb_replace); +DUMP_FIELD (spu,"%d" , pid); +DUMP_FIELD (spu,"%d" , prio); +DUMP_FIELD (spu,"0x%p" , mm); +DUMP_FIELD (spu,"0x%p" , ctx); +DUMP_FIELD (spu,"0x%p" , rq); +DUMP_FIELD (spu,"0x%p" , timestamp); +DUMP_FIELD (spu,"0x%lx" , problem_phys); +DUMP_FIELD (spu,"0x%p" , problem); +DUMP_FIELD (spu,"0x%x" , problem->spu_runcntl_RW); +DUMP_FIELD (spu,"0x%x" , problem->spu_status_R); +DUMP_FIELD (spu,"0x%x" , problem->spu_npc_RW); +DUMP_FIELD (spu,"0x%p" , priv1); + +if (spu->priv1) +DUMP_FIELD (spu,"0x%lx" , priv1->mfc_sr1_RW); + +DUMP_FIELD (spu,"0x%p" , priv2); +} +static int do_spu_cmd (void ) { +unsigned long num =0 ;int cmd; cmd =inchar ();
@@ -2756,6 +2815,12 @@ static int do_spu_cmd(void)case 'r' :restart_spus ();break ; +case 'f' : +if (scanhex (&num) && num <XMON_NUM_SPUS && spu_info[num].spu) +dump_spu_fields (spu_info[num].spu); +else +printf ("*** Error: invalid spu number\n" ); +break ;default :return -1 ; }
--
PATCH 16/16 cell: add cpufreq driver for Cell BE processor
In reply to [email protected]From: Christian Krafft <[email protected]>
This patch adds a cpufreq backend driver to enable frequency scaling on cell.
arch/powerpc/platforms/cell/Kconfig +9 -0
@@ -25,4 +25,13 @@ config CBE_THERM default m depends on CBE_RAS +config CBE_CPUFREQ + tristate "CBE frequency scaling" + depends on CBE_RAS && CPU_FREQ + default m + help + This adds the cpufreq driver for Cell BE processors. + For details, take a look at <file:Documentation/cpu-freq/>. + If you don't have such processor, say N + endmenu
arch/powerpc/platforms/cell/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_PPC_CELL_NATIVE) += interr obj-$(CONFIG_CBE_RAS) += ras.o obj-$(CONFIG_CBE_THERM) += cbe_thermal.o +obj-$(CONFIG_CBE_CPUFREQ) += cbe_cpufreq.o ifeq ($(CONFIG_SMP),y) obj-$(CONFIG_PPC_CELL_NATIVE) += smp.o
arch/powerpc/platforms/cell/cbe_cpufreq.c new file +248 -0
248 lines not on this page · raw message
arch/powerpc/configs/cell_defconfig +14 -1
@@ -139,7 +139,19 @@ CONFIG_RTAS_FLASH=y CONFIG_MMIO_NVRAM=y # CONFIG_PPC_MPC106 is not set # CONFIG_PPC_970_NAP is not set -# CONFIG_CPU_FREQ is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +# CONFIG_CPU_FREQ_PMAC64 is not set # CONFIG_WANT_EARLY_SERIAL is not set # CONFIG_MPIC is not set
@@ -150,6 +162,7 @@ CONFIG_SPU_FS=m CONFIG_SPU_BASE=y CONFIG_CBE_RAS=y CONFIG_CBE_THERM=m +CONFIG_CBE_CPUFREQ=m # # Kernel options
arch/powerpc/kernel/prom.c +1 -0
@@ -1672,6 +1672,7 @@ struct device_node *of_get_cpu_node(int }return NULL ; } +EXPORT_SYMBOL (of_get_cpu_node);#ifdef DEBUG static struct debugfs_blob_wrapper flat_dt_blob;
arch/powerpc/kernel/smp.c +1 -0
@@ -65,6 +65,7 @@ cpumask_t cpu_sibling_map[NR_CPUS] = { [EXPORT_SYMBOL (cpu_online_map);EXPORT_SYMBOL (cpu_possible_map); +EXPORT_SYMBOL (cpu_sibling_map);/* SMP operations for this machine */ struct smp_ops_t *smp_ops;
--