[POWERPC] spufs: dont try to access SPE channel 1 count

The save/restore sequence for SPE contexts currently attempts to save
and restore the channel count for SPE channel 1 (the SPU_WriteEventMask
channel.  But the CBE architecture (section 9.11.2) clearly states
that this channel does not have an associated count.  Hardware simply
ignores the attempt to write this count, but the simulator generates
a warning message.

WARNING: 279721590: SPE7: Attempt to write channel count for CH 1 with
no associated count is ignored.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 4210ec2cb4ca4d9f272db392b1aae3ed83d5acd2..85bea06e798bf8ebbe82926ca95a6f6bdeb087aa 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -622,12 +622,17 @@ static inline void save_ppuint_mb(struct spu_state *csa, struct spu *spu)
 static inline void save_ch_part1(struct spu_state *csa, struct spu *spu)
 {
        struct spu_priv2 __iomem *priv2 = spu->priv2;
-       u64 idx, ch_indices[7] = { 0UL, 1UL, 3UL, 4UL, 24UL, 25UL, 27UL };
+       u64 idx, ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };
        int i;
 
        /* Save, Step 42:
-        *     Save the following CH: [0,1,3,4,24,25,27]
         */
+
+       /* Save CH 1, without channel count */
+       out_be64(&priv2->spu_chnlcntptr_RW, 1);
+       csa->spu_chnldata_RW[1] = in_be64(&priv2->spu_chnldata_RW);
+
+       /* Save the following CH: [0,3,4,24,25,27] */
        for (i = 0; i < 7; i++) {
                idx = ch_indices[i];
                out_be64(&priv2->spu_chnlcntptr_RW, idx);
@@ -1105,13 +1110,18 @@ static inline void clear_spu_status(struct spu_state *csa, struct spu *spu)
 static inline void reset_ch_part1(struct spu_state *csa, struct spu *spu)
 {
        struct spu_priv2 __iomem *priv2 = spu->priv2;
-       u64 ch_indices[7] = { 0UL, 1UL, 3UL, 4UL, 24UL, 25UL, 27UL };
+       u64 ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };
        u64 idx;
        int i;
 
        /* Restore, Step 20:
-        *     Reset the following CH: [0,1,3,4,24,25,27]
         */
+
+       /* Reset CH 1 */
+       out_be64(&priv2->spu_chnlcntptr_RW, 1);
+       out_be64(&priv2->spu_chnldata_RW, 0UL);
+
+       /* Reset the following CH: [0,3,4,24,25,27] */
        for (i = 0; i < 7; i++) {
                idx = ch_indices[i];
                out_be64(&priv2->spu_chnlcntptr_RW, idx);
@@ -1572,12 +1582,17 @@ static inline void restore_decr_wrapped(struct spu_state *csa, struct spu *spu)
 static inline void restore_ch_part1(struct spu_state *csa, struct spu *spu)
 {
        struct spu_priv2 __iomem *priv2 = spu->priv2;
-       u64 idx, ch_indices[7] = { 0UL, 1UL, 3UL, 4UL, 24UL, 25UL, 27UL };
+       u64 idx, ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };
        int i;
 
        /* Restore, Step 59:
-        *     Restore the following CH: [0,1,3,4,24,25,27]
         */
+
+       /* Restore CH 1 without count */
+       out_be64(&priv2->spu_chnlcntptr_RW, 1);
+       out_be64(&priv2->spu_chnldata_RW, csa->spu_chnldata_RW[1]);
+
+       /* Restore the following CH: [0,3,4,24,25,27] */
        for (i = 0; i < 7; i++) {
                idx = ch_indices[i];
                out_be64(&priv2->spu_chnlcntptr_RW, idx);