From patchwork Mon Nov 10 01:42:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5262721 Return-Path: X-Original-To: patchwork-linux-pm@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 E2693C11AC for ; Mon, 10 Nov 2014 01:44:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1398D2010C for ; Mon, 10 Nov 2014 01:44:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 268C420172 for ; Mon, 10 Nov 2014 01:44:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752448AbaKJBoZ (ORCPT ); Sun, 9 Nov 2014 20:44:25 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:39079 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752372AbaKJBoX (ORCPT ); Sun, 9 Nov 2014 20:44:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=cXxbXJCHbl5EvqOTDFxHZhkvgRh5sWvAqNpwuyuQi/E=; b=kXfCto3E5qgTC80BsaMmjL28u6URNYdgc27L63QHON0mRDLKr6JKM7Q3FVnsmBSLnPfvjyjvlTOESXJLihhNi1WeXMEJ25HfAUgWv3IYCxM/SwoZKEinArNCIXr5D4inLeztHCcxJQ6AY0U38UY8spl3z8ICP+FUxC+Lp9KOzDY=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1Xne1n-000VRm-0P for linux-pm@vger.kernel.org; Mon, 10 Nov 2014 01:44:23 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:36315 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1Xne1l-000VQw-PP; Mon, 10 Nov 2014 01:44:22 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , David Woodhouse , Dmitry Eremin-Solenikov , Sebastian Reichel Subject: [PATCH v6 26/48] power/reset: msm-poweroff: Register with kernel power-off handler Date: Sun, 9 Nov 2014 17:42:43 -0800 Message-Id: <1415583785-6980-27-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415583785-6980-1-git-send-email-linux@roeck-us.net> References: <1415583785-6980-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020202.54601876.0203, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-Score: 0.001 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: C_4847, X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 156 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Register with kernel power-off handler instead of setting pm_power_off directly. Select fallback priority since the code does not really poweroff the system but resets it instead. Acked-by: Sebastian Reichel Signed-off-by: Guenter Roeck --- v6: - This patch: No change. Global: Replaced priority defines with enum. v5: - Rebase to v3.18-rc3 v4: - Do not use notifiers but internal functions and data structures to manage the list of power-off handlers. Drop unused parameters from callbacks, and make the power-off function type void v3: - Replace poweroff in all newly introduced variables and in text with power_off or power-off as appropriate - Replace POWEROFF_PRIORITY_xxx with POWER_OFF_PRIORITY_xxx v2: - Use define to specify poweroff handler priority - Fix headline and description - Merge with restart handler code now used in same driver - Use dev_warn instead of dev_err drivers/power/reset/msm-poweroff.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 4702efd..822f358 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -23,11 +23,17 @@ #include static void __iomem *msm_ps_hold; -static int do_msm_restart(struct notifier_block *nb, unsigned long action, - void *data) + +static void _do_msm_restart(void) { writel(0, msm_ps_hold); mdelay(10000); +} + +static int do_msm_restart(struct notifier_block *nb, unsigned long action, + void *data) +{ + _do_msm_restart(); return NOTIFY_DONE; } @@ -37,12 +43,17 @@ static struct notifier_block restart_nb = { .priority = 128, }; -static void do_msm_poweroff(void) +static void do_msm_power_off(struct power_off_handler_block *this) { - /* TODO: Add poweroff capability */ - do_msm_restart(&restart_nb, 0, NULL); + /* TODO: Add power-off capability */ + _do_msm_restart(); } +static struct power_off_handler_block power_off_hb = { + .handler = do_msm_power_off, + .priority = POWER_OFF_PRIORITY_FALLBACK, +}; + static int msm_restart_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -55,7 +66,8 @@ static int msm_restart_probe(struct platform_device *pdev) register_restart_handler(&restart_nb); - pm_power_off = do_msm_poweroff; + if (register_power_off_handler(&power_off_hb)) + dev_warn(&pdev->dev, "Failed to register power-off handler\n"); return 0; }