From patchwork Thu Jul 11 16:34:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 2826561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 709D09F968 for ; Thu, 11 Jul 2013 17:12:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A6B8C2030D for ; Thu, 11 Jul 2013 17:12:55 +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 0E43320318 for ; Thu, 11 Jul 2013 17:12:54 +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 1UxJrv-0004k1-Dl; Thu, 11 Jul 2013 16:37:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxJqG-0004tB-He; Thu, 11 Jul 2013 16:35:40 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxJq7-0004rn-3m for linux-arm-kernel@lists.infradead.org; Thu, 11 Jul 2013 16:35:33 +0000 Received: from kartoffel ([10.37.4.252]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id r6BGYwki019845; Thu, 11 Jul 2013 17:34:59 +0100 (BST) Date: Thu, 11 Jul 2013 17:34:58 +0100 From: Mark Rutland To: Hanjun Guo Subject: Re: [RFC PATCH 0/5] arm64: initial CPU_HOTPLUG support Message-ID: <20130711163458.GA8303@kartoffel> References: <1373494279-24712-1-git-send-email-mark.rutland@arm.com> <51DECAFB.4010800@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <51DECAFB.4010800@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130711_123531_425968_EDFE9892 X-CRM114-Status: GOOD ( 18.76 ) X-Spam-Score: -7.2 (-------) Cc: Lorenzo Pieralisi , "graeme.gregory@linaro.org" , "nico@linaro.org" , Marc Zyngier , Catalin Marinas , "sboyd@codeaurora.org" , "santosh.shilimkar@ti.com" , "linux-arm-kernel@lists.infradead.org" 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 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 On Thu, Jul 11, 2013 at 04:10:51PM +0100, Hanjun Guo wrote: > Hi Mark, Hi Hanjun, > > I tested this patch set on the armv8 foundation model, it's panic. > > I seems that we need to do something more, I'll also checkout > what's going on here. > > Thanks > Hanjun > > dump formation: > root@genericarmv8:/sys/devices/system/cpu/cpu3# echo 0 > online > CPU3: Booted secondary processor > CPU3: shutdown > BUG: failure at kernel/time/clockevents.c:284/clockevents_register_device()! > Kernel panic - not syncing: BUG! > CPU: 3 PID: 0 Comm: swapper/3 Not tainted 3.10.0+ #2 > Call trace: > [] dump_backtrace+0x0/0x12c > [] show_stack+0x14/0x1c > [] dump_stack+0x20/0x28 > [] panic+0xe8/0x214 > [] clockevents_set_mode+0x0/0x6c > [] clockevents_config_and_register+0x24/0x30 > [] arch_timer_setup+0xd8/0x140 > [] arch_timer_cpu_notify+0x48/0xc8 > [] notifier_call_chain+0x48/0x88 > [] __raw_notifier_call_chain+0xc/0x14 > [] __cpu_notify+0x30/0x58 > [] cpu_notify+0x14/0x1c > [] notify_cpu_starting+0x14/0x1c > [] secondary_start_kernel+0xc0/0xf4 That looks suspicious. It looks like the CPU didn't actually die and jumped immediately to secondary_start_kernel. At a guess, did you update your dts with a psci node and cpu enable-methods? I can see the code's broken if you try hotplug with spin-table, because cpu_disable and cpu_die are both NULL, and the sanity checking doesn't attempt to deal with this case, so the cpu will end up getting into cpu_die, won't call anything, and jump straight back into the kernel. I'll fix up the op_cpu_disable checks to cover this. The other possibility is that you're using PSCI but your function id for cpu_off is wrong, and thus the psci cpu_off call fails. Did you update your dts for PSCI? Below is a patch to do so. Thanks, Mark. ---->8---- From ae35ce871b52ee006f8c5538b9be6c6829a71d6f Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Thu, 11 Jul 2013 17:09:56 +0100 Subject: [PATCH] HACK: arm64: dts: foundation: add PSCI data --- arch/arm64/boot/dts/foundation-v8.dts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/foundation-v8.dts b/arch/arm64/boot/dts/foundation-v8.dts index 84fcc50..335a88f 100644 --- a/arch/arm64/boot/dts/foundation-v8.dts +++ b/arch/arm64/boot/dts/foundation-v8.dts @@ -22,6 +22,13 @@ serial3 = &v2m_serial3; }; + psci { + compatible = "arm,psci"; + method = "smc"; + cpu_off = <0x84000001>; + cpu_on = <0x84000002>; + }; + cpus { #address-cells = <2>; #size-cells = <0>; @@ -30,29 +37,25 @@ device_type = "cpu"; compatible = "arm,armv8"; reg = <0x0 0x0>; - enable-method = "spin-table"; - cpu-release-addr = <0x0 0x8000fff8>; + enable-method = "psci"; }; cpu@1 { device_type = "cpu"; compatible = "arm,armv8"; reg = <0x0 0x1>; - enable-method = "spin-table"; - cpu-release-addr = <0x0 0x8000fff8>; + enable-method = "psci"; }; cpu@2 { device_type = "cpu"; compatible = "arm,armv8"; reg = <0x0 0x2>; - enable-method = "spin-table"; - cpu-release-addr = <0x0 0x8000fff8>; + enable-method = "psci"; }; cpu@3 { device_type = "cpu"; compatible = "arm,armv8"; reg = <0x0 0x3>; - enable-method = "spin-table"; - cpu-release-addr = <0x0 0x8000fff8>; + enable-method = "psci"; }; };