From patchwork Fri Mar 28 21:12:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 27378 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 09D2420062 for ; Fri, 28 Mar 2014 21:14:02 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp18sf19470231obc.8 for ; Fri, 28 Mar 2014 14:14:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=2yNaZFG3vYQuc3oLrQ+1FXt0kAOpQyikmgHyIzo5Ges=; b=hdtbi8MK2UmxW4XFUvvZd5kQWb3hJW1VAessN40jD50vd01cZqijUFhfkgnNcW8u+I EueDLz1ENMVeN7ksztkRNmXJfHpgYXog7BPFTRJr1zmY6jrl7eDMzt19ihbbF2/M/wcS eoYNUR8kwaYJIOZvHedWfxTO62vwL27XWPmKgI4V7CX9AYxgow7vtKS/Uy3VUsaWapPb F3zLkDPOtYu6O6U99DaVwU+b0irpGZwAtuckuAe9WNlvZH5A1M/ngMd7rsN+T2FOwc2s mBUXYBwPwNFBDx9U0eEMjz9lTm90Yoom4nUjfqFTnXS6F0AslnTntvNpKfCEsfVG4ITl PgPw== X-Gm-Message-State: ALoCoQnj5zgdNRlzxr4rIO+Myz4WdToR51Z/9ejGQT8ynN9imSI7gRvi07anI++KQLnxioAsIxqp X-Received: by 10.50.33.101 with SMTP id q5mr16443478igi.3.1396041242401; Fri, 28 Mar 2014 14:14:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.230 with SMTP id f93ls1717065qgf.67.gmail; Fri, 28 Mar 2014 14:14:02 -0700 (PDT) X-Received: by 10.220.162.6 with SMTP id t6mr9214720vcx.12.1396041242301; Fri, 28 Mar 2014 14:14:02 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id ys15si1379205vcb.178.2014.03.28.14.14.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 14:14:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if17so6345858vcb.36 for ; Fri, 28 Mar 2014 14:14:02 -0700 (PDT) X-Received: by 10.58.187.78 with SMTP id fq14mr8933041vec.9.1396041242216; Fri, 28 Mar 2014 14:14:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp39685vcv; Fri, 28 Mar 2014 14:14:01 -0700 (PDT) X-Received: by 10.68.113.68 with SMTP id iw4mr10737543pbb.119.1396041241315; Fri, 28 Mar 2014 14:14:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ub3si1562111pac.71.2014.03.28.14.14.00; Fri, 28 Mar 2014 14:14:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753296AbaC1VNB (ORCPT + 27 others); Fri, 28 Mar 2014 17:13:01 -0400 Received: from mail-ie0-f178.google.com ([209.85.223.178]:60543 "EHLO mail-ie0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753190AbaC1VMu (ORCPT ); Fri, 28 Mar 2014 17:12:50 -0400 Received: by mail-ie0-f178.google.com with SMTP id lx4so5313786iec.23 for ; Fri, 28 Mar 2014 14:12:50 -0700 (PDT) X-Received: by 10.43.151.7 with SMTP id kq7mr2880847icc.78.1396041169955; Fri, 28 Mar 2014 14:12:49 -0700 (PDT) Received: from localhost.localdomain (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id t1sm7139024igw.16.2014.03.28.14.12.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 14:12:49 -0700 (PDT) From: Alex Elder To: linux@arm.linux.org.uk, linus.walleij@linaro.org, viresh.linux@gmail.com, shiraz.hashim@gmail.com, catalin.marinas@arm.com Cc: spear-devel@list.st.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 6/7] ARM: ux500: use generic SMP spin-table routines Date: Fri, 28 Mar 2014 16:12:59 -0500 Message-Id: <1396041180-29897-7-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396041180-29897-1-git-send-email-elder@linaro.org> References: <1396041180-29897-1-git-send-email-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Get rid of the ux500-specific code that implements the "holding pen" for secondary CPUs. Use the code defined in "arch/arm/kernel/smp.c" instead. Note: The original "holding pen" code for this machine used only the bottom 4 bits of the MPIDR to identify the processor id. The common code looks at the bottom 24 bits. The validity of this change needs to be verified. Signed-off-by: Alex Elder --- arch/arm/mach-ux500/Makefile | 2 +- arch/arm/mach-ux500/headsmp.S | 37 --------------------- arch/arm/mach-ux500/platsmp.c | 72 ++--------------------------------------- 3 files changed, 4 insertions(+), 107 deletions(-) delete mode 100644 arch/arm/mach-ux500/headsmp.S diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index d05ba75..0308fe1 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -9,7 +9,7 @@ obj-$(CONFIG_MACH_MOP500) += board-mop500-sdi.o \ board-mop500-regulators.o \ board-mop500-pins.o \ board-mop500-audio.o -obj-$(CONFIG_SMP) += platsmp.o headsmp.o +obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o CFLAGS_hotplug.o += -march=armv7-a diff --git a/arch/arm/mach-ux500/headsmp.S b/arch/arm/mach-ux500/headsmp.S deleted file mode 100644 index 9cdea04..0000000 --- a/arch/arm/mach-ux500/headsmp.S +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2009 ST-Ericsson - * This file is based ARM Realview platform - * Copyright (c) 2003 ARM Limited - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#include -#include - -/* - * U8500 specific entry point for secondary CPUs. - */ -ENTRY(u8500_secondary_startup) - mrc p15, 0, r0, c0, c0, 5 - and r0, r0, #15 - adr r4, 1f - ldmia r4, {r5, r6} - sub r4, r4, r5 - add r6, r6, r4 -pen: ldr r7, [r6] - cmp r7, r0 - bne pen - - /* - * we've been released from the holding pen: secondary_stack - * should now contain the SVC stack for this core - */ - b secondary_startup -ENDPROC(u8500_secondary_startup) - - .align 2 -1: .long . - .long pen_release diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index a44967f..6812aac 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c @@ -26,21 +26,6 @@ #include "db8500-regs.h" #include "id.h" -/* This is called from headsmp.S to wakeup the secondary core */ -extern void u8500_secondary_startup(void); - -/* - * Write pen_release in a way that is guaranteed to be visible to all - * observers, irrespective of whether they're taking part in coherency - * or not. This is necessary for the hotplug code to work reliably. - */ -static void write_pen_release(int val) -{ - pen_release = val; - smp_wmb(); - sync_cache_w(&pen_release); -} - static void __iomem *scu_base_addr(void) { if (cpu_is_u8500_family() || cpu_is_ux540_family()) @@ -51,57 +36,6 @@ static void __iomem *scu_base_addr(void) return NULL; } -static DEFINE_SPINLOCK(boot_lock); - -static void ux500_secondary_init(unsigned int cpu) -{ - /* - * let the primary processor know we're out of the - * pen, then head off into the C entry point - */ - write_pen_release(-1); - - /* - * Synchronise with the boot thread. - */ - spin_lock(&boot_lock); - spin_unlock(&boot_lock); -} - -static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) -{ - unsigned long timeout; - - /* - * set synchronisation state between this boot processor - * and the secondary one - */ - spin_lock(&boot_lock); - - /* - * The secondary processor is waiting to be released from - * the holding pen - release it, then wait for it to flag - * that it has been released by resetting pen_release. - */ - write_pen_release(cpu_logical_map(cpu)); - - arch_send_wakeup_ipi_mask(cpumask_of(cpu)); - - timeout = jiffies + (1 * HZ); - while (time_before(jiffies, timeout)) { - if (pen_release == -1) - break; - } - - /* - * now the secondary core is starting up let it run its - * calibrations, then wait for it to finish - */ - spin_unlock(&boot_lock); - - return pen_release != -1 ? -ENOSYS : 0; -} - static void __init wakeup_secondary(void) { void __iomem *backupram; @@ -118,7 +52,7 @@ static void __init wakeup_secondary(void) * is waiting for. This would wake up the secondary core from WFE */ #define UX500_CPU1_JUMPADDR_OFFSET 0x1FF4 - __raw_writel(virt_to_phys(u8500_secondary_startup), + __raw_writel(virt_to_phys(secondary_holding_pen), backupram + UX500_CPU1_JUMPADDR_OFFSET); #define UX500_CPU1_WAKEMAGIC_OFFSET 0x1FF0 @@ -161,8 +95,8 @@ static void __init ux500_smp_prepare_cpus(unsigned int max_cpus) struct smp_operations ux500_smp_ops __initdata = { .smp_init_cpus = ux500_smp_init_cpus, .smp_prepare_cpus = ux500_smp_prepare_cpus, - .smp_secondary_init = ux500_secondary_init, - .smp_boot_secondary = ux500_boot_secondary, + .smp_boot_secondary = smp_boot_secondary, + .smp_secondary_init = smp_secondary_init, #ifdef CONFIG_HOTPLUG_CPU .cpu_die = ux500_cpu_die, #endif