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: 27379 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2C4EA20062 for ; Fri, 28 Mar 2014 21:14:26 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id c41sf12982919yho.1 for ; Fri, 28 Mar 2014 14:14:25 -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=XD0bKlgpDL+KMgfHdiN6Kt0tXmnGGJaS+Ig+pcBiaA0=; b=JgmcMfOZMC1su6oImFBXbDWgIi3Wvndosr28qC5T7WCMd3uRKm1hP8iaFbL+j0fp6Y d7pG/awGOFJ0mQvFwrNwPm24NAUbY8S7p/dSWe/EDEg6U0f25gMsKq38zMUrFDU+ijIf rjana++3dPMokt1Js6m01JhiFl6IcH3J8G98+wBUeKh40QthOolu2q2KNH0bRcxND1HX tjhbuX7Xn6kHqQ68/szH0WXGByNT49U5VNhu+pqxCBSH/H17olOrgbwWyUVDYN7lzfw5 xM1KLyRVog5ecNxAjpzOz+zHohuTHPBrtOo/J5e12Lt4+JluIr/jvCpFnvRC7c++1R0r s0MA== X-Gm-Message-State: ALoCoQnfGgUvlFoIvVp6awZJNMq7etviHMMpcPJU0XgSRztz7ValvR/NZWrdws6DFH9okfb38D26 X-Received: by 10.236.118.38 with SMTP id k26mr3960800yhh.35.1396041265863; Fri, 28 Mar 2014 14:14:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.75 with SMTP id 69ls1766251qgm.94.gmail; Fri, 28 Mar 2014 14:14:25 -0700 (PDT) X-Received: by 10.221.40.10 with SMTP id to10mr3343552vcb.22.1396041265731; Fri, 28 Mar 2014 14:14:25 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id e9si1487192vcf.49.2014.03.28.14.14.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 14:14:25 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 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.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so6428629vcb.14 for ; Fri, 28 Mar 2014 14:14:25 -0700 (PDT) X-Received: by 10.58.31.136 with SMTP id a8mr9358438vei.20.1396041265644; Fri, 28 Mar 2014 14:14:25 -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 v8csp39704vcv; Fri, 28 Mar 2014 14:14:25 -0700 (PDT) X-Received: by 10.68.12.10 with SMTP id u10mr10991003pbb.39.1396041264925; Fri, 28 Mar 2014 14:14:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pa10si4369323pbc.323.2014.03.28.14.14.24; Fri, 28 Mar 2014 14:14:24 -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 S1753264AbaC1VNA (ORCPT + 27 others); Fri, 28 Mar 2014 17:13:00 -0400 Received: from mail-ig0-f177.google.com ([209.85.213.177]:65435 "EHLO mail-ig0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114AbaC1VMq (ORCPT ); Fri, 28 Mar 2014 17:12:46 -0400 Received: by mail-ig0-f177.google.com with SMTP id ur14so1380114igb.4 for ; Fri, 28 Mar 2014 14:12:46 -0700 (PDT) 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 Cc: spear-devel@list.st.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org 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> 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.169 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: , 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