Commit 4eb5aef5 authored by Jeremy Kerr's avatar Jeremy Kerr

[POWERPC] spufs: reacquire LS pointer in spu_process_callback

During spu_process callback, we release then acquire the SPU, but keep a
pointer to the local store memory. Since the context may have been
scheduled out during the callback, the ls pointer may become invalid.

This change reacquires the pointer to the context local store after
spu_acquire()-ing, so that it isn't invalidated by a context switch.
Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
parent af8b44e0
...@@ -323,6 +323,10 @@ static int spu_process_callback(struct spu_context *ctx) ...@@ -323,6 +323,10 @@ static int spu_process_callback(struct spu_context *ctx)
return -EINTR; return -EINTR;
} }
/* need to re-get the ls, as it may have changed when we released the
* spu */
ls = (void __iomem *)ctx->ops->get_ls(ctx);
/* write result, jump over indirect pointer */ /* write result, jump over indirect pointer */
memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret)); memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret));
ctx->ops->npc_write(ctx, npc); ctx->ops->npc_write(ctx, npc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment