Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm (abf8792d) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mach-msm/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -40,11 +40,13 @@ config ARCH_MSM8X60
		bool "MSM8X60"
		select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
		&& !MACH_MSM8X60_FFA)
		select ARCH_MSM_SCORPIONMP
		select ARM_GIC
		select CPU_V7
		select MSM_V2_TLMM
		select MSM_GPIOMUX
		select IOMMU_API
		select MSM_SCM if SMP

		endchoice

		@@ -172,4 +174,7 @@ config MSM_V2_TLMM

		config IOMMU_API
		bool

		config MSM_SCM
		bool
		endif

arch/arm/mach-msm/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,10 @@ obj-$(CONFIG_MSM_PROC_COMM) += clock.o
		obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
		obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
		obj-$(CONFIG_MSM_SMD) += last_radio_log.o
		obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o

		obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
		obj-$(CONFIG_SMP) += headsmp.o platsmp.o

		obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o
		obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o

arch/arm/mach-msm/headsmp.S

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* linux/arch/arm/mach-realview/headsmp.S
		*
		* Copyright (c) 2003 ARM Limited
		* All Rights Reserved
		*
		* 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>

		__INIT

		/*
		* MSM specific entry point for secondary CPUs. This provides
		* a "holding pen" into which all secondary cores are held until we're
		* ready for them to initialise.
		*/
		ENTRY(msm_secondary_startup)
		mrc p15, 0, r0, c0, c0, 5
		and r0, r0, #15
		adr r4, 1f
		ldmia r4, {r5, r6}
		sub r4, r4, r5
		add r6, r6, r4
		pen: ldr r7, [r6]
		cmp r7, r0
		bne pen

		/*
		* we've been released from the holding pen: secondary_stack
		* should now contain the SVC stack for this core
		*/
		b secondary_startup

		.align
		1: .long .
		.long pen_release

arch/arm/mach-msm/hotplug.c

0 → 100644

+91 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2002 ARM Ltd.
		* All Rights Reserved
		*
		* 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/kernel.h>
		#include <linux/errno.h>
		#include <linux/smp.h>

		#include <asm/cacheflush.h>

		extern volatile int pen_release;

		static inline void cpu_enter_lowpower(void)
		{
		/* Just flush the cache. Changing the coherency is not yet
		* available on msm. */
		flush_cache_all();
		}

		static inline void cpu_leave_lowpower(void)
		{
		}

		static inline void platform_do_lowpower(unsigned int cpu)
		{
		/* Just enter wfi for now. TODO: Properly shut off the cpu. */
		for (;;) {
		/*
		* here's the WFI
		*/
		asm("wfi"
		:
		:
		: "memory", "cc");

		if (pen_release == cpu) {
		/*
		* OK, proper wakeup, we're done
		*/
		break;
		}

		/*
		* getting here, means that we have come out of WFI without
		* having been woken up - this shouldn't happen
		*
		* The trouble is, letting people know about this is not really
		* possible, since we are currently running incoherently, and
		* therefore cannot safely call printk() or anything else
		*/
		pr_debug("CPU%u: spurious wakeup call\n", cpu);
		}
		}

		int platform_cpu_kill(unsigned int cpu)
		{
		return 1;
		}

		/*
		* platform-specific code to shutdown a CPU
		*
		* Called with IRQs disabled
		*/
		void platform_cpu_die(unsigned int cpu)
		{
		/*
		* we're ready for shutdown now, so do it
		*/
		cpu_enter_lowpower();
		platform_do_lowpower(cpu);

		/*
		* bring this CPU back into the world of cache
		* coherency, and then restore interrupts
		*/
		cpu_leave_lowpower();
		}

		int platform_cpu_disable(unsigned int cpu)
		{
		/*
		* we don't allow CPU 0 to be shutdown (it is still too special
		* e.g. clock tick interrupts)
		*/
		return cpu == 0 ? -EPERM : 0;
		}

arch/arm/mach-msm/include/mach/msm_iomap-8x60.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,11 @@

		#define MSM_TMR_BASE IOMEM(0xF0200000)
		#define MSM_TMR_PHYS 0x02000000
		#define MSM_TMR_SIZE (SZ_1M)
		#define MSM_TMR_SIZE SZ_4K

		#define MSM_TMR0_BASE IOMEM(0xF0201000)
		#define MSM_TMR0_PHYS 0x02040000
		#define MSM_TMR0_SIZE SZ_4K

		#define MSM_GPT_BASE (MSM_TMR_BASE + 0x4)
		#define MSM_DGT_BASE (MSM_TMR_BASE + 0x24)