From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72D04366; Sat, 6 Sep 2025 14:37:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757169422; cv=none; b=mbjCWetI2V4kabpYslXsc8dU1oiZpO4B+PTGRMo7D8cTREmpVT4IzJC4AfLGvbqAI2GNcQTmcAVjIdHhddHC93IHy4gjZSfKUj7V5BYQl4rrX5ueSMYTkQSn+SGylq3Je8bfEZ3O1ESUntgMsI55u19feVt3tLJX+6pj6N8kIqo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757169422; c=relaxed/simple; bh=1yzzBCqlyrV/M7U0rRlgfSg4HY3oAX/OyoUrUL1iMCM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OzVvWVyHUqNLXt6dm6etRQCNgE1wlCQAN5WiZYPM/WNVjG3pGZOVCVtI30z1KvlM9UyH8FQ79JVsyb4T1LUsprZ3FpBhur79/h/PgiKsZWK14p/NcoIlRClhwvAO8//u51WVfzNL9gZ0dfAs7b4/ETCeb1nJsGhjxAoYMoo2YYc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sPZuoQkl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sPZuoQkl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF4D6C4CEFA; Sat, 6 Sep 2025 14:36:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757169421; bh=1yzzBCqlyrV/M7U0rRlgfSg4HY3oAX/OyoUrUL1iMCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPZuoQklQPE9CLbJnoDm74j4QsM+ItIV3/JlrN9f5oamId0FWVfA38E5YTZQTVyhc WeOgwMDk47pFtuwJdgnLBmpMc4rQWz/jqwcAZr5RkYr6zioHnO6mIIpo44RVt4fZId hQs+IuH4Cwt2FHq+Kw8hM4rAOogQxn+KZEHNU+zhxVG6qkLz4YBNDHrHeuQZt15A2T tUE562pbAKOJ1BDM0gd+GEysftCyuwhaqK4pGYk4btmn+VBbt2hzC23tZ8iX2e8uLI SZU0x83KnwcYYz3YZDwNJw+nHTWj0mCjo5l5+c1/tStcC8Z3jsgPBFms/dUB8ndta9 LjnL2nD0rhUAg== From: "Mario Limonciello (AMD)" To: "Rafael J . Wysocki" , Greg Kroah-Hartman , Danilo Krummrich , Bjorn Helgaas Cc: Pavel Machek , Len Brown , =?UTF-8?q?Christian=20K=C3=B6nig?= , "James E . J . Bottomley" , "Martin K . Petersen" , Steven Rostedt , linux-pm@vger.kernel.org (open list:HIBERNATION (aka Software Suspend, aka swsusp)), amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-scsi@vger.kernel.org (open list:SCSI SUBSYSTEM), linux-usb@vger.kernel.org (open list:USB SUBSYSTEM), linux-trace-kernel@vger.kernel.org (open list:TRACING), AceLan Kao , Kai-Heng Feng , Mark Pearson , =?UTF-8?q?Merthan=20Karaka=C5=9F?= , Eric Naim , "Mario Limonciello (AMD)" Subject: [PATCH v6 RESEND 01/11] PM: Introduce new PMSG_POWEROFF event Date: Sat, 6 Sep 2025 09:36:32 -0500 Message-ID: <20250906143642.2590808-2-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250906143642.2590808-1-superm1@kernel.org> References: <20250906143642.2590808-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit PMSG_POWEROFF will be used for the PM core to allow differentiating between an S4 or S5 shutdown sequence when re-using callbacks. This event should not have wakeups enabled so update PMSG_NO_WAKEUP() to match it as well. Tested-by: Eric Naim Signed-off-by: Mario Limonciello (AMD) --- drivers/base/power/main.c | 7 +++++++ include/linux/pm.h | 5 ++++- include/trace/events/power.h | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 2ea6e05e6ec90..86661c94e8cef 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -99,6 +99,8 @@ static const char *pm_verb(int event) return "restore"; case PM_EVENT_RECOVER: return "recover"; + case PM_EVENT_POWEROFF: + return "poweroff"; default: return "(unknown PM event)"; } @@ -369,6 +371,7 @@ static pm_callback_t pm_op(const struct dev_pm_ops *ops, pm_message_t state) case PM_EVENT_FREEZE: case PM_EVENT_QUIESCE: return ops->freeze; + case PM_EVENT_POWEROFF: case PM_EVENT_HIBERNATE: return ops->poweroff; case PM_EVENT_THAW: @@ -403,6 +406,7 @@ static pm_callback_t pm_late_early_op(const struct dev_pm_ops *ops, case PM_EVENT_FREEZE: case PM_EVENT_QUIESCE: return ops->freeze_late; + case PM_EVENT_POWEROFF: case PM_EVENT_HIBERNATE: return ops->poweroff_late; case PM_EVENT_THAW: @@ -437,6 +441,7 @@ static pm_callback_t pm_noirq_op(const struct dev_pm_ops *ops, pm_message_t stat case PM_EVENT_FREEZE: case PM_EVENT_QUIESCE: return ops->freeze_noirq; + case PM_EVENT_POWEROFF: case PM_EVENT_HIBERNATE: return ops->poweroff_noirq; case PM_EVENT_THAW: @@ -1370,6 +1375,8 @@ static pm_message_t resume_event(pm_message_t sleep_state) return PMSG_RECOVER; case PM_EVENT_HIBERNATE: return PMSG_RESTORE; + case PM_EVENT_POWEROFF: + return PMSG_ON; } return PMSG_ON; } diff --git a/include/linux/pm.h b/include/linux/pm.h index cc7b2dc28574c..892bd93f13dad 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -507,6 +507,7 @@ const struct dev_pm_ops name = { \ * RECOVER Creation of a hibernation image or restoration of the main * memory contents from a hibernation image has failed, call * ->thaw() and ->complete() for all devices. + * POWEROFF System will poweroff, call ->poweroff() for all devices. * * The following PM_EVENT_ messages are defined for internal use by * kernel subsystems. They are never issued by the PM core. @@ -537,6 +538,7 @@ const struct dev_pm_ops name = { \ #define PM_EVENT_USER 0x0100 #define PM_EVENT_REMOTE 0x0200 #define PM_EVENT_AUTO 0x0400 +#define PM_EVENT_POWEROFF 0x0800 #define PM_EVENT_SLEEP (PM_EVENT_SUSPEND | PM_EVENT_HIBERNATE) #define PM_EVENT_USER_SUSPEND (PM_EVENT_USER | PM_EVENT_SUSPEND) @@ -551,6 +553,7 @@ const struct dev_pm_ops name = { \ #define PMSG_QUIESCE ((struct pm_message){ .event = PM_EVENT_QUIESCE, }) #define PMSG_SUSPEND ((struct pm_message){ .event = PM_EVENT_SUSPEND, }) #define PMSG_HIBERNATE ((struct pm_message){ .event = PM_EVENT_HIBERNATE, }) +#define PMSG_POWEROFF ((struct pm_message){ .event = PM_EVENT_POWEROFF, }) #define PMSG_RESUME ((struct pm_message){ .event = PM_EVENT_RESUME, }) #define PMSG_THAW ((struct pm_message){ .event = PM_EVENT_THAW, }) #define PMSG_RESTORE ((struct pm_message){ .event = PM_EVENT_RESTORE, }) @@ -568,7 +571,7 @@ const struct dev_pm_ops name = { \ #define PMSG_IS_AUTO(msg) (((msg).event & PM_EVENT_AUTO) != 0) #define PMSG_NO_WAKEUP(msg) (((msg).event & \ - (PM_EVENT_FREEZE | PM_EVENT_QUIESCE)) != 0) + (PM_EVENT_FREEZE | PM_EVENT_QUIESCE | PM_EVENT_POWEROFF)) != 0) /* * Device run-time power management status. * diff --git a/include/trace/events/power.h b/include/trace/events/power.h index 82904291c2b81..370f8df2fdb4b 100644 --- a/include/trace/events/power.h +++ b/include/trace/events/power.h @@ -179,7 +179,8 @@ TRACE_EVENT(pstate_sample, { PM_EVENT_HIBERNATE, "hibernate" }, \ { PM_EVENT_THAW, "thaw" }, \ { PM_EVENT_RESTORE, "restore" }, \ - { PM_EVENT_RECOVER, "recover" }) + { PM_EVENT_RECOVER, "recover" }, \ + { PM_EVENT_POWEROFF, "poweroff" }) DEFINE_EVENT(cpu, cpu_frequency, -- 2.43.0