1 files changed, 32 insertions, 86 deletions
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c
index d8dc9ddd6d18..d02a35476135 100644
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@ -1,91 +1,23 @@
 /*
- *  linux/arch/arm/mach-realview/hotplug.c
 *
 *  Copyright (C) 2002 ARM Ltd.
 *  All Rights Reserved
+ *  Copyright (c) 2010, 2012 NVIDIA Corporation. 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>
-#include <asm/cp15.h>
+#include <asm/smp_plat.h>
-static inline void cpu_enter_lowpower(void)
+#include "sleep.h"
-{
+#include "tegra_cpu_car.h"
-        unsigned int v;
-        flush_cache_all();
-        asm volatile(
-        "       mcr     p15, 0, %1, c7, c5, 0\n"
-        "       mcr     p15, 0, %1, c7, c10, 4\n"
-        /*
-         * Turn off coherency
-         */
-        "       mrc     p15, 0, %0, c1, c0, 1\n"
-        "       bic     %0, %0, #0x20\n"
-        "       mcr     p15, 0, %0, c1, c0, 1\n"
-        "       mrc     p15, 0, %0, c1, c0, 0\n"
-        "       bic     %0, %0, %2\n"
-        "       mcr     p15, 0, %0, c1, c0, 0\n"
-          : "=&r" (v)
-          : "r" (0), "Ir" (CR_C)
-          : "cc");
-}
-static inline void cpu_leave_lowpower(void)
-{
-        unsigned int v;
-        asm volatile(
-        "mrc    p15, 0, %0, c1, c0, 0\n"
-        "       orr     %0, %0, %1\n"
-        "       mcr     p15, 0, %0, c1, c0, 0\n"
-        "       mrc     p15, 0, %0, c1, c0, 1\n"
-        "       orr     %0, %0, #0x20\n"
-        "       mcr     p15, 0, %0, c1, c0, 1\n"
-          : "=&r" (v)
-          : "Ir" (CR_C)
-          : "cc");
-}
-static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
-{
-        /*
-         * there is no power-control hardware on this platform, so all
-         * we can do is put the core into WFI; this is safe as the calling
-         * code will have already disabled interrupts
-         */
-        for (;;) {
-                /*
-                 * here's the WFI
-                 */
-                asm(".word      0xe320f003\n"
-                    :
-                    :
-                    : "memory", "cc");
-                /*if (pen_release == cpu) {*/
+static void (*tegra_hotplug_shutdown)(void);
-                        /*
-                         * 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
-                 *
-                 * Just note it happening - when we're woken, we can report
-                 * its occurrence.
-                 */
-                (*spurious)++;
-        }
-}
 int platform_cpu_kill(unsigned int cpu)
 {
@@ -99,22 +31,20 @@ int platform_cpu_kill(unsigned int cpu)
 */
 void platform_cpu_die(unsigned int cpu)
 {
-        int spurious = 0;
+        cpu = cpu_logical_map(cpu);
-        /*
+        /* Flush the L1 data cache. */
-         * we're ready for shutdown now, so do it
+        flush_cache_all();
-         */
-        cpu_enter_lowpower();
-        platform_do_lowpower(cpu, &spurious);
-        /*
+        /* Shut down the current CPU. */
-         * bring this CPU back into the world of cache
+        tegra_hotplug_shutdown();
-         * coherency, and then restore interrupts
-         */
-        cpu_leave_lowpower();
-        if (spurious)
+        /* Clock gate the CPU */
-                pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);
+        tegra_wait_cpu_in_reset(cpu);
+        tegra_disable_cpu_clock(cpu);
+        /* Should never return here. */
+        BUG();
 }
 int platform_cpu_disable(unsigned int cpu)
@@ -125,3 +55,19 @@ int platform_cpu_disable(unsigned int cpu)
         */
        return cpu == 0 ? -EPERM : 0;
 }
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+extern void tegra20_hotplug_shutdown(void);
+void __init tegra20_hotplug_init(void)
+{
+        tegra_hotplug_shutdown = tegra20_hotplug_shutdown;
+}
+#endif
+#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+extern void tegra30_hotplug_shutdown(void);
+void __init tegra30_hotplug_init(void)
+{
+        tegra_hotplug_shutdown = tegra30_hotplug_shutdown;
+}
+#endif

diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c index d8dc9ddd6d18..d02a35476135 100644 --- a/arch/arm/mach-tegra/hotplug.c +++ b/arch/arm/mach-tegra/hotplug.c
@@ -1,91 +1,23 @@
1	/*	1	/*
2	* linux/arch/arm/mach-realview/hotplug.c
3	*	2	*
4	* Copyright (C) 2002 ARM Ltd.	3	* Copyright (C) 2002 ARM Ltd.
5	* All Rights Reserved	4	* All Rights Reserved
		5	* Copyright (c) 2010, 2012 NVIDIA Corporation. All rights reserved.
6	*	6	*
7	* This program is free software; you can redistribute it and/or modify	7	* This program is free software; you can redistribute it and/or modify
8	* it under the terms of the GNU General Public License version 2 as	8	* it under the terms of the GNU General Public License version 2 as
9	* published by the Free Software Foundation.	9	* published by the Free Software Foundation.
10	*/	10	*/
11	#include <linux/kernel.h>	11	#include <linux/kernel.h>
12	#include <linux/errno.h>
13	#include <linux/smp.h>	12	#include <linux/smp.h>
14		13
15	#include <asm/cacheflush.h>	14	#include <asm/cacheflush.h>
16	#include <asm/cp15.h>	15	#include <asm/smp_plat.h>
17		16
18	static inline void cpu_enter_lowpower(void)	17	#include "sleep.h"
19	{	18	#include "tegra_cpu_car.h"
20	unsigned int v;
21
22	flush_cache_all();
23	asm volatile(
24	" mcr p15, 0, %1, c7, c5, 0\n"
25	" mcr p15, 0, %1, c7, c10, 4\n"
26	/*
27	* Turn off coherency
28	*/
29	" mrc p15, 0, %0, c1, c0, 1\n"
30	" bic %0, %0, #0x20\n"
31	" mcr p15, 0, %0, c1, c0, 1\n"
32	" mrc p15, 0, %0, c1, c0, 0\n"
33	" bic %0, %0, %2\n"
34	" mcr p15, 0, %0, c1, c0, 0\n"
35	: "=&r" (v)
36	: "r" (0), "Ir" (CR_C)
37	: "cc");
38	}
39
40	static inline void cpu_leave_lowpower(void)
41	{
42	unsigned int v;
43
44	asm volatile(
45	"mrc p15, 0, %0, c1, c0, 0\n"
46	" orr %0, %0, %1\n"
47	" mcr p15, 0, %0, c1, c0, 0\n"
48	" mrc p15, 0, %0, c1, c0, 1\n"
49	" orr %0, %0, #0x20\n"
50	" mcr p15, 0, %0, c1, c0, 1\n"
51	: "=&r" (v)
52	: "Ir" (CR_C)
53	: "cc");
54	}
55
56	static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
57	{
58	/*
59	* there is no power-control hardware on this platform, so all
60	* we can do is put the core into WFI; this is safe as the calling
61	* code will have already disabled interrupts
62	*/
63	for (;;) {
64	/*
65	* here's the WFI
66	*/
67	asm(".word 0xe320f003\n"
68	:
69	:
70	: "memory", "cc");
71		19
72	/if (pen_release == cpu) {/	20	static void (*tegra_hotplug_shutdown)(void);
73	/*
74	* OK, proper wakeup, we're done
75	*/
76	break;
77	/}/
78
79	/*
80	* Getting here, means that we have come out of WFI without
81	* having been woken up - this shouldn't happen
82	*
83	* Just note it happening - when we're woken, we can report
84	* its occurrence.
85	*/
86	(*spurious)++;
87	}
88	}
89		21
90	int platform_cpu_kill(unsigned int cpu)	22	int platform_cpu_kill(unsigned int cpu)
91	{	23	{
@@ -99,22 +31,20 @@ int platform_cpu_kill(unsigned int cpu)
99	*/	31	*/
100	void platform_cpu_die(unsigned int cpu)	32	void platform_cpu_die(unsigned int cpu)
101	{	33	{
102	int spurious = 0;	34	cpu = cpu_logical_map(cpu);
103		35
104	/*	36	/* Flush the L1 data cache. */
105	* we're ready for shutdown now, so do it	37	flush_cache_all();
106	*/
107	cpu_enter_lowpower();
108	platform_do_lowpower(cpu, &spurious);
109		38
110	/*	39	/* Shut down the current CPU. */
111	* bring this CPU back into the world of cache	40	tegra_hotplug_shutdown();
112	* coherency, and then restore interrupts
113	*/
114	cpu_leave_lowpower();
115		41
116	if (spurious)	42	/* Clock gate the CPU */
117	pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);	43	tegra_wait_cpu_in_reset(cpu);
		44	tegra_disable_cpu_clock(cpu);
		45
		46	/* Should never return here. */
		47	BUG();
118	}	48	}
119		49
120	int platform_cpu_disable(unsigned int cpu)	50	int platform_cpu_disable(unsigned int cpu)
@@ -125,3 +55,19 @@ int platform_cpu_disable(unsigned int cpu)
125	*/	55	*/
126	return cpu == 0 ? -EPERM : 0;	56	return cpu == 0 ? -EPERM : 0;
127	}	57	}
		58
		59	#ifdef CONFIG_ARCH_TEGRA_2x_SOC
		60	extern void tegra20_hotplug_shutdown(void);
		61	void __init tegra20_hotplug_init(void)
		62	{
		63	tegra_hotplug_shutdown = tegra20_hotplug_shutdown;
		64	}
		65	#endif
		66
		67	#ifdef CONFIG_ARCH_TEGRA_3x_SOC
		68	extern void tegra30_hotplug_shutdown(void);
		69	void __init tegra30_hotplug_init(void)
		70	{
		71	tegra_hotplug_shutdown = tegra30_hotplug_shutdown;
		72	}
		73	#endif