lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CELL] spufs: fix array size of channel index

Browse Source 
Based on a fix from Masato Noguchi <Masato.Noguchi@jp.sony.com>.

Remove the (incorrect) array size declarations in the spufs channel
arrays, and use ARRAY_SIZE rather than hardcoded values.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
This commit is contained in:
Jeremy Kerr
2007-07-20 21:39:35 +02:00
committed by Arnd Bergmann
parent 27b1ea091f
commit daced0f718
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/platforms/cell/spufs/switch.c
View File

@@ -616,7 +616,7 @@ 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) static inline void save_ch_part1(struct spu_state *csa, struct spu *spu)
{ {
struct spu_priv2 __iomem *priv2 = spu->priv2; struct spu_priv2 __iomem *priv2 = spu->priv2;
u64 idx, ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL }; u64 idx, ch_indices[] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };
int i; int i;
/* Save, Step 42: /* Save, Step 42:
@@ -627,7 +627,7 @@ static inline void save_ch_part1(struct spu_state *csa, struct spu *spu)
csa->spu_chnldata_RW[1] = in_be64(&priv2->spu_chnldata_RW); csa->spu_chnldata_RW[1] = in_be64(&priv2->spu_chnldata_RW);
/* Save the following CH: [0,3,4,24,25,27] */ /* Save the following CH: [0,3,4,24,25,27] */
for (i = 0; i < 7; i++) { for (i = 0; i < ARRAY_SIZE(ch_indices); i++) {
idx = ch_indices[i]; idx = ch_indices[i];
out_be64(&priv2->spu_chnlcntptr_RW, idx); out_be64(&priv2->spu_chnlcntptr_RW, idx);
eieio(); eieio();
@@ -1091,7 +1091,7 @@ 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) static inline void reset_ch_part1(struct spu_state *csa, struct spu *spu)
{ {
struct spu_priv2 __iomem *priv2 = spu->priv2; struct spu_priv2 __iomem *priv2 = spu->priv2;
u64 ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL }; u64 ch_indices[] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };
u64 idx; u64 idx;
int i; int i;
@@ -1103,7 +1103,7 @@ static inline void reset_ch_part1(struct spu_state *csa, struct spu *spu)
out_be64(&priv2->spu_chnldata_RW, 0UL); out_be64(&priv2->spu_chnldata_RW, 0UL);
/* Reset the following CH: [0,3,4,24,25,27] */ /* Reset the following CH: [0,3,4,24,25,27] */
for (i = 0; i < 7; i++) { for (i = 0; i < ARRAY_SIZE(ch_indices); i++) {
idx = ch_indices[i]; idx = ch_indices[i];
out_be64(&priv2->spu_chnlcntptr_RW, idx); out_be64(&priv2->spu_chnlcntptr_RW, idx);
eieio(); eieio();
@@ -1563,7 +1563,7 @@ 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) static inline void restore_ch_part1(struct spu_state *csa, struct spu *spu)
{ {
struct spu_priv2 __iomem *priv2 = spu->priv2; struct spu_priv2 __iomem *priv2 = spu->priv2;
u64 idx, ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL }; u64 idx, ch_indices[] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };
int i; int i;
/* Restore, Step 59: /* Restore, Step 59:
@@ -1574,7 +1574,7 @@ static inline void restore_ch_part1(struct spu_state *csa, struct spu *spu)
out_be64(&priv2->spu_chnldata_RW, csa->spu_chnldata_RW[1]); out_be64(&priv2->spu_chnldata_RW, csa->spu_chnldata_RW[1]);
/* Restore the following CH: [0,3,4,24,25,27] */ /* Restore the following CH: [0,3,4,24,25,27] */
for (i = 0; i < 7; i++) { for (i = 0; i < ARRAY_SIZE(ch_indices); i++) {
idx = ch_indices[i]; idx = ch_indices[i];
out_be64(&priv2->spu_chnlcntptr_RW, idx); out_be64(&priv2->spu_chnlcntptr_RW, idx);
eieio(); eieio();