From patchwork Tue Aug 20 02:31:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2846824 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 71E6CBF546 for ; Tue, 20 Aug 2013 03:31:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DEDB20314 for ; Tue, 20 Aug 2013 03:31:16 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 362E920304 for ; Tue, 20 Aug 2013 03:31:15 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBbny-00036Y-7X; Tue, 20 Aug 2013 02:36:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBbnF-0007pb-EI; Tue, 20 Aug 2013 02:35:37 +0000 Received: from mail-pb0-f41.google.com ([209.85.160.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBbmM-0007kB-5N for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2013 02:34:44 +0000 Received: by mail-pb0-f41.google.com with SMTP id rp2so5748232pbb.28 for ; Mon, 19 Aug 2013 19:34:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qWvOoAjv3JTWxtwR7vUC0Bsa/iLs3P6Jqj/PaHfOOjw=; b=IHfRxNZKy7+Ms9iD8YaJViS6y8qkSE0vtSDniK4rvlssuXn6Aft/Oz7zBqyCJv9ty6 HCArXm23o6Xk8qIMTxEWQDbtnuT8PjyvoMTJ3yFz4U/O24PALYCFrvW20sIKNP+UL4Ms rAX85KphcWLpreSb80Oss6ofRGqSB/iFyXq2M4jgwWqh2vwjA39lmak/YxE0kBYwDxqX hjc9aEddRVlRysadSLKyEAy95UfYZK7urGCGpp9wxN2LVv1eWY48N/MDpal55e8Xkfgg Wc8EVLuwtlTdtszT2wUYCl7cvZZKwUiZLYrxFFCBpVoPwo4iy21BNgD6B77MwzODTJLk MOgw== X-Gm-Message-State: ALoCoQnvjKmzlMS65EbeobeBCHghwR0a+bgo6KSBZcmzgHwr6nFUXr0OP+JfAvAJM2ogEKb+Eusi X-Received: by 10.66.161.99 with SMTP id xr3mr308739pab.172.1376966063019; Mon, 19 Aug 2013 19:34:23 -0700 (PDT) Received: from localhost.localdomain ([67.198.247.26]) by mx.google.com with ESMTPSA id xe9sm18067972pbc.21.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Aug 2013 19:34:22 -0700 (PDT) From: Haojian Zhuang To: arnd@arndb.de, linux@arm.linux.org.uk, linus.walleij@linaro.org, olof@lixom.net, rob.herring@calxeda.com, linux-arm-kernel@lists.infradead.org, tglx@linutronix.de, john.stultz@linaro.org, mturquette@linaro.org, grant.likely@linar.org, mark.rutland@arm.com Subject: [PATCH v7 09/11] ARM: hi3xxx: add hotplug support Date: Tue, 20 Aug 2013 10:31:11 +0800 Message-Id: <1376965873-14431-10-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1376965873-14431-1-git-send-email-haojian.zhuang@linaro.org> References: <1376965873-14431-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130819_223442_441024_C6192888 X-CRM114-Status: GOOD ( 18.64 ) X-Spam-Score: -2.6 (--) Cc: Zhangfei Gao X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Zhangfei Gao Enable hotplug support on hi3xxx platform How to test: cat proc/interrupts echo 0 > /sys/devices/system/cpu/cpuX/online cat proc/interrupts echo 1 > /sys/devices/system/cpu/cpuX/online Signed-off-by: Zhangfei Gao Tested-by: Zhang Mingjun --- arch/arm/mach-hi3xxx/Makefile | 1 + arch/arm/mach-hi3xxx/core.h | 5 ++ arch/arm/mach-hi3xxx/hi3xxx.c | 1 + arch/arm/mach-hi3xxx/hotplug.c | 154 +++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-hi3xxx/platsmp.c | 5 ++ 5 files changed, 166 insertions(+) create mode 100644 arch/arm/mach-hi3xxx/hotplug.c diff --git a/arch/arm/mach-hi3xxx/Makefile b/arch/arm/mach-hi3xxx/Makefile index 0917f1c..c597cbf 100644 --- a/arch/arm/mach-hi3xxx/Makefile +++ b/arch/arm/mach-hi3xxx/Makefile @@ -4,3 +4,4 @@ obj-y += hi3xxx.o system.o obj-$(CONFIG_SMP) += platsmp.o +obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff --git a/arch/arm/mach-hi3xxx/core.h b/arch/arm/mach-hi3xxx/core.h index 2cfd643..c2ce35d 100644 --- a/arch/arm/mach-hi3xxx/core.h +++ b/arch/arm/mach-hi3xxx/core.h @@ -11,4 +11,9 @@ extern void hs_map_io(void); extern void hs_restart(enum reboot_mode, const char *cmd); extern struct smp_operations hs_smp_ops; +extern void __init hs_hotplug_init(void); +extern void hs_cpu_die(unsigned int cpu); +extern int hs_cpu_kill(unsigned int cpu); +extern void hs_set_cpu(int cpu, bool enable); + #endif diff --git a/arch/arm/mach-hi3xxx/hi3xxx.c b/arch/arm/mach-hi3xxx/hi3xxx.c index 567a0d5..01ac68b 100644 --- a/arch/arm/mach-hi3xxx/hi3xxx.c +++ b/arch/arm/mach-hi3xxx/hi3xxx.c @@ -24,6 +24,7 @@ static void __init hi3xxx_timer_init(void) { hs_map_io(); + hs_hotplug_init(); of_clk_init(NULL); clocksource_of_init(); } diff --git a/arch/arm/mach-hi3xxx/hotplug.c b/arch/arm/mach-hi3xxx/hotplug.c new file mode 100644 index 0000000..c67f8a2 --- /dev/null +++ b/arch/arm/mach-hi3xxx/hotplug.c @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2013 Linaro Ltd. + * Copyright (c) 2013 Hisilicon Limited. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + */ +#include +#include +#include +#include +#include +#include +#include "core.h" + +enum { + HI3620_CTRL, + HI3716_CTRL, +}; + +static void __iomem *ctrl_base; +static int id; + +void hs_set_cpu(int cpu, bool enable) +{ + u32 val = 0; + + if (!ctrl_base) + return; + + if (id == HI3620_CTRL) { + if (enable) { + /* MTCMOS */ + writel_relaxed((0x01 << (cpu + 3)), ctrl_base + 0xD0); + writel_relaxed((0x1011 << cpu), ctrl_base + 0x414); + writel_relaxed((0x401011 << cpu), ctrl_base + 0x410); + + /* ISO disable */ + writel((0x01 << (cpu + 3)), ctrl_base + 0x0C4); + + /* WFI Mask */ + val = readl(ctrl_base + 0x200); + val &= ~(0x1 << (cpu+28)); + writel(val, ctrl_base + 0x200); + + /* Enable core */ + writel_relaxed((0x01 << cpu), ctrl_base + 0xf4); + /* Unreset */ + writel_relaxed((0x401011 << cpu), ctrl_base + 0x414); + } else { + /* iso enable */ + writel_relaxed((0x01 << (cpu + 3)), ctrl_base + 0xC0); + + /* MTCMOS */ + writel_relaxed((0x01 << (cpu + 3)), ctrl_base + 0xD4); + + /* wfi mask */ + val = readl_relaxed(ctrl_base + 0x200); + val |= (0x1 << (cpu+28)); + writel_relaxed(val, ctrl_base + 0x200); + + /* disable core*/ + writel_relaxed((0x01 << cpu), ctrl_base + 0xf8); + /* Reset */ + writel_relaxed((0x401011 << cpu), ctrl_base + 0x410); + } + } else if (id == HI3716_CTRL) { + if (enable) { + /* power on cpu1 */ + val = readl_relaxed(ctrl_base + 0x1000); + val &= ~(0x1 << 8); + val |= (0x1 << 7); + val &= ~(0x1 << 3); + writel_relaxed(val, ctrl_base + 0x1000); + + /* unreset */ + val = readl_relaxed(ctrl_base + 0x50); + val &= ~(0x1 << 17); + writel_relaxed(val, ctrl_base + 0x50); + } else { + /* power down cpu1 */ + val = readl_relaxed(ctrl_base + 0x1000); + val &= ~(0x1 << 8); + val |= (0x1 << 7); + val |= (0x1 << 3); + writel_relaxed(val, ctrl_base + 0x1000); + + /* reset */ + val = readl_relaxed(ctrl_base + 0x50); + val |= (0x1 << 17); + writel_relaxed(val, ctrl_base + 0x50); + } + } +} + +void __init hs_hotplug_init(void) +{ + struct device_node *node; + + node = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl"); + if (node) { + ctrl_base = of_iomap(node, 0); + id = HI3716_CTRL; + return; + } + node = of_find_compatible_node(NULL, NULL, "hisilicon,sctrl"); + if (node) { + ctrl_base = of_iomap(node, 0); + id = HI3620_CTRL; + return; + } +} + +static inline void cpu_enter_lowpower(void) +{ + unsigned int v; + + flush_cache_all(); + asm volatile( + /* + * Turn off coherency and L1 D-cache + */ + " mrc p15, 0, %0, c1, c0, 1\n" + " bic %0, %0, #0x40\n" + " mcr p15, 0, %0, c1, c0, 1\n" + " mrc p15, 0, %0, c1, c0, 0\n" + " bic %0, %0, #0x04\n" + " mcr p15, 0, %0, c1, c0, 0\n" + : "=&r" (v) + : "r" (0) + : "cc"); +} + +void hs_cpu_die(unsigned int cpu) +{ + cpu_enter_lowpower(); + hs_set_cpu_jump(cpu, phys_to_virt(0)); + cpu_do_idle(); + + /* We should have never returned from idle */ + panic("cpu %d unexpectedly exit from shutdown\n", cpu); +} + +int hs_cpu_kill(unsigned int cpu) +{ + unsigned long timeout = jiffies + msecs_to_jiffies(50); + + while (hs_get_cpu_jump(cpu)) + if (time_after(jiffies, timeout)) + return 0; + hs_set_cpu(cpu, false); + return 1; +} diff --git a/arch/arm/mach-hi3xxx/platsmp.c b/arch/arm/mach-hi3xxx/platsmp.c index a76a3cc..6a08630 100644 --- a/arch/arm/mach-hi3xxx/platsmp.c +++ b/arch/arm/mach-hi3xxx/platsmp.c @@ -32,6 +32,7 @@ static void __init hs_smp_prepare_cpus(unsigned int max_cpus) static int hs_boot_secondary(unsigned int cpu, struct task_struct *idle) { + hs_set_cpu(cpu, true); hs_set_cpu_jump(cpu, secondary_startup); arch_send_wakeup_ipi_mask(cpumask_of(cpu)); return 0; @@ -40,4 +41,8 @@ static int hs_boot_secondary(unsigned int cpu, struct task_struct *idle) struct smp_operations hs_smp_ops __initdata = { .smp_prepare_cpus = hs_smp_prepare_cpus, .smp_boot_secondary = hs_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_die = hs_cpu_die, + .cpu_kill = hs_cpu_kill, +#endif };