From patchwork Thu Sep 25 11:33:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pramod Gurav X-Patchwork-Id: 4974211 Return-Path: X-Original-To: patchwork-linux-pm@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 5AFBC9F32B for ; Thu, 25 Sep 2014 11:30:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F2F742020E for ; Thu, 25 Sep 2014 11:30:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0C6E202B8 for ; Thu, 25 Sep 2014 11:30:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752482AbaIYLa1 (ORCPT ); Thu, 25 Sep 2014 07:30:27 -0400 Received: from smtp117.ord1c.emailsrvr.com ([108.166.43.117]:39962 "EHLO smtp117.ord1c.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751855AbaIYLa0 (ORCPT ); Thu, 25 Sep 2014 07:30:26 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp23.relay.ord1c.emailsrvr.com (SMTP Server) with ESMTP id 90ED828036F; Thu, 25 Sep 2014 07:30:25 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp23.relay.ord1c.emailsrvr.com (Authenticated sender: pramod.gurav-AT-smartplayin.com) with ESMTPSA id AC2562803EF; Thu, 25 Sep 2014 07:30:22 -0400 (EDT) X-Sender-Id: pramod.gurav@smartplayin.com Received: from SPINITLTDL00278.smartplayin.local ([UNAVAILABLE]. [220.227.185.53]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA) by 0.0.0.0:465 (trex/5.2.13); Thu, 25 Sep 2014 11:30:25 GMT From: Pramod Gurav To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Pramod Gurav , Guenter Roeck , Josh Cartwright , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Stephen Boyd , linux-pm@vger.kernel.org Subject: [PATCH v4] power: reset: use restart_notifier mechanism for msm-poweroff Date: Thu, 25 Sep 2014 17:03:51 +0530 Message-Id: <1411644831-2931-1-git-send-email-pramod.gurav@smartplayin.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This change replaces use of arm_pm_restart with recently introduced reset mechanism in Linux kernel called restart_notifier. Choosing priority 128, which is default priority, as according to documentation, this mechanism is sufficient to restart the entire system. Cc: Guenter Roeck Cc: Josh Cartwright Cc: Sebastian Reichel Cc: Dmitry Eremin-Solenikov Cc: David Woodhouse Cc: Stephen Boyd Cc: linux-pm@vger.kernel.org Reviewed-by: Guenter Roeck Reviewed-by: Stephen Boyd Signed-off-by: Pramod Gurav --- Why reset handler in pinctrl-msm wont collide with reset in poweroff-msm.c in this patch: In case of apq8064, the ps_hold register region is owned by pinctrl hence the reset is implemented in pinctrl driver as the region is already mapped there. Whereas ps_hold register region in apq8074 are moved to its own region. So, for apq8074 there is no need for ps_hold to be configured/muxed in pinctrl and Josh's changes wont execute. Hence msm-poweroff wil be the default reset as 128 in the default priority. Tested on Dragonboard APQ8074 Changes since v3: - Updated Commit message about default priority chosen and how ps_hold in a and b family are different. Changes since v2: - Removed unwanted header file and added linux/pm.h Changes since v1: - Initialized restart_nb with its declaration - Removed return check for register_restart_handler as it always returns 0 as per Guenter's suggestion to Josh's similar patch. This takes care of Guenter's comments on error logs and NULL initialization of restart_nb.notifier_call. --- drivers/power/reset/msm-poweroff.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 774f9a3..4702efd 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -20,21 +20,27 @@ #include #include #include - -#include +#include static void __iomem *msm_ps_hold; - -static void do_msm_restart(enum reboot_mode reboot_mode, const char *cmd) +static int do_msm_restart(struct notifier_block *nb, unsigned long action, + void *data) { writel(0, msm_ps_hold); mdelay(10000); + + return NOTIFY_DONE; } +static struct notifier_block restart_nb = { + .notifier_call = do_msm_restart, + .priority = 128, +}; + static void do_msm_poweroff(void) { /* TODO: Add poweroff capability */ - do_msm_restart(REBOOT_HARD, NULL); + do_msm_restart(&restart_nb, 0, NULL); } static int msm_restart_probe(struct platform_device *pdev) @@ -47,8 +53,10 @@ static int msm_restart_probe(struct platform_device *pdev) if (IS_ERR(msm_ps_hold)) return PTR_ERR(msm_ps_hold); + register_restart_handler(&restart_nb); + pm_power_off = do_msm_poweroff; - arm_pm_restart = do_msm_restart; + return 0; }