From patchwork Mon Nov 10 01:42:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5263231 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 9A5D1C11AC for ; Mon, 10 Nov 2014 01:50:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1D1720115 for ; Mon, 10 Nov 2014 01:50:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C00892015D for ; Mon, 10 Nov 2014 01:50:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752762AbaKJBuZ (ORCPT ); Sun, 9 Nov 2014 20:50:25 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:39110 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752477AbaKJBoc (ORCPT ); Sun, 9 Nov 2014 20:44:32 -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=Cu3TwDHdEIe7yajC8ZnzcRwKWofuyes5rC4aaMAmOaE=; b=p+HVATYt/Rn70kJupWARWDlf4pCSC2FY8Wgev4dJRCztp87X2YU9Fk6ok7r9tO2o16RBgTlmAGnu5upZFRX6Hved3hOncxsdK6O3+sNcDDKnridieqx3De67cl8Ev38FrMnyAPWlaDP2e+jImI4rMK7cqq43P4rBLgYa0l+vAy8=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1Xne1w-000VXy-GM for linux-pm@vger.kernel.org; Mon, 10 Nov 2014 01:44:32 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:36319 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1Xne1u-000VXE-Js; Mon, 10 Nov 2014 01:44:31 +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 v6 30/48] x86: iris: Register with kernel power-off handler Date: Sun, 9 Nov 2014 17:42:47 -0800 Message-Id: <1415583785-6980-31-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=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.0A02020A.54601880.00F3, 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: 173 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 original code overwrites existing power-off handlers. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Acked-by: Thomas Gleixner 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 - Use devm_register_power_off_handler arch/x86/platform/iris/iris.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c index 4d171e8..7152814 100644 --- a/arch/x86/platform/iris/iris.c +++ b/arch/x86/platform/iris/iris.c @@ -47,15 +47,18 @@ static bool force; module_param(force, bool, 0); MODULE_PARM_DESC(force, "Set to one to force poweroff handler installation."); -static void (*old_pm_power_off)(void); - -static void iris_power_off(void) +static void iris_power_off(struct power_off_handler_block *this) { outb(IRIS_GIO_PULSE, IRIS_GIO_OUTPUT); msleep(850); outb(IRIS_GIO_REST, IRIS_GIO_OUTPUT); } +static struct power_off_handler_block iris_power_off_hb = { + .handler = iris_power_off, + .priority = POWER_OFF_PRIORITY_HIGH, +}; + /* * Before installing the power_off handler, try to make sure the OS is * running on an Iris. Since Iris does not support DMI, this is done @@ -65,20 +68,25 @@ static void iris_power_off(void) static int iris_probe(struct platform_device *pdev) { unsigned char status = inb(IRIS_GIO_INPUT); + int ret; + if (status == IRIS_GIO_NODEV) { printk(KERN_ERR "This machine does not seem to be an Iris. " "Power off handler not installed.\n"); return -ENODEV; } - old_pm_power_off = pm_power_off; - pm_power_off = &iris_power_off; + + ret = devm_register_power_off_handler(&pdev->dev, &iris_power_off_hb); + if (ret) { + dev_err(&pdev->dev, "Failed to register power-off handler\n"); + return ret; + } printk(KERN_INFO "Iris power_off handler installed.\n"); return 0; } static int iris_remove(struct platform_device *pdev) { - pm_power_off = old_pm_power_off; printk(KERN_INFO "Iris power_off handler uninstalled.\n"); return 0; }