From patchwork Wed Mar 21 11:30:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 132203 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp2020058ljb; Wed, 21 Mar 2018 04:30:41 -0700 (PDT) X-Google-Smtp-Source: AG47ELs/CCFvGxNQsqIRUqCjR47tyRSG3gMobQhdEgVfps5PA/lkmwDtHe/Jk6BmY5Y6RltjzGvG X-Received: by 2002:a17:902:b683:: with SMTP id c3-v6mr19942111pls.154.1521631840975; Wed, 21 Mar 2018 04:30:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521631840; cv=none; d=google.com; s=arc-20160816; b=ZAFJUgX9k2R9d/ftlg2oKEJkYFMQQ7vsamWsg0DA7ZDX+TPRPuNexh3tpycUZsSb2Y lUfgLIyxEK658zxAxL9ZsRqR/r7NBxvkYohcK02CKTBbM3izeSv/19ovxUPGa5gNqwRV XsCw+iIygZxkpDUE42MFsfCRC3AkKGsvtT1ZgOhttc4vZ7wLOY8v37JsSlQDPSlg1aHZ qCl1V5JiO1Ew5im109vsXxoqlEpgrb2YtrkoY9smaz+V6PImjkJdrZByscNNPF5lZZ1r /LQIr+jTfsP3zOyBnBsQB7QQPnstTmVPiiuQ3nj5cYNj+hYfnq24T/V/8PDiDHNeuAh4 fgtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=jM9D4xDf3spPp4o71iKxwW5ghAFrm+N5XyNkz4k61lA=; b=pIrh2XW0mvItvKGGkbydlEhBkMrFXMT6yyg36xMAxy9Bq9MP+ztb03Sj98DX+iu9T3 I1Dk/iwUSC2wU7RP31rF8st1kG4oiBE7ZccZLaHyplNAcBJ96yMRJUc6a5V4b5dmT5Pq ppIbqMsaLPCcLY10K3vTPk/YNnovShn0o7jug1BljNZ37gQcC3rxegV7KatOSreJ6Jia OAtPz681b0eczRxKx6yzR4acUHq7Hf77i79kSxL0okdUA2+HEHPV0N3xUmvZrOpdn5MF 0he1kzKIqsGRpvtvACmXWPl9ihNv6nArAwo8A8BTTUpFaGnAVexyZAoLxj1FhH3/K3pu i7WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fggsfI24; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s9si2669450pgc.202.2018.03.21.04.30.40; Wed, 21 Mar 2018 04:30:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fggsfI24; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797AbeCULaj (ORCPT + 11 others); Wed, 21 Mar 2018 07:30:39 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:38175 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752091AbeCULaf (ORCPT ); Wed, 21 Mar 2018 07:30:35 -0400 Received: by mail-pl0-f67.google.com with SMTP id m22-v6so2933743pls.5 for ; Wed, 21 Mar 2018 04:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=jM9D4xDf3spPp4o71iKxwW5ghAFrm+N5XyNkz4k61lA=; b=fggsfI24DUtkWuNzkFHLwADZCa8IGkh2KnK3A2pKemeOGlxp2oH7lBAGdaDLOfhUml NS7RNYJKPsgW043l0CHnPxVTjO1ViuTnic8ZJaYoLWpQ7pu4uNAW7HdjiuRrJEJOr5gC 1uj6Ze0QGIARdU39CFSukvLK3fvkPjwaeskNc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jM9D4xDf3spPp4o71iKxwW5ghAFrm+N5XyNkz4k61lA=; b=JKAmarjhI1SWkrScLyDEDZUk6xbZk08NzvouLVPEN7V/UxH1TWFZXrZepUOnt08hzP 1FMTG0yHThneiitx4Q3LyFkheLkWjzWxIMJAqYADmPV2FSGLTEdj5OKVK5JGwfhG/rJS goutYSoPe41yYYbYhABYpBY8rokMn7s5oGfSCtk4AJvzUkHhnfgaoO/0OfDJB22Yuj1T 4YV25tXGVAZBm3agk1tD+AtSOH2dIJmGOMvQSmV83VOApkcvmivudy0omR/HAgFEe5jE F9GUMlKC2ed8dGo9HejOQfbNslSzNFbd41oozAZDn5sL8zxlIAkND4ZiwXlFLhbjdyQD e3nA== X-Gm-Message-State: AElRT7ELoZZnqVYK7yq89ZxVEDHYd0/S7FOhF/tWgWjZTpsZ14ZwvPBe 8NrLvTL0H8CeoVJmCbK5AwsjWA== X-Received: by 2002:a17:902:2be4:: with SMTP id l91-v6mr15727306plb.102.1521631835121; Wed, 21 Mar 2018 04:30:35 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id a9sm8419989pfe.147.2018.03.21.04.30.31 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Mar 2018 04:30:34 -0700 (PDT) From: Baolin Wang To: rjw@rjwysocki.net, lenb@kernel.org, pavel@ucw.cz Cc: andrew.smirnov@gmail.com, akpm@linux-foundation.org, broonie@kernel.org, arnd@arndb.de, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, baolin.wang@linaro.org Subject: [PATCH 1/2] ACPI / PM: Use register_reboot_notifier() instead of pm_power_off_prepare Date: Wed, 21 Mar 2018 19:30:16 +0800 Message-Id: <7ff55372818461feed4b0550d5f88edce2cc7d41.1521631678.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org We can register one notifier through register_reboot_notifier() function to prepare to power off the system, then we can remove the 'pm_power_off_prepare' hook in following patch. Signed-off-by: Baolin Wang --- Note: Please help to review carefully, since I have no platform to test this conversion. I saw there is another reboot notifier in this driver, I am not sure the orders between them. I can change the priority of notifier to keep their orders if it is necessary. --- drivers/acpi/sleep.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) -- 1.7.9.5 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 46cde091..b3de894 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -1229,14 +1229,24 @@ static void acpi_sleep_hibernate_setup(void) static inline void acpi_sleep_hibernate_setup(void) {} #endif /* !CONFIG_HIBERNATION */ -static void acpi_power_off_prepare(void) +static int acpi_reboot_notify(struct notifier_block *this, unsigned long code, + void *x) { - /* Prepare to power off the system */ - acpi_sleep_prepare(ACPI_STATE_S5); - acpi_disable_all_gpes(); - acpi_os_wait_events_complete(); + if (code == SYSTEM_POWER_OFF) { + /* Prepare to power off the system */ + acpi_sleep_prepare(ACPI_STATE_S5); + acpi_disable_all_gpes(); + acpi_os_wait_events_complete(); + } + + return NOTIFY_DONE; } +static struct notifier_block acpi_reboot_notifier = { + .notifier_call = acpi_reboot_notify, + .priority = 0, +}; + static void acpi_power_off(void) { /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */ @@ -1261,7 +1271,7 @@ int __init acpi_sleep_init(void) if (acpi_sleep_state_supported(ACPI_STATE_S5)) { sleep_states[ACPI_STATE_S5] = 1; - pm_power_off_prepare = acpi_power_off_prepare; + register_reboot_notifier(&acpi_reboot_notifier); pm_power_off = acpi_power_off; } else { acpi_no_s5 = true;