From patchwork Sun Jul 6 23:38:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4491741 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 AF3A29FAD9 for ; Sun, 6 Jul 2014 23:41:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9794E202A1 for ; Sun, 6 Jul 2014 23:41:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 981F12022D for ; Sun, 6 Jul 2014 23:41:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X3w1a-0001dU-Oe; Sun, 06 Jul 2014 23:39:14 +0000 Received: from mail-pd0-x229.google.com ([2607:f8b0:400e:c02::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X3w1R-0001UL-75 for linux-arm-kernel@lists.infradead.org; Sun, 06 Jul 2014 23:39:05 +0000 Received: by mail-pd0-f169.google.com with SMTP id g10so4347001pdj.28 for ; Sun, 06 Jul 2014 16:38:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=B/oKXilM40jjWXx6EIcaCVHI1jVTncfzNVRZn5YU3Nc=; b=zIoyuK5aA3oOIH268VGlhVMMa8gw/uzdFi3/mUX98BbBUEn5mte+R8wJU1HOangTHH wODCzSxGypFj3a/izeLqt0woE/DhaXg97yIWG1T3QDBCcxe2cgKweQ6YAfvsc50ULh9C PvWC9JwPq2y3D/01Vc2Oz3Nqfds67hv889RZK5PxMCfKrs3ZeEDblIynXsRRlhWxfMVS AilUy3qSKvkCrhk7kkYGDat6xYfA7KA/6A+8So87XSWv8dRYmoIpkNSSOssU/YhuoGH9 8pvdWZ3hpM/v3tAbaOWOWGgUcEBkNlM5V5/t2nGJWxBMQpLXyMzRa30faP1Uyoguq41k 4Vng== X-Received: by 10.68.252.41 with SMTP id zp9mr15389209pbc.65.1404689924428; Sun, 06 Jul 2014 16:38:44 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id pl10sm50677202pbb.56.2014.07.06.16.38.42 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 06 Jul 2014 16:38:43 -0700 (PDT) From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/7] arm: Support restart through restart notifier call chain Date: Sun, 6 Jul 2014 16:38:16 -0700 Message-Id: <1404689900-27421-4-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404689900-27421-1-git-send-email-linux@roeck-us.net> References: <1404689900-27421-1-git-send-email-linux@roeck-us.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140706_163905_285732_EDCAEC52 X-CRM114-Status: GOOD ( 11.49 ) X-Spam-Score: -0.4 (/) Cc: Ingo Molnar , Russell King , Heiko Stuebner , Arnd Bergmann , linux-doc@vger.kernel.org, Dmitry Eremin-Solenikov , Catalin Marinas , Randy Dunlap , Will Deacon , linux-kernel@vger.kernel.org, Steven Rostedt , Jonas Jensen , Wim Van Sebroeck , Maxime Ripard , David Woodhouse , Andrew Morton , Guenter Roeck X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 The kernel core now supports a notifier call chain for system restart functions. With this change, the arm_pm_restart callback is now optional, so check if it is set before calling it. Only call the notifier functions if arm_pm_restart is not set. Signed-off-by: Guenter Roeck --- v2: Only call notifier call chain if arm_pm_restart is not set Do not include linux/watchdog.h arch/arm/kernel/process.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 81ef686..5108e45 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -230,7 +230,11 @@ void machine_restart(char *cmd) local_irq_disable(); smp_send_stop(); - arm_pm_restart(reboot_mode, cmd); + if (arm_pm_restart) + arm_pm_restart(reboot_mode, cmd); + else + blocking_notifier_call_chain(&restart_notifier_list, + reboot_mode, cmd); /* Give a grace period for failure to restart of 1s */ mdelay(1000);