From patchwork Tue Feb 12 15:44:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2129051 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 01FAA3FD4F for ; Tue, 12 Feb 2013 15:42:09 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5HxB-0003L4-9W; Tue, 12 Feb 2013 15:39:29 +0000 Received: from mail-da0-f41.google.com ([209.85.210.41]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U5Hx5-0003K1-Kw for linux-arm-kernel@lists.infradead.org; Tue, 12 Feb 2013 15:39:24 +0000 Received: by mail-da0-f41.google.com with SMTP id e20so76730dak.14 for ; Tue, 12 Feb 2013 07:39:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:date:message-id:in-reply-to:references :subject; bh=OqPPnuRfW5s/ilMwb++32QzLmOrZjQHJrbpNjIo093U=; b=WKLGnlWZ2raWpoubjXYqkj1GPRybPe9scpFU4jgX/GLBE5K2lR5gfYy3dHzw0hFKsW uVi6g+xR3vzuTG7On2nhw75brN124ECfFsPHTS3yRPhm46V2c5HaJsHNhGKDfR5Nju5n vioAbOBS3FMAFSQtzQjDlmzNSKPf04BWGrAVQwBVN5KAUkWstbCcgUVhKObmi0eyIv2L C0p+XT1GnB+eVLdVyIrMd9s4FUeL6mb2ybIkv6vT76pqXtwLlSIhORi/yQi/EvtpjtKQ Xc2tuCrqVm6kd17ZGFVikWLExwMe27HkV9TlSXOYQFrCHn9BiqpWpKHAvVffZOfkAPkY 1img== X-Received: by 10.66.83.8 with SMTP id m8mr53514516pay.40.1360683562162; Tue, 12 Feb 2013 07:39:22 -0800 (PST) Received: from [127.0.0.1] (FL1-122-133-79-190.tky.mesh.ad.jp. [122.133.79.190]) by mx.google.com with ESMTPS id y9sm75892052paw.1.2013.02.12.07.39.19 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Feb 2013 07:39:21 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Wed, 13 Feb 2013 00:44:57 +0900 Message-Id: <20130212154457.13067.95836.sendpatchset@w520> In-Reply-To: <20130212154438.13067.77359.sendpatchset@w520> References: <20130212154438.13067.77359.sendpatchset@w520> Subject: [PATCH 02/06] ARM: shmobile: Remove partial CPU Hotplug from EMEV2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130212_103923_841609_0D47A184 X-CRM114-Status: GOOD ( 11.95 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.41 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (magnus.damm[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: horms@verge.net.au, Magnus Damm , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Magnus Damm Remove partial CPU hotplug support from EMEV2 SMP code. The upstream EMEV2 SMP support code has no CPU shutdown or reset ability so we cannot reboot the secondary CPU cores. Regular SMP operation is however still working as expected. Signed-off-by: Magnus Damm --- Tested on KZM9D hardware. arch/arm/mach-shmobile/smp-emev2.c | 28 ---------------------------- 1 file changed, 28 deletions(-) --- 0001/arch/arm/mach-shmobile/smp-emev2.c +++ work/arch/arm/mach-shmobile/smp-emev2.c 2013-02-12 22:44:23.000000000 +0900 @@ -62,29 +62,6 @@ static unsigned int __init emev2_get_cor return scu_base ? scu_get_core_count(scu_base) : 1; } -static int emev2_platform_cpu_kill(unsigned int cpu) -{ - return 0; /* not supported yet */ -} - -static int __maybe_unused emev2_cpu_kill(unsigned int cpu) -{ - int k; - - /* this function is running on another CPU than the offline target, - * here we need wait for shutdown code in platform_cpu_die() to - * finish before asking SoC-specific code to power off the CPU core. - */ - for (k = 0; k < 1000; k++) { - if (shmobile_cpu_is_dead(cpu)) - return emev2_platform_cpu_kill(cpu); - mdelay(1); - } - - return 0; -} - - static void __cpuinit emev2_secondary_init(unsigned int cpu) { gic_secondary_init(0); @@ -126,9 +103,4 @@ struct smp_operations emev2_smp_ops __in .smp_prepare_cpus = emev2_smp_prepare_cpus, .smp_secondary_init = emev2_secondary_init, .smp_boot_secondary = emev2_boot_secondary, -#ifdef CONFIG_HOTPLUG_CPU - .cpu_kill = emev2_cpu_kill, - .cpu_die = shmobile_cpu_die, - .cpu_disable = shmobile_cpu_disable, -#endif };