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

Commit c1bad360 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix rare boot build breakage
  powerpc/spufs: Fix possible scheduling of a context to multiple SPEs
  powerpc/spufs: Fix race for a free SPU
  powerpc/spufs: Fix multiple get_spu_context()
parents 6a23312b 4ff23fa9

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ zlib := inffast.c inflate.c inftrees.c 
zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h

zliblinuxheader := zlib.h zconf.h zutil.h



$(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \

$(addprefix $(obj)/,$(zlib) cuboot-c2k.o gunzip_util.o main.o prpmc2800.o): \

	$(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))



src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c

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

+23 −6
Original line number Diff line number Diff line
@@ -643,9 +643,10 @@ static struct spu *find_victim(struct spu_context *ctx) 
			    !(tmp->flags & SPU_CREATE_NOSCHED) &&

			    (!victim || tmp->prio > victim->prio)) {

				victim = spu->ctx;

				get_spu_context(victim);

			}

		}

		if (victim)

			get_spu_context(victim);

		mutex_unlock(&cbe_spu_info[node].list_mutex);



		if (victim) {
@@ -727,16 +728,32 @@ static void spu_schedule(struct spu *spu, struct spu_context *ctx) 
	/* not a candidate for interruptible because it's called either

	   from the scheduler thread or from spu_deactivate */

	mutex_lock(&ctx->state_mutex);

	if (ctx->state == SPU_STATE_SAVED)

		__spu_schedule(spu, ctx);

	spu_release(ctx);

}



static void spu_unschedule(struct spu *spu, struct spu_context *ctx)

/**

 * spu_unschedule - remove a context from a spu, and possibly release it.

 * @spu:	The SPU to unschedule from

 * @ctx:	The context currently scheduled on the SPU

 * @free_spu	Whether to free the SPU for other contexts

 *

 * Unbinds the context @ctx from the SPU @spu. If @free_spu is non-zero, the

 * SPU is made available for other contexts (ie, may be returned by

 * spu_get_idle). If this is zero, the caller is expected to schedule another

 * context to this spu.

 *

 * Should be called with ctx->state_mutex held.

 */

static void spu_unschedule(struct spu *spu, struct spu_context *ctx,

		int free_spu)

{

	int node = spu->node;



	mutex_lock(&cbe_spu_info[node].list_mutex);

	cbe_spu_info[node].nr_active--;

	if (free_spu)

		spu->alloc_state = SPU_FREE;

	spu_unbind_context(spu, ctx);

	ctx->stats.invol_ctx_switch++;
@@ -837,7 +854,7 @@ static int __spu_deactivate(struct spu_context *ctx, int force, int max_prio) 
	if (spu) {

		new = grab_runnable_context(max_prio, spu->node);

		if (new || force) {

			spu_unschedule(spu, ctx);

			spu_unschedule(spu, ctx, new == NULL);

			if (new) {

				if (new->flags & SPU_CREATE_NOSCHED)

					wake_up(&new->stop_wq);
@@ -910,7 +927,7 @@ static noinline void spusched_tick(struct spu_context *ctx) 


	new = grab_runnable_context(ctx->prio + 1, spu->node);

	if (new) {

		spu_unschedule(spu, ctx);

		spu_unschedule(spu, ctx, 0);

		if (test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags))

			spu_add_to_rq(ctx);

	} else {