From patchwork Tue Oct 7 05:28:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 397015 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 590D21400AA for ; Tue, 7 Oct 2014 16:30:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753772AbaJGFac (ORCPT ); Tue, 7 Oct 2014 01:30:32 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:40855 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753780AbaJGFaV (ORCPT ); Tue, 7 Oct 2014 01:30:21 -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=lG6odH8+KB6jTY943cOcYusvv379O7q+bc5zrpIo7KU=; b=k2AHqCL5Gw3L1f3tsTaYpCREHxivQ6EASfzeo4cl77l08p61cepHDw9Q+CAi90jyrMsLYG2PQvT0w4/HRKqoS1zqNjM+RFY6ZEzfS6951MnRYueL46W0RmZuclMPCUFE4gFERcnxhf6NKlV2bWC3+gpULRHBqexDMn2CMmNs3x0=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNLo-002em1-SY for linux-tegra@vger.kernel.org; Tue, 07 Oct 2014 05:30:21 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:32929 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XbNLR-002caK-8D; Tue, 07 Oct 2014 05:29:57 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: adi-buildroot-devel@lists.sourceforge.net, devel@driverdev.osuosl.org, devicetree@vger.kernel.org, lguest@lists.ozlabs.org, linux-acpi@vger.kernel.org, linux-alpha@vger.kernel.org, linux-am33-list@redhat.com, linux-cris-kernel@axis.com, linux-efi@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-m32r-ja@ml.linux-m32r.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-tegra@vger.kernel.org, linux-xtensa@linux-xtensa.org, openipmi-developer@lists.sourceforge.net, user-mode-linux-devel@lists.sourceforge.net, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linux-pm@vger.kernel.org, linux-sh@vger.kernel.org, xen-devel@lists.xenproject.org, Guenter Roeck , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: [PATCH 26/44] x86: iris: Register with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:28 -0700 Message-Id: <1412659726-29957-27-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412659726-29957-1-git-send-email-linux@roeck-us.net> References: <1412659726-29957-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=0.3 X-Spam-Checker-Version: spamc_ctasd client on localost X-Spam-Level: X-Spam-Status: No, score=0.0 required=50.0 tests=SpamClass_Unknown, VirusClass_Unknown autolearn=disabled version=1.0.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020202.54337A6D.0052, 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: X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 557 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-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Register with kernel poweroff handler instead of setting pm_power_off directly. Register with high priority value of 192 to reflect that the original code overwrites existing poweroff handlers. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Signed-off-by: Guenter Roeck --- arch/x86/platform/iris/iris.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c index 4d171e8..662c4e8 100644 --- a/arch/x86/platform/iris/iris.c +++ b/arch/x86/platform/iris/iris.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -47,15 +48,21 @@ 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 int iris_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { outb(IRIS_GIO_PULSE, IRIS_GIO_OUTPUT); msleep(850); outb(IRIS_GIO_REST, IRIS_GIO_OUTPUT); + + return NOTIFY_DONE; } +static struct notifier_block iris_poweroff_nb = { + .notifier_call = iris_power_off, + .priority = 192, +}; + /* * 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 +72,26 @@ 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 = register_poweroff_handler(&iris_poweroff_nb); + if (ret) { + dev_err(&pdev->dev, "Failed to register poweroff 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; + unregister_poweroff_handler(&iris_poweroff_nb); printk(KERN_INFO "Iris power_off handler uninstalled.\n"); return 0; }