Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 732377c5 authored by Masato Noguchi's avatar Masato Noguchi Committed by Paul Mackerras
Browse files

[POWERPC] spufs: Update SPU_Status[CISHP] in backing runcntl write 



Currently, the kernel may fail to restart a SPE context which
has stopped and been swapped out.

This changes spu_backing_runcntl_write to emulate the real
SPU_Status register exactly.  When the SPU Run Control register
is written with SPU_RunCntl[Run] set to '1', the physical SPU
automatically sets SPU_Status[R] and clears SPU_Status[CISHP].

Signed-off-by: default avatarMasato Noguchi <Masato.Noguchi@jp.sony.com>
Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent eebead5b

arch/powerpc/platforms/cell/spufs/backing_ops.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -288,6 +288,12 @@ static void spu_backing_runcntl_write(struct spu_context *ctx, u32 val) 
	spin_lock(&ctx->csa.register_lock);

	spin_lock(&ctx->csa.register_lock);

	ctx->csa.prob.spu_runcntl_RW = val;

	ctx->csa.prob.spu_runcntl_RW = val;

	if (val & SPU_RUNCNTL_RUNNABLE) {

	if (val & SPU_RUNCNTL_RUNNABLE) {

		ctx->csa.prob.spu_status_R &=

			~SPU_STATUS_STOPPED_BY_STOP &

			~SPU_STATUS_STOPPED_BY_HALT &

			~SPU_STATUS_SINGLE_STEP &

			~SPU_STATUS_INVALID_INSTR &

			~SPU_STATUS_INVALID_CH;

		ctx->csa.prob.spu_status_R |= SPU_STATUS_RUNNING;

		ctx->csa.prob.spu_status_R |= SPU_STATUS_RUNNING;

	} else {

	} else {

		ctx->csa.prob.spu_status_R &= ~SPU_STATUS_RUNNING;

		ctx->csa.prob.spu_status_R &= ~SPU_STATUS_RUNNING;