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

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

Merge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 

* 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6: (37 commits)
  [CELL] spufs: rework list management and associated locking
  [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs
  [CELL] oprofile: enable SPU switch notification to detect currently active SPU tasks
  [CELL] spu_base: locking cleanup
  [CELL] cell: indexing of SPUs based on firmware vicinity properties
  [CELL] spufs: integration of SPE affinity with the scheduller
  [CELL] cell: add placement computation for scheduling of affinity contexts
  [CELL] spufs: extension of spu_create to support affinity definition
  [CELL] cell: add hardcoded spu vicinity information for QS20
  [CELL] cell: add vicinity information on spus
  [CELL] cell: add per BE structure with info about its SPUs
  [CELL] spufs: use find_first_bit() instead of sched_find_first_bit()
  [CELL] spufs: remove unused file argument from spufs_run_spu()
  [CELL] spufs: change decrementer restore timing
  [CELL] spufs: dont halt decrementer at restore step 47
  [CELL] spufs: limit saving MFC_CNTL bits
  [CELL] spufs: fix read and write for decr_status file
  [CELL] spufs: fix decr_status meanings
  [CELL] spufs: remove needless context save/restore code
  [CELL] spufs: fix array size of channel index
  ...
parents 20082208 486acd48

arch/powerpc/configs/cell_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,8 @@ CONFIG_HAS_DMA=y 
# Instrumentation Support

#

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_OPROFILE=m

CONFIG_OPROFILE_CELL=y

# CONFIG_KPROBES is not set



#

arch/powerpc/kernel/crash.c

+67 −0
Original line number Diff line number Diff line
@@ -219,6 +219,72 @@ void crash_kexec_secondary(struct pt_regs *regs) 
	cpus_in_sr = CPU_MASK_NONE;

}

#endif

#ifdef CONFIG_SPU_BASE



#include <asm/spu.h>

#include <asm/spu_priv1.h>



struct crash_spu_info {

	struct spu *spu;

	u32 saved_spu_runcntl_RW;

	u32 saved_spu_status_R;

	u32 saved_spu_npc_RW;

	u64 saved_mfc_sr1_RW;

	u64 saved_mfc_dar;

	u64 saved_mfc_dsisr;

};



#define CRASH_NUM_SPUS	16	/* Enough for current hardware */

static struct crash_spu_info crash_spu_info[CRASH_NUM_SPUS];



static void crash_kexec_stop_spus(void)

{

	struct spu *spu;

	int i;

	u64 tmp;



	for (i = 0; i < CRASH_NUM_SPUS; i++) {

		if (!crash_spu_info[i].spu)

			continue;



		spu = crash_spu_info[i].spu;



		crash_spu_info[i].saved_spu_runcntl_RW =

			in_be32(&spu->problem->spu_runcntl_RW);

		crash_spu_info[i].saved_spu_status_R =

			in_be32(&spu->problem->spu_status_R);

		crash_spu_info[i].saved_spu_npc_RW =

			in_be32(&spu->problem->spu_npc_RW);



		crash_spu_info[i].saved_mfc_dar    = spu_mfc_dar_get(spu);

		crash_spu_info[i].saved_mfc_dsisr  = spu_mfc_dsisr_get(spu);

		tmp = spu_mfc_sr1_get(spu);

		crash_spu_info[i].saved_mfc_sr1_RW = tmp;



		tmp &= ~MFC_STATE1_MASTER_RUN_CONTROL_MASK;

		spu_mfc_sr1_set(spu, tmp);



		__delay(200);

	}

}



void crash_register_spus(struct list_head *list)

{

	struct spu *spu;



	list_for_each_entry(spu, list, full_list) {

		if (WARN_ON(spu->number >= CRASH_NUM_SPUS))

			continue;



		crash_spu_info[spu->number].spu = spu;

	}

}



#else

static inline void crash_kexec_stop_spus(void)

{

}

#endif /* CONFIG_SPU_BASE */



void default_machine_crash_shutdown(struct pt_regs *regs)

{
@@ -254,6 +320,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) 
	crash_save_cpu(regs, crashing_cpu);

	crash_kexec_prepare_cpus(crashing_cpu);

	cpu_set(crashing_cpu, cpus_in_crash);

	crash_kexec_stop_spus();

	if (ppc_md.kexec_cpu_down)

		ppc_md.kexec_cpu_down(1, 0);

}

arch/powerpc/kernel/time.c

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ extern struct timezone sys_tz; 
static long timezone_offset;



unsigned long ppc_proc_freq;

EXPORT_SYMBOL(ppc_proc_freq);

unsigned long ppc_tb_freq;



static u64 tb_last_jiffy __cacheline_aligned_in_smp;

arch/powerpc/oprofile/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -15,3 +15,10 @@ config OPROFILE 


	  If unsure, say N.



config OPROFILE_CELL

	bool "OProfile for Cell Broadband Engine"

	depends on (SPU_FS = y && OPROFILE = m) || (SPU_FS = y && OPROFILE = y) || (SPU_FS = m && OPROFILE = m)

	default y

	help

	  Profiling of Cell BE SPUs requires special support enabled

	  by this option.

arch/powerpc/oprofile/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \ 
		timer_int.o )



oprofile-y := $(DRIVER_OBJS) common.o backtrace.o

oprofile-$(CONFIG_PPC_CELL_NATIVE) += op_model_cell.o

oprofile-$(CONFIG_OPROFILE_CELL) += op_model_cell.o \

		cell/spu_profiler.o cell/vma_map.o \

		cell/spu_task_sync.o

oprofile-$(CONFIG_PPC64) += op_model_rs64.o op_model_power4.o op_model_pa6t.o

oprofile-$(CONFIG_FSL_BOOKE) += op_model_fsl_booke.o

oprofile-$(CONFIG_6xx) += op_model_7450.o