Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb758ce5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras
Browse files

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



Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5737edd1

arch/powerpc/platforms/cell/spufs/switch.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -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,

include/asm-powerpc/spu.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 */