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

Commit 8483ca3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Make sure __cpu_preinit_ppc970 gets called on 970GX processors
  [POWERPC] Fix CHRP platforms with only 8259
  [POWERPC] IPIC: Fix spinlock recursion in set_irq_handler
  [POWERPC] Fix the UCC rx/tx clock of QE
  [POWERPC] cell: update defconfig
  [POWERPC] spufs: fix another off-by-one bug in spufs_mbox_read
  [POWERPC] spufs: fix signal2 file to report signal2
  [POWERPC] Fix device_is_compatible() const warning
  [POWERPC] Cell timebase bug workaround
  [POWERPC] Support feature fixups in modules
  [POWERPC] Support feature fixups in vdso's
  [POWERPC] Support nested cpu feature sections
  [POWERPC] Consolidate feature fixup code
  [POWERPC] Fix hang in start_ldr if _end or _edata is unaligned
  [POWERPC] Fix spelling errors in ucc_fast.c and ucc_slow.c
  [POWERPC] Don't require execute perms on wrapper when building zImage.initrd
  [POWERPC] Add 970GX cputable entry
  [POWERPC] Fix build breakage with CONFIG_PPC32
  [POWERPC] Fix compiler warning message on get_property call
  [POWERPC] Simplify stolen time calculation
parents ede847c4 190a24f5

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ endif 
quiet_cmd_wrap	= WRAP    $@

      cmd_wrap	=$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux

quiet_cmd_wrap_initrd = WRAP    $@

      cmd_wrap_initrd =$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \

      cmd_wrap_initrd =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \

				-i $(obj)/ramdisk.image.gz vmlinux



$(obj)/zImage.chrp: vmlinux $(wrapperbits)

arch/powerpc/configs/cell_defconfig

+13 −6
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ CONFIG_SYN_COOKIES=y 
CONFIG_INET_TUNNEL=y

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

# CONFIG_INET_XFRM_MODE_BEET is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -275,7 +276,9 @@ CONFIG_INET6_XFRM_TUNNEL=m 
CONFIG_INET6_TUNNEL=m

CONFIG_INET6_XFRM_MODE_TRANSPORT=y

CONFIG_INET6_XFRM_MODE_TUNNEL=y

# CONFIG_INET6_XFRM_MODE_BEET is not set

# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set

# CONFIG_IPV6_SIT is not set

CONFIG_IPV6_TUNNEL=m

# CONFIG_IPV6_SUBTREES is not set

# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -405,6 +408,12 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# Misc devices

#

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set



#

# ATA/ATAPI/MFM/RLL support

#
@@ -738,7 +747,6 @@ CONFIG_GEN_RTC=y 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -802,6 +810,7 @@ CONFIG_I2C_ALGOBIT=y 
#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support
@@ -809,15 +818,10 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_HWMON is not set

# CONFIG_HWMON_VID is not set



#

# Misc devices

#



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y



#

# Digital Video Broadcasting Devices
@@ -923,6 +927,7 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set

# CONFIG_EXT4DEV_FS is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

CONFIG_FS_MBCACHE=y
@@ -930,6 +935,7 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set
@@ -1129,6 +1135,7 @@ CONFIG_DEBUG_FS=y 
# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_FORCED_INLINING is not set

# CONFIG_HEADERS_CHECK is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_DEBUG_STACKOVERFLOW is not set

# CONFIG_DEBUG_STACK_USAGE is not set

arch/powerpc/kernel/cputable.c

+85 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <asm/oprofile_impl.h>

#include <asm/cputable.h>

#include <asm/prom.h>		/* for PTRRELOC on ARCH=ppc */



struct cpu_spec* cur_cpu_spec = NULL;

EXPORT_SYMBOL(cur_cpu_spec);
@@ -73,7 +74,7 @@ extern void __restore_cpu_ppc970(void); 
#define PPC_FEATURE_SPE_COMP	0

#endif



struct cpu_spec	cpu_specs[] = {

static struct cpu_spec cpu_specs[] = {

#ifdef CONFIG_PPC64

	{	/* Power3 */

		.pvr_mask		= 0xffff0000,
@@ -227,6 +228,21 @@ struct cpu_spec cpu_specs[] = { 
		.oprofile_type		= PPC_OPROFILE_POWER4,

		.platform		= "ppc970",

	},

	{	/* PPC970GX */

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x00450000,

		.cpu_name		= "PPC970GX",

		.cpu_features		= CPU_FTRS_PPC970,

		.cpu_user_features	= COMMON_USER_POWER4 |

			PPC_FEATURE_HAS_ALTIVEC_COMP,

		.icache_bsize		= 128,

		.dcache_bsize		= 128,

		.num_pmcs		= 8,

		.cpu_setup		= __setup_cpu_ppc970,

		.oprofile_cpu_type	= "ppc64/970",

		.oprofile_type		= PPC_OPROFILE_POWER4,

		.platform		= "ppc970",

	},

	{	/* Power5 GR */

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x003a0000,
@@ -1152,3 +1168,71 @@ struct cpu_spec cpu_specs[] = { 
#endif /* !CLASSIC_PPC */

#endif /* CONFIG_PPC32 */

};



struct cpu_spec *identify_cpu(unsigned long offset)

{

	struct cpu_spec *s = cpu_specs;

	struct cpu_spec **cur = &cur_cpu_spec;

	unsigned int pvr = mfspr(SPRN_PVR);

	int i;



	s = PTRRELOC(s);

	cur = PTRRELOC(cur);



	if (*cur != NULL)

		return PTRRELOC(*cur);



	for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++)

		if ((pvr & s->pvr_mask) == s->pvr_value) {

			*cur = cpu_specs + i;

#ifdef CONFIG_PPC64

			/* ppc64 expects identify_cpu to also call setup_cpu

			 * for that processor. I will consolidate that at a

			 * later time, for now, just use our friend #ifdef.

			 * we also don't need to PTRRELOC the function pointer

			 * on ppc64 as we are running at 0 in real mode.

			 */

			if (s->cpu_setup) {

				s->cpu_setup(offset, s);

			}

#endif /* CONFIG_PPC64 */

			return s;

		}

	BUG();

	return NULL;

}



void do_feature_fixups(unsigned long value, void *fixup_start, void *fixup_end)

{

	struct fixup_entry {

		unsigned long	mask;

		unsigned long	value;

		long		start_off;

		long		end_off;

	} *fcur, *fend;



	fcur = fixup_start;

	fend = fixup_end;



	for (; fcur < fend; fcur++) {

		unsigned int *pstart, *pend, *p;



		if ((value & fcur->mask) == fcur->value)

			continue;



		/* These PTRRELOCs will disappear once the new scheme for

		 * modules and vdso is implemented

		 */

		pstart = ((unsigned int *)fcur) + (fcur->start_off / 4);

		pend = ((unsigned int *)fcur) + (fcur->end_off / 4);



		for (p = pstart; p < pend; p++) {

			*p = 0x60000000u;

			asm volatile ("dcbst 0, %0" : : "r" (p));

		}

		asm volatile ("sync" : : : "memory");

		for (p = pstart; p < pend; p++)

			asm volatile ("icbi 0,%0" : : "r" (p));

		asm volatile ("sync; isync" : : : "memory");

	}

}

arch/powerpc/kernel/head_64.S

+2 −19
Original line number Diff line number Diff line
@@ -1580,11 +1580,6 @@ _STATIC(__start_initialization_iSeries) 
	li	r0,0

	stdu	r0,-STACK_FRAME_OVERHEAD(r1)



	LOAD_REG_IMMEDIATE(r3,cpu_specs)

	LOAD_REG_IMMEDIATE(r4,cur_cpu_spec)

	li	r5,0

	bl	.identify_cpu



	LOAD_REG_IMMEDIATE(r2,__toc_start)

	addi	r2,r2,0x4000

	addi	r2,r2,0x4000
@@ -1646,6 +1641,8 @@ _GLOBAL(__start_initialization_multiplatform) 
	cmpwi	r0,0x3c		/* 970FX */

	beq	1f

	cmpwi	r0,0x44		/* 970MP */

	beq	1f

	cmpwi	r0,0x45		/* 970GX */

	bne	2f

1:	bl	.__cpu_preinit_ppc970

2:
@@ -1964,13 +1961,6 @@ _STATIC(start_here_multiplatform) 
	addi	r2,r2,0x4000

	add	r2,r2,r26



	LOAD_REG_IMMEDIATE(r3, cpu_specs)

	add	r3,r3,r26

	LOAD_REG_IMMEDIATE(r4,cur_cpu_spec)

	add	r4,r4,r26

	mr	r5,r26

	bl	.identify_cpu



	/* Do very early kernel initializations, including initial hash table,

	 * stab and slb setup before we turn on relocation.	*/
@@ -2000,13 +1990,6 @@ _STATIC(start_here_common) 
	li	r0,0

	stdu	r0,-STACK_FRAME_OVERHEAD(r1)



	/* Apply the CPUs-specific fixups (nop out sections not relevant

	 * to this CPU

	 */

	li	r3,0

	bl	.do_cpu_ftr_fixups

	bl	.do_fw_ftr_fixups



	/* ptr to current */

	LOAD_REG_IMMEDIATE(r4, init_task)

	std	r4,PACACURRENT(r13)

arch/powerpc/kernel/misc_32.S

+0 −74
Original line number Diff line number Diff line
@@ -101,80 +101,6 @@ _GLOBAL(reloc_got2) 
	mtlr	r11

	blr



/*

 * identify_cpu,

 * called with r3 = data offset and r4 = CPU number

 * doesn't change r3

 */

_GLOBAL(identify_cpu)

	addis	r8,r3,cpu_specs@ha

	addi	r8,r8,cpu_specs@l

	mfpvr	r7

1:

	lwz	r5,CPU_SPEC_PVR_MASK(r8)

	and	r5,r5,r7

	lwz	r6,CPU_SPEC_PVR_VALUE(r8)

	cmplw	0,r6,r5

	beq	1f

	addi	r8,r8,CPU_SPEC_ENTRY_SIZE

	b	1b

1:

	addis	r6,r3,cur_cpu_spec@ha

	addi	r6,r6,cur_cpu_spec@l

	sub	r8,r8,r3

	stw	r8,0(r6)

	blr



/*

 * do_cpu_ftr_fixups - goes through the list of CPU feature fixups

 * and writes nop's over sections of code that don't apply for this cpu.

 * r3 = data offset (not changed)

 */

_GLOBAL(do_cpu_ftr_fixups)

	/* Get CPU 0 features */

	addis	r6,r3,cur_cpu_spec@ha

	addi	r6,r6,cur_cpu_spec@l

	lwz	r4,0(r6)

	add	r4,r4,r3

	lwz	r4,CPU_SPEC_FEATURES(r4)



	/* Get the fixup table */

	addis	r6,r3,__start___ftr_fixup@ha

	addi	r6,r6,__start___ftr_fixup@l

	addis	r7,r3,__stop___ftr_fixup@ha

	addi	r7,r7,__stop___ftr_fixup@l



	/* Do the fixup */

1:	cmplw	0,r6,r7

	bgelr

	addi	r6,r6,16

	lwz	r8,-16(r6)	/* mask */

	and	r8,r8,r4

	lwz	r9,-12(r6)	/* value */

	cmplw	0,r8,r9

	beq	1b

	lwz	r8,-8(r6)	/* section begin */

	lwz	r9,-4(r6)	/* section end */

	subf.	r9,r8,r9

	beq	1b

	/* write nops over the section of code */

	/* todo: if large section, add a branch at the start of it */

	srwi	r9,r9,2

	mtctr	r9

	add	r8,r8,r3

	lis	r0,0x60000000@h	/* nop */

3:	stw	r0,0(r8)

	andi.	r10,r4,CPU_FTR_SPLIT_ID_CACHE@l

	beq	2f

	dcbst	0,r8		/* suboptimal, but simpler */

	sync

	icbi	0,r8

2:	addi	r8,r8,4

	bdnz	3b

	sync			/* additional sync needed on g4 */

	isync

	b	1b



/*

 * call_setup_cpu - call the setup_cpu function for this cpu

 * r3 = data offset, r24 = cpu number