From patchwork Fri Mar 28 21:12:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 3907441 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 6E4B8BF540 for ; Fri, 28 Mar 2014 21:14:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA5A420274 for ; Fri, 28 Mar 2014 21:14:40 +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 B79BB200DF for ; Fri, 28 Mar 2014 21:14:39 +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 1WTe5z-0006u2-3g; Fri, 28 Mar 2014 21:13:47 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WTe5o-0004QZ-V2; Fri, 28 Mar 2014 21:13:36 +0000 Received: from mail-ie0-f173.google.com ([209.85.223.173]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WTe5M-0004M9-7O for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2014 21:13:09 +0000 Received: by mail-ie0-f173.google.com with SMTP id rl12so5515478iec.32 for ; Fri, 28 Mar 2014 14:12:46 -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=PDKumn7jDMloeX6DvPLkMrj4+9lCAsMFBZSB6l4BFyc=; b=kHFgj3esZFvgfv4rmRqDd3i0FpuoLElTP8xQkIlrOHFqKJb7f9e0Q6md77Y+hFQVCW Ls4s7J3f355NJ+GWCucIB6N4pnMZ1R+jKfXp0aFZBw6dprPLAaBPUDqioGKwMcd98jO9 e5sAbgc8oharpxfON5cNSKXLQRO/Y4jOp184AhkhcD6dI09LVod3YRfLykfGnhiJp2eZ BrVbm1Qz9oZkT5S+6EoFbKqlxYR4digUnOQugGMIjeU/Sx2LTRt8ol+Uh7NOvMTe/UBJ CfkWPQ/ykY0mbZNBeb7pwigPv6tliPKtTegapmDswGopOlTNYOkGVBO+C9tG/IZJbeMX lqXw== X-Gm-Message-State: ALoCoQnhpxK07HqPg3IQYOvvV1RfSYYKjmupb4vz5elYitqg/6zwCPGktanghBmyK4J6wB8sZEKe X-Received: by 10.50.148.99 with SMTP id tr3mr13574653igb.24.1396041166233; Fri, 28 Mar 2014 14:12:46 -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.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 14:12:45 -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 3/7] ARM: realview: use central SMP spin-table routines Date: Fri, 28 Mar 2014 16:12:56 -0500 Message-Id: <1396041180-29897-4-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_171308_351312_D6487E51 X-CRM114-Status: GOOD ( 12.80 ) 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 first of three patches 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. We can't get rid of the mach-versatile functions yet, so this patch just switches mach-realview to use the common routines. Signed-off-by: Alex Elder --- arch/arm/mach-realview/platsmp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index 98e3052..b27dd07 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c @@ -21,8 +21,6 @@ #include #include -#include - #include "core.h" static void __iomem *scu_base_addr(void) @@ -71,15 +69,15 @@ static void __init realview_smp_prepare_cpus(unsigned int max_cpus) * until it receives a soft interrupt, and then the * secondary CPU branches to this address. */ - __raw_writel(virt_to_phys(versatile_secondary_startup), + __raw_writel(virt_to_phys(secondary_holding_pen), __io_address(REALVIEW_SYS_FLAGSSET)); } struct smp_operations realview_smp_ops __initdata = { .smp_init_cpus = realview_smp_init_cpus, .smp_prepare_cpus = realview_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 = realview_cpu_die, #endif