From patchwork Mon Nov 10 01:42:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5263341 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 680529F295 for ; Mon, 10 Nov 2014 01:52:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5AD9720115 for ; Mon, 10 Nov 2014 01:52:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A03A2010C for ; Mon, 10 Nov 2014 01:52:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752681AbaKJBwQ (ORCPT ); Sun, 9 Nov 2014 20:52:16 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:39031 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752336AbaKJBoM (ORCPT ); Sun, 9 Nov 2014 20:44:12 -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=XrWaBrtVkGjNMBdcuzi95cjZzbCqw745GddJAxRHFlw=; b=d5E32kJLmT5j0onxA1nSivMOcUhKvZXhmzi5x2ZyYh43FIKqT/mwjy2eoD8bWrdrF1Z2y/bSH2ceqttRvJY+EnXw6wW8F4H5iQXuo7DYNjD5//opHtbBXSrsu/MmLx8i44Puvrfg8P3FRircSu3BGnnf7wfexLFs0GVeJ7JzTak=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1Xne1b-000V3K-Vc for linux-pm@vger.kernel.org; Mon, 10 Nov 2014 01:44:12 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:36310 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1Xne1a-000V1k-EH; Mon, 10 Nov 2014 01:44:10 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , Corey Minyard , openipmi-developer@lists.sourceforge.net Subject: [PATCH v6 21/48] ipmi: Register with kernel power-off handler Date: Sun, 9 Nov 2014 17:42:38 -0800 Message-Id: <1415583785-6980-22-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.0A020202.5460186B.01D6, 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: 130 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 pm_power_off unconditionally. Register power-off handler after the ipmi system is ready, and unregister it prior to cleanup. This avoids having to check for the ready variable in the poweroff callback. Reviewed-by: Corey Minyard 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 pr_warn instead of pr_err - Call unregister_power_off_handler on exit only if not already unregistered drivers/char/ipmi/ipmi_poweroff.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index 9f2e3be..4ae2f22 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c @@ -63,9 +63,6 @@ static ipmi_user_t ipmi_user; static int ipmi_ifnum; static void (*specific_poweroff_func)(ipmi_user_t user); -/* Holds the old poweroff function so we can restore it on removal. */ -static void (*old_poweroff_func)(void); - static int set_param_ifnum(const char *val, struct kernel_param *kp) { int rv = param_set_int(val, kp); @@ -544,15 +541,17 @@ static struct poweroff_function poweroff_functions[] = { /* Called on a powerdown request. */ -static void ipmi_poweroff_function(void) +static void ipmi_poweroff_function(struct power_off_handler_block *this) { - if (!ready) - return; - /* Use run-to-completion mode, since interrupts may be off. */ specific_poweroff_func(ipmi_user); } +static struct power_off_handler_block ipmi_power_off_hb = { + .handler = ipmi_poweroff_function, + .priority = POWER_OFF_PRIORITY_HIGH, +}; + /* Wait for an IPMI interface to be installed, the first one installed will be grabbed by this code and used to perform the powerdown. */ static void ipmi_po_new_smi(int if_num, struct device *device) @@ -631,9 +630,12 @@ static void ipmi_po_new_smi(int if_num, struct device *device) printk(KERN_INFO PFX "Found a %s style poweroff function\n", poweroff_functions[i].platform_type); specific_poweroff_func = poweroff_functions[i].poweroff_func; - old_poweroff_func = pm_power_off; - pm_power_off = ipmi_poweroff_function; + ready = 1; + + rv = register_power_off_handler(&ipmi_power_off_hb); + if (rv) + pr_warn(PFX "failed to register power-off handler\n"); } static void ipmi_po_smi_gone(int if_num) @@ -644,9 +646,10 @@ static void ipmi_po_smi_gone(int if_num) if (ipmi_ifnum != if_num) return; + unregister_power_off_handler(&ipmi_power_off_hb); + ready = 0; ipmi_destroy_user(ipmi_user); - pm_power_off = old_poweroff_func; } static struct ipmi_smi_watcher smi_watcher = { @@ -733,11 +736,11 @@ static void __exit ipmi_poweroff_cleanup(void) ipmi_smi_watcher_unregister(&smi_watcher); if (ready) { + unregister_power_off_handler(&ipmi_power_off_hb); rv = ipmi_destroy_user(ipmi_user); if (rv) printk(KERN_ERR PFX "could not cleanup the IPMI" " user: 0x%x\n", rv); - pm_power_off = old_poweroff_func; } } module_exit(ipmi_poweroff_cleanup);