From patchwork Tue Feb 25 00:27:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Capella X-Patchwork-Id: 25219 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 44ECB2066C for ; Tue, 25 Feb 2014 00:28:27 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id gq1sf5291501obb.2 for ; Mon, 24 Feb 2014 16:28:26 -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=mNkzBypqL6pwzzPwlQOP2Ie+2Fl/N4nj+TceupXJK4U=; b=Ke6Cl/HhBEyGt3RLItldHMXX/jeiWGn+7MYMLnoCLxIpCPJxnSHb4Po1eH9oAvWzLI XOhobSIgc/hAid2K6/or9oLHDQxRmWcc1HvASv6BeYe+aBcelpItQKN6fO0SRByFCqEQ NqB+hM4crxCRKhtHAHNMOBbIrlxElPg0yOrdk6/gZeaxGJTJmaqM21+VMYtCAXQYqHt4 5HZmGaIu7TIzrbEY4wGb9ye8+6v5uF6K5raasrOQIpWYTx+bnnEHwJD94UYxUZ0Zz9t6 8CXO3AVa01uaD52saqJrXlUu69Wq5mo3RQKzYGfNhGUljDzLnAor5Xqu3wRpbJDCR85F WgyQ== X-Gm-Message-State: ALoCoQmA1wfsXjjwaJcMPxWT37rBu2cotQoNuR0cfrvWS9EEeXyyvr4TxvTrtycntj5gSfEFap/7 X-Received: by 10.50.20.71 with SMTP id l7mr125711ige.5.1393288106648; Mon, 24 Feb 2014 16:28:26 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.7 with SMTP id o7ls2050882qgo.15.gmail; Mon, 24 Feb 2014 16:28:26 -0800 (PST) X-Received: by 10.58.178.238 with SMTP id db14mr91070vec.25.1393288106517; Mon, 24 Feb 2014 16:28:26 -0800 (PST) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id wt4si6371846vcb.40.2014.02.24.16.28.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Feb 2014 16:28:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.170 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.170; Received: by mail-ve0-f170.google.com with SMTP id c14so2185048vea.15 for ; Mon, 24 Feb 2014 16:28:26 -0800 (PST) X-Received: by 10.52.110.166 with SMTP id ib6mr11917136vdb.47.1393288106416; Mon, 24 Feb 2014 16:28:26 -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 u4csp99189vcz; Mon, 24 Feb 2014 16:28:24 -0800 (PST) X-Received: by 10.68.66.33 with SMTP id c1mr2918487pbt.118.1393288103530; Mon, 24 Feb 2014 16:28:23 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uc9si18720512pac.7.2014.02.24.16.28.22; Mon, 24 Feb 2014 16:28:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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 S1752954AbaBYA2J (ORCPT + 11 others); Mon, 24 Feb 2014 19:28:09 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:50056 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752879AbaBYA1u (ORCPT ); Mon, 24 Feb 2014 19:27:50 -0500 Received: by mail-pa0-f43.google.com with SMTP id rd3so7275487pab.16 for ; Mon, 24 Feb 2014 16:27:50 -0800 (PST) X-Received: by 10.66.121.131 with SMTP id lk3mr28163787pab.61.1393288070143; Mon, 24 Feb 2014 16:27:50 -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 bc4sm4093096pbb.2.2014.02.24.16.27.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 24 Feb 2014 16:27:49 -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 v2 1/3] ARM: Add irq disabled version of soft_restart. Date: Mon, 24 Feb 2014 16:27:37 -0800 Message-Id: <1393288059-18174-2-git-send-email-sebastian.capella@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393288059-18174-1-git-send-email-sebastian.capella@linaro.org> References: <1393288059-18174-1-git-send-email-sebastian.capella@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@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.170 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) { }