Merge branch 'for_rmk' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into devel

config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP ||ARCH_OMAP4)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if ARCH_REALVIEW

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If

config LOCAL_TIMERS

	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP)

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || ARCH_OMAP4)

	default y

	select HAVE_ARM_TWD if ARCH_REALVIEW

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4)

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system

#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29

# Fri April 19 19:58:24 20089

# Linux kernel version: 2.6.30-rc7

# Tue Jun  9 12:36:23 2009

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

# CONFIG_NO_IOPORT is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

# General setup

#

CONFIG_EXPERIMENTAL=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_GZIP=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLUB_DEBUG=y

CONFIG_COMPAT_BRK=y

# CONFIG_SLAB is not set

# CONFIG_SLUB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

CONFIG_HAVE_CLK=y

# CONFIG_SLOW_WORK is not set

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_STOP_MACHINE=y

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_ORION5X is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_DAVINCI is not set

CONFIG_ARCH_OMAP=y

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_W90X900 is not set

#

# TI OMAP Implementations

# OMAP Feature Selections

#

# CONFIG_OMAP_RESET_CLOCKS is not set

# CONFIG_OMAP_COMPONENT_VERSION is not set

# CONFIG_OMAP_GPIO_SWITCH is not set

# CONFIG_OMAP_MUX is not set

# CONFIG_OMAP_MCBSP is not set

# CONFIG_OMAP_MBOX_FWK is not set

# CONFIG_OMAP_LL_DEBUG_UART2 is not set

# CONFIG_OMAP_LL_DEBUG_UART3 is not set

#

# OMAP Board Type

#

CONFIG_CPU_DCACHE_DISABLE=y

# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_HAS_TLS_REG=y

# CONFIG_OUTER_CACHE is not set

# CONFIG_ARM_ERRATA_430973 is not set

# CONFIG_ARM_ERRATA_458693 is not set

# CONFIG_ARM_ERRATA_460075 is not set

CONFIG_ARM_GIC=y

#

# CONFIG_NO_HZ is not set

# CONFIG_HIGH_RES_TIMERS is not set

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

CONFIG_SMP=y

CONFIG_HAVE_ARM_SCU=y

CONFIG_HAVE_ARM_TWD=y

CONFIG_VMSPLIT_3G=y

# CONFIG_VMSPLIT_2G is not set

# CONFIG_VMSPLIT_1G is not set

CONFIG_PAGE_OFFSET=0xC0000000

CONFIG_NR_CPUS=2

# CONFIG_HOTPLUG_CPU is not set

CONFIG_LOCAL_TIMERS=y

# CONFIG_PREEMPT is not set

CONFIG_HZ=128

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_ARCH_FLATMEM_HAS_HOLES=y

# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set

# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

# CONFIG_HIGHMEM is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

# CONFIG_UNEVICTABLE_LRU is not set

CONFIG_HAVE_MLOCK=y

# CONFIG_LEDS is not set

CONFIG_ALIGNMENT_TRAP=y

#

# At least one emulation must be selected

#

CONFIG_FPE_NWFPE=y

# CONFIG_FPE_NWFPE_XP is not set

# CONFIG_FPE_FASTFPE is not set

CONFIG_VFP=y

CONFIG_VFPv3=y

# CONFIG_NEON is not set

# Userspace binary formats

#

CONFIG_BINFMT_ELF=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_HAVE_AOUT=y

# CONFIG_BINFMT_AOUT is not set

CONFIG_BINFMT_MISC=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM_TIMERIOMEM is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_REGULATOR is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

#

# CBUS support

#

# CONFIG_CBUS is not set

#

# File systems

#

# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

# CONFIG_EXT3_FS_XATTR is not set

# CONFIG_EXT4_FS is not set

CONFIG_JBD=y

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set

#

# Caches

#

# CONFIG_FSCACHE is not set

#

# CD-ROM/DVD Filesystems

#

#

CONFIG_PROC_FS=y

CONFIG_PROC_SYSCTL=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

#

# Partition Types

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_SHIRQ is not set

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set

CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0

CONFIG_SCHED_DEBUG=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_LOCK_ALLOC is not set

# CONFIG_PROVE_LOCKING is not set

# CONFIG_LOCK_STAT is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

# CONFIG_DEBUG_MEMORY_INIT is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_DEBUG_NOTIFIERS is not set

CONFIG_FRAME_POINTER=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

# CONFIG_PAGE_POISONING is not set

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_TRACING_SUPPORT=y

#

# Tracers

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

# CONFIG_ARM_UNWIND is not set

# CONFIG_DEBUG_USER is not set

# CONFIG_DEBUG_ERRORS is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_ICEDCC is not set

# CONFIG_DEBUG_LL is not set

#

# Security options

#

# Crypto core or helper

#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_ALGAPI2=y

CONFIG_CRYPTO_AEAD2=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_BLKCIPHER2=y

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_PCOMP=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

CONFIG_CRYPTO_WORKQUEUE=y

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_TEST is not set

# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_ZLIB is not set

# CONFIG_CRYPTO_LZO is not set

#

# Random Number Generation

#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

# CONFIG_BINARY_PRINTF is not set

#

# Library routines

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

CONFIG_LIBCRC32C=y

CONFIG_PLIST=y

CONFIG_ZLIB_INFLATE=y

CONFIG_DECOMPRESS_GZIP=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

# SMP support ONLY available for OMAP4

obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

obj-$(CONFIG_LOCAL_TIMERS)		+= timer-mpu.o

# Functions loaded to SRAM

obj-$(CONFIG_ARCH_OMAP2420)		+= sram242x.o

obj-$(CONFIG_ARCH_OMAP2430)		+= sram243x.o

/*

 * Secondary CPU startup routine source file.

 *

 * Copyright (C) 2009 Texas Instruments, Inc.

 *

 * Author:

 *      Santosh Shilimkar <santosh.shilimkar@ti.com>

 *

 * Interface functions needed for the SMP. This file is based on arm

 * realview smp platform.

 * Copyright (c) 2003 ARM Limited.

 *

 * This program is free software,you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/linkage.h>

#include <linux/init.h>

/* Physical address needed since MMU not enabled yet on secondary core */

#define OMAP4_AUX_CORE_BOOT1_PA			0x48281804

	__INIT

/*

 * OMAP4 specific entry point for secondary CPU to jump from ROM

 * code.  This routine also provides a holding flag into which

 * secondary core is held until we're ready for it to initialise.

 * The primary core will update the this flag using a hardware

 * register AuxCoreBoot1.

 */

ENTRY(omap_secondary_startup)

	mrc	p15, 0, r0, c0, c0, 5

	and	r0, r0, #0x0f

hold:	ldr	r1, =OMAP4_AUX_CORE_BOOT1_PA	@ read from AuxCoreBoot1

	ldr	r2, [r1]

	cmp	r2, r0

	bne	hold

	/*

	 * we've been released from the cpu_release,secondary_stack

	 * should now contain the SVC stack for this core

	 */

	b	secondary_startup

/*

 * OMAP4 SMP source file. It contains platform specific fucntions

 * needed for the linux smp kernel.

 *

 * Copyright (C) 2009 Texas Instruments, Inc.

 *

 * Author:

 *      Santosh Shilimkar <santosh.shilimkar@ti.com>

 *

 * Platform file needed for the OMAP4 SMP. This file is based on arm

 * realview smp platform.

 * * Copyright (c) 2002 ARM Limited.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/init.h>

#include <linux/device.h>

#include <linux/jiffies.h>

#include <linux/smp.h>

#include <linux/io.h>

#include <asm/localtimer.h>

#include <asm/smp_scu.h>

#include <mach/hardware.h>

/* Registers used for communicating startup information */

#define OMAP4_AUXCOREBOOT_REG0		(OMAP44XX_VA_WKUPGEN_BASE + 0x800)

#define OMAP4_AUXCOREBOOT_REG1		(OMAP44XX_VA_WKUPGEN_BASE + 0x804)

/* SCU base address */

static void __iomem *scu_base = OMAP44XX_VA_SCU_BASE;

/*

 * Use SCU config register to count number of cores

 */

static inline unsigned int get_core_count(void)

{

	if (scu_base)

		return scu_get_core_count(scu_base);

	return 1;

}

static DEFINE_SPINLOCK(boot_lock);

void __cpuinit platform_secondary_init(unsigned int cpu)

{

	trace_hardirqs_off();

	/*

	 * If any interrupts are already enabled for the primary

	 * core (e.g. timer irq), then they will not have been enabled

	 * for us: do so

	 */

	gic_cpu_init(0, IO_ADDRESS(OMAP44XX_GIC_CPU_BASE));

	/*

	 * Synchronise with the boot thread.

	 */

	spin_lock(&boot_lock);

	spin_unlock(&boot_lock);

}

int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	unsigned long timeout;

	/*

	 * Set synchronisation state between this boot processor

	 * and the secondary one

	 */

	spin_lock(&boot_lock);

	/*

	 * Update the AuxCoreBoot1 with boot state for secondary core.

	 * omap_secondary_startup() routine will hold the secondary core till

	 * the AuxCoreBoot1 register is updated with cpu state

	 * A barrier is added to ensure that write buffer is drained

	 */

	__raw_writel(cpu, OMAP4_AUXCOREBOOT_REG1);

	smp_wmb();

	timeout = jiffies + (1 * HZ);

	while (time_before(jiffies, timeout))

		;

	/*

	 * Now the secondary core is starting up let it run its

	 * calibrations, then wait for it to finish

	 */

	spin_unlock(&boot_lock);

	return 0;

}

static void __init wakeup_secondary(void)

{

	/*

	 * Write the address of secondary startup routine into the

	 * AuxCoreBoot0 where ROM code will jump and start executing

	 * on secondary core once out of WFE

	 * A barrier is added to ensure that write buffer is drained

	 */

	__raw_writel(virt_to_phys(omap_secondary_startup),	   \

					OMAP4_AUXCOREBOOT_REG0);

	smp_wmb();

	/*

	 * Send a 'sev' to wake the secondary core from WFE.

	 */

	set_event();

	mb();

}

/*

 * Initialise the CPU possible map early - this describes the CPUs

 * which may be present or become present in the system.

 */

void __init smp_init_cpus(void)

{

	unsigned int i, ncores = get_core_count();

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

		set_cpu_possible(i, true);

}

void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = get_core_count();

	unsigned int cpu = smp_processor_id();

	int i;

	/* sanity check */

	if (ncores == 0) {

		printk(KERN_ERR

		       "OMAP4: strange core count of 0? Default to 1\n");

		ncores = 1;

	}

	if (ncores > NR_CPUS) {

		printk(KERN_WARNING

		       "OMAP4: no. of cores (%d) greater than configured "

		       "maximum of %d - clipping\n",

		       ncores, NR_CPUS);

		ncores = NR_CPUS;

	}

	smp_store_cpu_info(cpu);

	/*

	 * are we trying to boot more cores than exist?

	 */

	if (max_cpus > ncores)

		max_cpus = ncores;

	/*

	 * Initialise the present map, which describes the set of CPUs

	 * actually populated at the present time.

	 */

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

		set_cpu_present(i, true);

	if (max_cpus > 1) {

		/*

		 * Enable the local timer or broadcast device for the

		 * boot CPU, but only if we have more than one CPU.

		 */

		percpu_timer_setup();

		/*

		 * Initialise the SCU and wake up the secondary core using

		 * wakeup_secondary().

		 */

		scu_enable(scu_base);

		wakeup_secondary();

	}

}