lkml.org 
[lkml]   [2017]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] socfpga_a10: reset CPU1 in socfpga_cpu_kill()
Date
From: Yanjiang Jin <yanjiang.jin@windriver.com>

Kexec's second kernel would hang if CPU1 isn't reset.

Signed-off-by: Yanjiang Jin <yanjiang.jin@windriver.com>
---
arch/arm/mach-socfpga/platsmp.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c
index 0ee7677..db3940e 100644
--- a/arch/arm/mach-socfpga/platsmp.c
+++ b/arch/arm/mach-socfpga/platsmp.c
@@ -117,6 +117,16 @@ static int socfpga_cpu_kill(unsigned int cpu)
{
return 1;
}
+
+static int socfpga_a10_cpu_kill(unsigned int cpu)
+{
+ /* This will put CPU #1 into reset. */
+ if (socfpga_cpu1start_addr)
+ writel(RSTMGR_MPUMODRST_CPU1, rst_manager_base_addr +
+ SOCFPGA_A10_RSTMGR_MODMPURST);
+
+ return 1;
+}
#endif

static const struct smp_operations socfpga_smp_ops __initconst = {
@@ -133,7 +143,7 @@ static int socfpga_cpu_kill(unsigned int cpu)
.smp_boot_secondary = socfpga_a10_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_die = socfpga_cpu_die,
- .cpu_kill = socfpga_cpu_kill,
+ .cpu_kill = socfpga_a10_cpu_kill,
#endif
};

--
1.9.1
\
 
 \ /
  Last update: 2017-05-10 21:20    [W:0.042 / U:25.296 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site