Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753327AbbF2RtE (ORCPT ); Mon, 29 Jun 2015 13:49:04 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49374 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752850AbbF2Rs6 (ORCPT ); Mon, 29 Jun 2015 13:48:58 -0400 From: Vitaly Andrianov To: , , , , , , CC: Vitaly Andrianov Subject: [PATCH] keystone: adds cpu_die implementation Date: Mon, 29 Jun 2015 13:52:32 -0400 Message-ID: <1435600352-32733-1-git-send-email-vitalya@ti.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2221 Lines: 73 This commit add cpu_die implementation Signed-off-by: Vitaly Andrianov --- The discussion of the "keystone: psci: adds cpu_die implementation" commit shows that if PCSI is enabled platform code doesn't need that implementation at all. Having PSCI commands in DTB should be sufficient. Unfortunately Keystone with LPAE enable requires some additional development. To support HOTPLUG_CPU w/o PSCI we need platform implementation of the cpu_die(), which is added by this patch. arch/arm/mach-keystone/keystone.h | 1 + arch/arm/mach-keystone/platsmp.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/arch/arm/mach-keystone/keystone.h b/arch/arm/mach-keystone/keystone.h index cd04a1c..93549cf 100644 --- a/arch/arm/mach-keystone/keystone.h +++ b/arch/arm/mach-keystone/keystone.h @@ -12,6 +12,7 @@ #define __KEYSTONE_H__ #define KEYSTONE_MON_CPU_UP_IDX 0x00 +#define KEYSTONE_MON_CPU_DIE_IDX 0x84000002 #ifndef __ASSEMBLER__ diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c index 5f46a7c..4e5bdde 100644 --- a/arch/arm/mach-keystone/platsmp.c +++ b/arch/arm/mach-keystone/platsmp.c @@ -51,7 +51,31 @@ static inline void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu) {} #endif + +#ifdef CONFIG_HOTPLUG_CPU +static void keystone_cpu_die(unsigned int cpu) +{ + int error; + + pr_debug("keystone-smp: cpu_die %d\n", cpu); + + error = keystone_cpu_smc(KEYSTONE_MON_CPU_DIE_IDX, cpu, 0); + if (error) + pr_err("CPU %d die failed with %d\n", cpu, error); + + /* + * we shouldn't come here. But in case something went + * wrong the code below prevents kernel from crush + */ + while (1) + cpu_do_idle(); +} +#endif + struct smp_operations keystone_smp_ops __initdata = { .smp_boot_secondary = keystone_smp_boot_secondary, .smp_secondary_init = keystone_smp_secondary_initmem, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_die = keystone_cpu_die, +#endif }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/