diff options
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/switch.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c index 861336e99448..a08fe93817f6 100644 --- a/arch/powerpc/platforms/cell/spufs/switch.c +++ b/arch/powerpc/platforms/cell/spufs/switch.c | |||
@@ -253,11 +253,6 @@ static inline void save_mfc_decr(struct spu_state *csa, struct spu *spu) | |||
253 | */ | 253 | */ |
254 | if (in_be64(&priv2->mfc_control_RW) & MFC_CNTL_DECREMENTER_RUNNING) { | 254 | if (in_be64(&priv2->mfc_control_RW) & MFC_CNTL_DECREMENTER_RUNNING) { |
255 | csa->priv2.mfc_control_RW |= MFC_CNTL_DECREMENTER_RUNNING; | 255 | csa->priv2.mfc_control_RW |= MFC_CNTL_DECREMENTER_RUNNING; |
256 | csa->suspend_time = get_cycles(); | ||
257 | out_be64(&priv2->spu_chnlcntptr_RW, 7ULL); | ||
258 | eieio(); | ||
259 | csa->spu_chnldata_RW[7] = in_be64(&priv2->spu_chnldata_RW); | ||
260 | eieio(); | ||
261 | } else { | 256 | } else { |
262 | csa->priv2.mfc_control_RW &= ~MFC_CNTL_DECREMENTER_RUNNING; | 257 | csa->priv2.mfc_control_RW &= ~MFC_CNTL_DECREMENTER_RUNNING; |
263 | } | 258 | } |
@@ -1567,13 +1562,8 @@ static inline void restore_ch_part1(struct spu_state *csa, struct spu *spu) | |||
1567 | int i; | 1562 | int i; |
1568 | 1563 | ||
1569 | /* Restore, Step 59: | 1564 | /* Restore, Step 59: |
1565 | * Restore the following CH: [0,3,4,24,25,27] | ||
1570 | */ | 1566 | */ |
1571 | |||
1572 | /* Restore CH 1 without count */ | ||
1573 | out_be64(&priv2->spu_chnlcntptr_RW, 1); | ||
1574 | out_be64(&priv2->spu_chnldata_RW, csa->spu_chnldata_RW[1]); | ||
1575 | |||
1576 | /* Restore the following CH: [0,3,4,24,25,27] */ | ||
1577 | for (i = 0; i < ARRAY_SIZE(ch_indices); i++) { | 1567 | for (i = 0; i < ARRAY_SIZE(ch_indices); i++) { |
1578 | idx = ch_indices[i]; | 1568 | idx = ch_indices[i]; |
1579 | out_be64(&priv2->spu_chnlcntptr_RW, idx); | 1569 | out_be64(&priv2->spu_chnlcntptr_RW, idx); |