AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[POWERPC] spufs: "stautus" isnt a word.

Browse Source 
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
arnd@arndb.de 2006-10-24 18:31:17 +02:00 committed by Paul Mackerras
parent 5737edd1dd
commit eb758ce5b0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ static inline int check_spu_isolate(struct spu_state *csa, struct spu *spu)
* saved at this time. * saved at this time.
*/ */
isolate_state = SPU_STATUS_ISOLATED_STATE | isolate_state = SPU_STATUS_ISOLATED_STATE |
SPU_STATUS_ISOLATED_LOAD_STAUTUS | SPU_STATUS_ISOLATED_EXIT_STAUTUS; SPU_STATUS_ISOLATED_LOAD_STATUS | SPU_STATUS_ISOLATED_EXIT_STATUS;
return (in_be32(&prob->spu_status_R) & isolate_state) ? 1 : 0; return (in_be32(&prob->spu_status_R) & isolate_state) ? 1 : 0;
} }
@ -1046,12 +1046,12 @@ static inline int suspend_spe(struct spu_state *csa, struct spu *spu)
*/ */
if (in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING) { if (in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING) {
if (in_be32(&prob->spu_status_R) & if (in_be32(&prob->spu_status_R) &
SPU_STATUS_ISOLATED_EXIT_STAUTUS) { SPU_STATUS_ISOLATED_EXIT_STATUS) {
POLL_WHILE_TRUE(in_be32(&prob->spu_status_R) & POLL_WHILE_TRUE(in_be32(&prob->spu_status_R) &
SPU_STATUS_RUNNING); SPU_STATUS_RUNNING);
} }
if ((in_be32(&prob->spu_status_R) & if ((in_be32(&prob->spu_status_R) &
SPU_STATUS_ISOLATED_LOAD_STAUTUS) SPU_STATUS_ISOLATED_LOAD_STATUS)
|| (in_be32(&prob->spu_status_R) & || (in_be32(&prob->spu_status_R) &
SPU_STATUS_ISOLATED_STATE)) { SPU_STATUS_ISOLATED_STATE)) {
out_be32(&prob->spu_runcntl_RW, SPU_RUNCNTL_STOP); out_be32(&prob->spu_runcntl_RW, SPU_RUNCNTL_STOP);
@ -1085,7 +1085,7 @@ static inline void clear_spu_status(struct spu_state *csa, struct spu *spu)
*/ */
if (!(in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING)) { if (!(in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING)) {
if (in_be32(&prob->spu_status_R) & if (in_be32(&prob->spu_status_R) &
SPU_STATUS_ISOLATED_EXIT_STAUTUS) { SPU_STATUS_ISOLATED_EXIT_STATUS) {
spu_mfc_sr1_set(spu, spu_mfc_sr1_set(spu,
MFC_STATE1_MASTER_RUN_CONTROL_MASK); MFC_STATE1_MASTER_RUN_CONTROL_MASK);
eieio(); eieio();
@ -1095,7 +1095,7 @@ static inline void clear_spu_status(struct spu_state *csa, struct spu *spu)
SPU_STATUS_RUNNING); SPU_STATUS_RUNNING);
} }
if ((in_be32(&prob->spu_status_R) & if ((in_be32(&prob->spu_status_R) &
SPU_STATUS_ISOLATED_LOAD_STAUTUS) SPU_STATUS_ISOLATED_LOAD_STATUS)
|| (in_be32(&prob->spu_status_R) & || (in_be32(&prob->spu_status_R) &
SPU_STATUS_ISOLATED_STATE)) { SPU_STATUS_ISOLATED_STATE)) {
spu_mfc_sr1_set(spu, spu_mfc_sr1_set(spu,

4
include/asm-powerpc/spu.h
View File

@ -291,8 +291,8 @@ struct spu_problem {
#define SPU_STATUS_INVALID_INSTR 0x20 #define SPU_STATUS_INVALID_INSTR 0x20
#define SPU_STATUS_INVALID_CH 0x40 #define SPU_STATUS_INVALID_CH 0x40
#define SPU_STATUS_ISOLATED_STATE 0x80 #define SPU_STATUS_ISOLATED_STATE 0x80
#define SPU_STATUS_ISOLATED_LOAD_STAUTUS 0x200 #define SPU_STATUS_ISOLATED_LOAD_STATUS 0x200
#define SPU_STATUS_ISOLATED_EXIT_STAUTUS 0x400 #define SPU_STATUS_ISOLATED_EXIT_STATUS 0x400
u8 pad_0x4028_0x402c[0x4]; /* 0x4028 */ u8 pad_0x4028_0x402c[0x4]; /* 0x4028 */
u32 spu_spe_R; /* 0x402c */ u32 spu_spe_R; /* 0x402c */
u8 pad_0x4030_0x4034[0x4]; /* 0x4030 */ u8 pad_0x4030_0x4034[0x4]; /* 0x4030 */