From 826fc24214d2ebe379a0f225b5412a3027c5d369 Mon Sep 17 00:00:00 2001 From: Kazunori Asayama Date: Fri, 20 Jul 2007 21:39:30 +0200 Subject: [PATCH] --- yaml --- r: 62239 b: refs/heads/master c: 49776d30aea903fb2f9966c8e9b6f23ae5f7c937 h: refs/heads/master i: 62237: ebfbc988b17805523c43a945534f29ae56188fb4 62235: 98e65f24982ab610f3b1164dd2bcc78610e649b7 62231: 5dc883db95719ae6be47bffdc0d41873686f78ca 62223: 183bed197f41c53af84771a15246fc704955d554 62207: 327d8556d42026871e43e8d3de122598429faa2d v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/spufs/switch.c | 3 ++- trunk/include/asm-powerpc/spu.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c2928816ebd1..d4015b92061c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1450317554d52e0e4a454806c4d05bb2a834f00 +refs/heads/master: 49776d30aea903fb2f9966c8e9b6f23ae5f7c937 diff --git a/trunk/arch/powerpc/platforms/cell/spufs/switch.c b/trunk/arch/powerpc/platforms/cell/spufs/switch.c index 9c506ba08cdc..827aada391f2 100644 --- a/trunk/arch/powerpc/platforms/cell/spufs/switch.c +++ b/trunk/arch/powerpc/platforms/cell/spufs/switch.c @@ -271,7 +271,8 @@ static inline void halt_mfc_decr(struct spu_state *csa, struct spu *spu) * Write MFC_CNTL[Dh] set to a '1' to halt * the decrementer. */ - out_be64(&priv2->mfc_control_RW, MFC_CNTL_DECREMENTER_HALTED); + out_be64(&priv2->mfc_control_RW, + MFC_CNTL_DECREMENTER_HALTED | MFC_CNTL_SUSPEND_MASK); eieio(); } diff --git a/trunk/include/asm-powerpc/spu.h b/trunk/include/asm-powerpc/spu.h index 42d88a6d2dfd..a034f03b8107 100644 --- a/trunk/include/asm-powerpc/spu.h +++ b/trunk/include/asm-powerpc/spu.h @@ -411,6 +411,7 @@ struct spu_priv2 { #define MFC_CNTL_RESUME_DMA_QUEUE (0ull << 0) #define MFC_CNTL_SUSPEND_DMA_QUEUE (1ull << 0) #define MFC_CNTL_SUSPEND_DMA_QUEUE_MASK (1ull << 0) +#define MFC_CNTL_SUSPEND_MASK (1ull << 4) #define MFC_CNTL_NORMAL_DMA_QUEUE_OPERATION (0ull << 8) #define MFC_CNTL_SUSPEND_IN_PROGRESS (1ull << 8) #define MFC_CNTL_SUSPEND_COMPLETE (3ull << 8)