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

Commit 2c0b713f authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for-2.6.25' of... 

Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6 into for-2.6.25
parents f91266ed 1e771039

arch/powerpc/oprofile/op_model_cell.c

+11 −9
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static unsigned int spu_cycle_reset; 
#define NUM_THREADS 2         /* number of physical threads in

			       * physical processor

			       */

#define NUM_TRACE_BUS_WORDS 4

#define NUM_DEBUG_BUS_WORDS 4

#define NUM_INPUT_BUS_WORDS 2



#define MAX_SPU_COUNT 0xFFFFFF	/* maximum 24 bit LFSR value */
@@ -169,7 +169,6 @@ static DEFINE_SPINLOCK(virt_cntr_lock); 


static u32 ctr_enabled;



static unsigned char trace_bus[NUM_TRACE_BUS_WORDS];

static unsigned char input_bus[NUM_INPUT_BUS_WORDS];



/*
@@ -298,7 +297,7 @@ static void set_pm_event(u32 ctr, int event, u32 unit_mask) 


	p->signal_group = event / 100;

	p->bus_word = bus_word;

	p->sub_unit = (unit_mask & 0x0000f000) >> 12;

	p->sub_unit = GET_SUB_UNIT(unit_mask);



	pm_regs.pm07_cntrl[ctr] = 0;

	pm_regs.pm07_cntrl[ctr] |= PM07_CTR_COUNT_CYCLES(count_cycles);
@@ -334,16 +333,16 @@ static void set_pm_event(u32 ctr, int event, u32 unit_mask) 
		p->bit = signal_bit;

	}



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

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

		if (bus_word & (1 << i)) {

			pm_regs.debug_bus_control |=

			    (bus_type << (31 - (2 * i) + 1));

			    (bus_type << (30 - (2 * i)));



			for (j = 0; j < NUM_INPUT_BUS_WORDS; j++) {

				if (input_bus[j] == 0xff) {

					input_bus[j] = i;

					pm_regs.group_control |=

					    (i << (31 - i));

					    (i << (30 - (2 * j)));



					break;

				}
@@ -450,6 +449,12 @@ static void cell_virtual_cntr(unsigned long data) 
	hdw_thread = 1 ^ hdw_thread;

	next_hdw_thread = hdw_thread;



	pm_regs.group_control = 0;

	pm_regs.debug_bus_control = 0;



	for (i = 0; i < NUM_INPUT_BUS_WORDS; i++)

		input_bus[i] = 0xff;



	/*

	 * There are some per thread events.  Must do the

	 * set event, for the thread that is being started
@@ -619,9 +624,6 @@ static int cell_reg_setup(struct op_counter_config *ctr, 
		pmc_cntrl[1][i].vcntr = i;

	}



	for (i = 0; i < NUM_TRACE_BUS_WORDS; i++)

		trace_bus[i] = 0xff;



	for (i = 0; i < NUM_INPUT_BUS_WORDS; i++)

		input_bus[i] = 0xff;

arch/powerpc/platforms/cell/cbe_cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ 
 */



#include <linux/cpufreq.h>

#include <linux/of_platform.h>



#include <asm/machdep.h>

#include <asm/of_platform.h>

#include <asm/prom.h>

#include <asm/cell-regs.h>

#include "cbe_cpufreq.h"

arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/timer.h>

#include <asm/of_platform.h>

#include <linux/of_platform.h>



#include <asm/processor.h>

#include <asm/prom.h>

#include <asm/pmi.h>

arch/powerpc/platforms/cell/cbe_regs.c

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 
#include <linux/percpu.h>

#include <linux/types.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>



#include <asm/io.h>

#include <asm/pgtable.h>

#include <asm/prom.h>

#include <asm/ptrace.h>

#include <asm/of_device.h>

#include <asm/of_platform.h>

#include <asm/cell-regs.h>



/*

arch/powerpc/platforms/cell/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/notifier.h>

#include <linux/of_platform.h>



#include <asm/prom.h>

#include <asm/iommu.h>

#include <asm/machdep.h>

#include <asm/pci-bridge.h>

#include <asm/udbg.h>

#include <asm/of_platform.h>

#include <asm/lmb.h>

#include <asm/firmware.h>

#include <asm/cell-regs.h>