[POWERPC] spufs: don't (ab)use SCHED_IDLE

commit 4ef11014 introduced a usage of SCHED_IDLE to detect when
a context is within spu_run.

Instead of SCHED_IDLE (which has other meaning), add a flag to
sched_flags to tell if a context should be running.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
This commit is contained in:
Jeremy Kerr 2008-03-04 20:17:02 +11:00
parent 3cecdda3f1
commit ce7c191bca
3 changed files with 5 additions and 3 deletions

View File

@ -220,6 +220,7 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc)
} }
} }
set_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags);
return 0; return 0;
} }
@ -234,7 +235,7 @@ static int spu_run_fini(struct spu_context *ctx, u32 *npc,
*npc = ctx->ops->npc_read(ctx); *npc = ctx->ops->npc_read(ctx);
spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED);
ctx->policy = SCHED_IDLE; clear_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags);
spu_release(ctx); spu_release(ctx);
if (signal_pending(current)) if (signal_pending(current))

View File

@ -867,7 +867,7 @@ static noinline void spusched_tick(struct spu_context *ctx)
if (ctx->policy == SCHED_FIFO) if (ctx->policy == SCHED_FIFO)
goto out; goto out;
if (--ctx->time_slice && ctx->policy != SCHED_IDLE) if (--ctx->time_slice && test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags))
goto out; goto out;
spu = ctx->spu; spu = ctx->spu;
@ -877,7 +877,7 @@ static noinline void spusched_tick(struct spu_context *ctx)
new = grab_runnable_context(ctx->prio + 1, spu->node); new = grab_runnable_context(ctx->prio + 1, spu->node);
if (new) { if (new) {
spu_unschedule(spu, ctx); spu_unschedule(spu, ctx);
if (ctx->policy != SCHED_IDLE) if (test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags))
spu_add_to_rq(ctx); spu_add_to_rq(ctx);
} else { } else {
spu_context_nospu_trace(spusched_tick__newslice, ctx); spu_context_nospu_trace(spusched_tick__newslice, ctx);

View File

@ -44,6 +44,7 @@ struct spu_gang;
enum { enum {
SPU_SCHED_NOTIFY_ACTIVE, SPU_SCHED_NOTIFY_ACTIVE,
SPU_SCHED_WAS_ACTIVE, /* was active upon spu_acquire_saved() */ SPU_SCHED_WAS_ACTIVE, /* was active upon spu_acquire_saved() */
SPU_SCHED_SPU_RUN, /* context is within spu_run */
}; };
struct spu_context { struct spu_context {