Commit df762ecc authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel-stable' into for-next 

Conflicts:
	arch/arm/include/asm/atomic.h
	arch/arm/include/asm/hardirq.h
	arch/arm/kernel/smp.c
parents ec1e20a0 70d42126

arch/arm/Kconfig

+29 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ config ARM 
	select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_UID16
@@ -482,6 +484,7 @@ config ARCH_IXP4XX 
	bool "IXP4xx-based"

	depends on MMU

	select ARCH_HAS_DMA_SET_COHERENT_MASK

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARCH_REQUIRE_GPIOLIB

	select CLKSRC_MMIO

	select CPU_XSCALE
@@ -1545,6 +1548,32 @@ config MCPM 
	  for (multi-)cluster based systems, such as big.LITTLE based

	  systems.



config BIG_LITTLE

	bool "big.LITTLE support (Experimental)"

	depends on CPU_V7 && SMP

	select MCPM

	help

	  This option enables support selections for the big.LITTLE

	  system architecture.



config BL_SWITCHER

	bool "big.LITTLE switcher support"

	depends on BIG_LITTLE && MCPM && HOTPLUG_CPU

	select CPU_PM

	select ARM_CPU_SUSPEND

	help

	  The big.LITTLE "switcher" provides the core functionality to

	  transparently handle transition between a cluster of A15's

	  and a cluster of A7's in a big.LITTLE system.



config BL_SWITCHER_DUMMY_IF

	tristate "Simple big.LITTLE switcher user interface"

	depends on BL_SWITCHER && DEBUG_KERNEL

	help

	  This is a simple and dummy char dev interface to control

	  the big.LITTLE switcher core code.  It is meant for

	  debugging purposes only.



choice

	prompt "Memory split"

	default VMSPLIT_3G

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ LDFLAGS := 
LDFLAGS_vmlinux	:=-p --no-undefined -X

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux	+= --be8

LDFLAGS_MODULE	+= --be8

endif



OBJCOPYFLAGS	:=-O binary -R .comment -S

arch/arm/boot/compressed/head.S

+3 −6
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ start: 
		.word	_edata			@ zImage end address

 THUMB(		.thumb			)

1:

 ARM_BE8(	setend	be )			@ go BE8 if compiled for BE8

		mrs	r9, cpsr

#ifdef CONFIG_ARM_VIRT_EXT

		bl	__hyp_stub_install	@ get into SVC mode, reversibly
@@ -699,9 +700,7 @@ __armv4_mmu_cache_on: 
		mrc	p15, 0, r0, c1, c0, 0	@ read control reg

		orr	r0, r0, #0x5000		@ I-cache enable, RR cache replacement

		orr	r0, r0, #0x0030

#ifdef CONFIG_CPU_ENDIAN_BE8

		orr	r0, r0, #1 << 25	@ big-endian page tables

#endif

 ARM_BE8(	orr	r0, r0, #1 << 25 )	@ big-endian page tables

		bl	__common_mmu_cache_on

		mov	r0, #0

		mcr	p15, 0, r0, c8, c7, 0	@ flush I,D TLBs
@@ -728,9 +727,7 @@ __armv7_mmu_cache_on: 
		orr	r0, r0, #1 << 22	@ U (v6 unaligned access model)

						@ (needed for ARM1176)

#ifdef CONFIG_MMU

#ifdef CONFIG_CPU_ENDIAN_BE8

		orr	r0, r0, #1 << 25	@ big-endian page tables

#endif

 ARM_BE8(	orr	r0, r0, #1 << 25 )	@ big-endian page tables

		mrcne   p15, 0, r6, c2, c0, 2   @ read ttb control reg

		orrne	r0, r0, #1		@ MMU enabled

		movne	r1, #0xfffffffd		@ domain 0 = client

arch/arm/common/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -17,3 +17,5 @@ obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o 
AFLAGS_mcpm_head.o		:= -march=armv7-a

AFLAGS_vlock.o			:= -march=armv7-a

obj-$(CONFIG_TI_PRIV_EDMA)	+= edma.o

obj-$(CONFIG_BL_SWITCHER)	+= bL_switcher.o

obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o

arch/arm/common/bL_switcher.c

0 → 100644
+822 −0

File added.

Preview size limit exceeded, changes collapsed.