From patchwork Wed Feb 19 01:52:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Capella X-Patchwork-Id: 24924 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BB7E520676 for ; Wed, 19 Feb 2014 01:52:33 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id m20sf33075521qcx.6 for ; Tue, 18 Feb 2014 17:52:33 -0800 (PST) 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=KOa3GQnMalJe6SZ7lSAe+oP/JJS0sHyUQzpnPiQ62sE=; b=MuKlKTMkyAeh7wiPt9DIObgAzu56B/c4D0qFbQBHx894ii0iMuI98u3q73n7zji4n1 LZEpoGAKN4bTbr7EJBS4/z8wrA9I4kBAjXWql2gFK/maVlnNMJZkEtHRWJBDby0RQTXK vFza5QBaGlQsA6rK2y2drT+8KMZkOF6FtWQNdhAVonyIt9bjk66amwmIbx10FKzK8lDG WQWy8DdrVJdRtWx9/7jmzSnlJrSX2YmMxdBs54NFme+17KUKKBtLbfeHz10UYWtThtpi 4GO7rL4QXb2NSZR0KRy/YFUiDhy78zi8R/lAKyddh+eLTGAb7Aogyx0t0vxVFWpqnQ4K O22Q== X-Gm-Message-State: ALoCoQkIOYVIr8yb9iLeGjUVAjPx2oJNeUn/FOSyeaAFfs3pfcuA+Nn6WA3bcNWTrCdit7Zhn/Q6 X-Received: by 10.224.115.18 with SMTP id g18mr5891210qaq.3.1392774753311; Tue, 18 Feb 2014 17:52:33 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.215 with SMTP id 81ls1515303qgr.14.gmail; Tue, 18 Feb 2014 17:52:33 -0800 (PST) X-Received: by 10.52.30.167 with SMTP id t7mr9632658vdh.36.1392774753226; Tue, 18 Feb 2014 17:52:33 -0800 (PST) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id zp2si6173917vec.8.2014.02.18.17.52.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Feb 2014 17:52:33 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.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.128.177; Received: by mail-ve0-f177.google.com with SMTP id jz11so13922170veb.8 for ; Tue, 18 Feb 2014 17:52:33 -0800 (PST) X-Received: by 10.52.164.39 with SMTP id yn7mr16626405vdb.25.1392774753051; Tue, 18 Feb 2014 17:52:33 -0800 (PST) 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.174.196 with SMTP id u4csp261668vcz; Tue, 18 Feb 2014 17:52:32 -0800 (PST) X-Received: by 10.68.143.34 with SMTP id sb2mr36418968pbb.135.1392774752130; Tue, 18 Feb 2014 17:52:32 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oq9si20131709pac.6.2014.02.18.17.52.31; Tue, 18 Feb 2014 17:52:31 -0800 (PST) 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 S1752441AbaBSBwX (ORCPT + 27 others); Tue, 18 Feb 2014 20:52:23 -0500 Received: from mail-pb0-f54.google.com ([209.85.160.54]:63793 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752252AbaBSBwR (ORCPT ); Tue, 18 Feb 2014 20:52:17 -0500 Received: by mail-pb0-f54.google.com with SMTP id uo5so17723871pbc.27 for ; Tue, 18 Feb 2014 17:52:17 -0800 (PST) X-Received: by 10.68.231.35 with SMTP id td3mr18522425pbc.137.1392774737479; Tue, 18 Feb 2014 17:52:17 -0800 (PST) Received: from localhost (cpe-76-93-135-111.san.res.rr.com. [76.93.135.111]) by mx.google.com with ESMTPSA id qh2sm154335030pab.13.2014.02.18.17.52.14 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 18 Feb 2014 17:52:16 -0800 (PST) From: Sebastian Capella To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org Cc: Russ Dill , Sebastian Capella , Russell King , Andrew Morton , Thomas Gleixner , Will Deacon , Robin Holt Subject: [PATCH RFC v1 1/3] ARM: Add irq disabled version of soft_restart. Date: Tue, 18 Feb 2014 17:52:07 -0800 Message-Id: <1392774729-3235-2-git-send-email-sebastian.capella@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1392774729-3235-1-git-send-email-sebastian.capella@linaro.org> References: <1392774729-3235-1-git-send-email-sebastian.capella@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: sebastian.capella@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.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: , From: Russ Dill This adds the ability to run soft_restart with local_irq/fiq_disable already called. This is helpful for the hibernation code paths. Signed-off-by: Russ Dill Signed-off-by: Sebastian Capella Cc: Russell King Cc: Andrew Morton Cc: Thomas Gleixner Cc: Will Deacon Cc: Robin Holt --- arch/arm/include/asm/system_misc.h | 1 + arch/arm/kernel/process.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/system_misc.h index a3d61ad..eca8dd4 100644 --- a/arch/arm/include/asm/system_misc.h +++ b/arch/arm/include/asm/system_misc.h @@ -10,6 +10,7 @@ extern void cpu_init(void); +void soft_restart_noirq(unsigned long); void soft_restart(unsigned long); extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); extern void (*arm_pm_idle)(void); diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 92f7b15..685bc4a 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -95,14 +95,10 @@ static void __soft_restart(void *addr) BUG(); } -void soft_restart(unsigned long addr) +void soft_restart_noirq(unsigned long addr) { u64 *stack = soft_restart_stack + ARRAY_SIZE(soft_restart_stack); - /* Disable interrupts first */ - local_irq_disable(); - local_fiq_disable(); - /* Disable the L2 if we're the last man standing. */ if (num_online_cpus() == 1) outer_disable(); @@ -114,6 +110,15 @@ void soft_restart(unsigned long addr) BUG(); } +void soft_restart(unsigned long addr) +{ + /* Disable interrupts first */ + local_irq_disable(); + local_fiq_disable(); + + soft_restart_noirq(addr); +} + static void null_restart(enum reboot_mode reboot_mode, const char *cmd) { }