From patchwork Fri Mar 28 21:12:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 3907551 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 A17149F2E8 for ; Fri, 28 Mar 2014 21:21:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DEB392034F for ; Fri, 28 Mar 2014 21:21:52 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1C372034C for ; Fri, 28 Mar 2014 21:21:51 +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 1WTeDI-0001rn-0R; Fri, 28 Mar 2014 21:21:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WTeDC-0004mR-4p; Fri, 28 Mar 2014 21:21:14 +0000 Received: from mail-ig0-f179.google.com ([209.85.213.179]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WTeCy-0004jr-V9 for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2014 21:21:01 +0000 Received: by mail-ig0-f179.google.com with SMTP id t19so1382056igi.6 for ; Fri, 28 Mar 2014 14:20:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uEKaD6yYcoG/ITkpt/JtsNsir8cgjicxjmWEKmv+92w=; b=hSBAauYXOimA2RCbkvxiRf3S8+dLN9/PJlvnGNWZPI3Ro9oxFZAtwl5JqzxmQ2GOJQ mMxpPTt+PGlRGmFBzGxcHFO8OJ9Fct+F/cK3LqyrczVeuklKmcJEOlZQ3q2OUF7RWL8k BoqutGDPwmaX53QVSqc7otzJhwVQh7JfJz7FWVpanIau93hHDS8IWg8vXcSIjqjGjYzo 7BC4VAEHvkcDaFqZRODkP3DWbwaKsWjwoFEAMa6XrOsH0+YBUz//y9QR4seamxGdP0BA AW3/dh2Y68k9x+ihtQgzRrz5MwW7STJ4lSkuPdxiodWzDZ8ZnFx9lHqTHX01CnbJe2Pd wo+g== X-Gm-Message-State: ALoCoQm7Oxt4aHaMUTOTGS+VXCJ3Og4Kmr82jcAwEZe4bG0kCp6ynvDV/7CGRMARKjgs/qvBjiGZ X-Received: by 10.42.58.130 with SMTP id i2mr3381081ich.66.1396041167688; Fri, 28 Mar 2014 14:12:47 -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.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 14:12:46 -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 Subject: [RFC PATCH 4/7] ARM: vexpress: use central SMP spin-table routines Date: Fri, 28 Mar 2014 16:12:57 -0500 Message-Id: <1396041180-29897-5-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140328_172101_072222_F91CAF36 X-CRM114-Status: GOOD ( 11.27 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, spear-devel@list.st.com, linux-kernel@vger.kernel.org, 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: , 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=-4.6 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 This is the second patch involved replacing the use of smp operations defined under arch/arm/mach-versatile. Both realview and vexpress use the same smp_boot_secondary and smp_secondary_init functions, and those are equivalent to the common ones now available in arch/arm/kernel/smp.c. This converts mach-vexpress to use the common routines. Signed-off-by: Alex Elder --- arch/arm/mach-vexpress/platsmp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-vexpress/platsmp.c b/arch/arm/mach-vexpress/platsmp.c index 993c9ae..1ed4078 100644 --- a/arch/arm/mach-vexpress/platsmp.c +++ b/arch/arm/mach-vexpress/platsmp.c @@ -22,8 +22,6 @@ #include -#include - #include "core.h" #if defined(CONFIG_OF) @@ -193,14 +191,14 @@ static void __init vexpress_smp_prepare_cpus(unsigned int max_cpus) * until it receives a soft interrupt, and then the * secondary CPU branches to this address. */ - vexpress_flags_set(virt_to_phys(versatile_secondary_startup)); + vexpress_flags_set(virt_to_phys(secondary_holding_pen)); } struct smp_operations __initdata vexpress_smp_ops = { .smp_init_cpus = vexpress_smp_init_cpus, .smp_prepare_cpus = vexpress_smp_prepare_cpus, - .smp_secondary_init = versatile_secondary_init, - .smp_boot_secondary = versatile_boot_secondary, + .smp_secondary_init = smp_secondary_init, + .smp_boot_secondary = smp_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU .cpu_die = vexpress_cpu_die, #endif