From patchwork Mon Oct 27 15:55:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5162711 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 57F7C9F349 for ; Mon, 27 Oct 2014 16:02:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 786B620221 for ; Mon, 27 Oct 2014 16:02:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BC992017D for ; Mon, 27 Oct 2014 16:02:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752469AbaJ0QC3 (ORCPT ); Mon, 27 Oct 2014 12:02:29 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:50202 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbaJ0P5R (ORCPT ); Mon, 27 Oct 2014 11:57:17 -0400 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=TMK7O0LmAYV4WEy2AVmIbYqFSc5WYFThIY6VSoHuA8k=; b=89S9QSrEPK5+x/bEX5XLg0GsO/+te9++Gyg7+qmfH2fgFH82WF6nwH+AFFmnkO+DQKvpBIT2IfP6dPBssRXc1Wug5cKIyY15p6nwnG+mfkCr3oQkEqJB4PWKqsADfKWuOhE6ZbKYyQnKyPFamQ4Z3ISR33+6y23dxNgpd4OBQLE=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XimfV-000cz1-B6 for linux-pm@vger.kernel.org; Mon, 27 Oct 2014 15:57:17 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:54063 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XimfT-000cy7-OC; Mon, 27 Oct 2014 15:57:16 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH v3 32/47] x86: olpc: Register xo1 power-off handler with kernel power-off handler Date: Mon, 27 Oct 2014 08:55:39 -0700 Message-Id: <1414425354-10359-33-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414425354-10359-1-git-send-email-linux@roeck-us.net> References: <1414425354-10359-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.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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.0A020209.544E6B5D.0169, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-Score: 0.000 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: 180 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. Register with high priority to reflect that the driver explicitly wants to override default power-off handlers. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Signed-off-by: Guenter Roeck --- 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 arch/x86/platform/olpc/olpc-xo1-pm.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/olpc-xo1-pm.c index a9acde7..e1b7ad0 100644 --- a/arch/x86/platform/olpc/olpc-xo1-pm.c +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -92,7 +93,8 @@ asmlinkage __visible int xo1_do_sleep(u8 sleep_state) return 0; } -static void xo1_power_off(void) +static int xo1_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { printk(KERN_INFO "OLPC XO-1 power off sequence...\n"); @@ -108,8 +110,15 @@ static void xo1_power_off(void) /* Write SLP_EN bit to start the machinery */ outl(0x00002000, acpi_base + CS5536_PM1_CNT); + + return NOTIFY_DONE; } +static struct notifier_block xo1_power_off_nb = { + .notifier_call = xo1_power_off, + .priority = POWER_OFF_PRIORITY_HIGH, +}; + static int xo1_power_state_valid(suspend_state_t pm_state) { /* suspend-to-RAM only */ @@ -146,8 +155,12 @@ static int xo1_pm_probe(struct platform_device *pdev) /* If we have both addresses, we can override the poweroff hook */ if (pms_base && acpi_base) { + err = register_power_off_handler(&xo1_power_off_nb); + if (err) { + dev_err(&pdev->dev, "Failed to register power-off handler\n"); + return err; + } suspend_set_ops(&xo1_suspend_ops); - pm_power_off = xo1_power_off; printk(KERN_INFO "OLPC XO-1 support registered\n"); } @@ -158,12 +171,13 @@ static int xo1_pm_remove(struct platform_device *pdev) { mfd_cell_disable(pdev); + unregister_power_off_handler(&xo1_power_off_nb); + if (strcmp(pdev->name, "cs5535-pms") == 0) pms_base = 0; else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0) acpi_base = 0; - pm_power_off = NULL; return 0; }