From patchwork Thu May 1 15:41:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4099371 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 01EB6C0ACC for ; Thu, 1 May 2014 15:45:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 249F020304 for ; Thu, 1 May 2014 15:44:59 +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 2AC4620357 for ; Thu, 1 May 2014 15:44:58 +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 1Wft7x-0001BC-AD; Thu, 01 May 2014 15:42:25 +0000 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wft7q-00016f-VX for linux-arm-kernel@lists.infradead.org; Thu, 01 May 2014 15:42:19 +0000 Received: by mail-pa0-f52.google.com with SMTP id kx10so3812079pab.25 for ; Thu, 01 May 2014 08:41:57 -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=gyXJD7Zun0zmFqgcG+lcE7uG6kJKoM6jvzdnuiiBPFA=; b=iBQ97s6pkgoL3gXsufl7lEH5xfRyBOAdT8xAzw7kShptE5xNP5TBuVkgXpdhwvmBIn FLhOK9Zd2fSAVkTYW9GpijvdgKAqggds0wcqDnDTFDF9xFeCIRv2jGAtSQzjVUxeFbLj 1WGQLMx62biT1ZVlJD3KGHyFYq4u79jN5Vsgfj1YxFQucApQjivhzobrVVzSACXi5OQE r0Tix5g4Xzq2KkswMlRyBKtFl21Q+VYxAZQVZUBiD3pZZHKUqkd+UOl12ep1KHqC5RSg Z4kJ4bis/cmqFPYUB4zZOVtDcSnNNhToxyWiPYqKGMihgv5zmjXSlSGC29hxkmjR3wjt 8eFw== X-Received: by 10.66.142.233 with SMTP id rz9mr22750587pab.71.1398958917781; Thu, 01 May 2014 08:41:57 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id ry8sm160227551pac.29.2014.05.01.08.41.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 01 May 2014 08:41:57 -0700 (PDT) From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 3/5] arm: Support reboot through watchdog subsystem Date: Thu, 1 May 2014 08:41:31 -0700 Message-Id: <1398958893-30049-4-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1398958893-30049-1-git-send-email-linux@roeck-us.net> References: <1398958893-30049-1-git-send-email-linux@roeck-us.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140501_084219_052637_B506D37F X-CRM114-Status: GOOD ( 10.52 ) X-Spam-Score: 0.2 (/) Cc: Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, Jonas Jensen , Wim Van Sebroeck , Maxime Ripard , Guenter Roeck 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=-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 watchdog subsystem provides an API to perform a system reboot. Use it. With this change, the arm_pm_restart callback is now optional, so check if it is set before calling it. Signed-off-by: Guenter Roeck --- 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..c3b7b5e 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -230,7 +231,10 @@ 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); + + watchdog_do_reboot(reboot_mode, cmd); /* Give a grace period for failure to restart of 1s */ mdelay(1000);