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

Commit 05a059f3 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Paul Mackerras
Browse files

[POWERPC] spufs: Fix restore_decr_wrapped() to match CBE Handbook 



Based on an original patch from Masato Noguchi
<Masato.Noguchi@jp.sony.com>.

We're currently not restoring the SPE decrementer as specified by the
CBE handbook. This change fixes our implementation to match, and makes
the function read more like the docs.

Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 4ec3c3d0

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

+8 −8
Original line number Diff line number Diff line
@@ -1559,15 +1559,15 @@ static inline void restore_decr_wrapped(struct spu_state *csa, struct spu *spu) 
	 *     "wrapped" flag is set, OR in a '1' to

	 *     CSA.SPU_Event_Status[Tm].

	 */

	if (csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED) {

		csa->spu_chnldata_RW[0] |= 0x20;

	}

	if ((csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED) &&

	    (csa->spu_chnlcnt_RW[0] == 0 &&

	     ((csa->spu_chnldata_RW[2] & 0x20) == 0x0) &&

	     ((csa->spu_chnldata_RW[0] & 0x20) != 0x1))) {

	if (!(csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED))

		return;



	if ((csa->spu_chnlcnt_RW[0] == 0) &&

	    (csa->spu_chnldata_RW[1] & 0x20) &&

	    !(csa->spu_chnldata_RW[0] & 0x20))

		csa->spu_chnlcnt_RW[0] = 1;

	}



	csa->spu_chnldata_RW[0] |= 0x20;

}



static inline void restore_ch_part1(struct spu_state *csa, struct spu *spu)