From nobody Thu Feb 16 11:56:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PHYLW5HLTz3q5dy; Thu, 16 Feb 2023 11:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PHYLW49J4z49kC; Thu, 16 Feb 2023 11:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BO4jPnS1Q6kTfEGu1t4BJxY6wBqHTL7JkPjYS83kzMw=; b=blhV70gGYq+c21nY3QgTW7q82Y1430pq0o433m5sSbPez6DW0Opc8r879li4DKYX8oMn/M 3AzfpKrzLRS4ZSh2S7NBE8gCBEsRTmOkjbqbkoA9274JP9INXoOG7SquoOWF4chjAutkDy EGS/9HAxFL2lTSd/sNZwT9xYuzXchZUWzYN6XSGcm+S8Am/oIUMqKgj4yT+nIqwT4YTQvg SlorADgJMYMGIipj6FlVRpL6Q7NrtPA0INt2o7k7pI8CydvBqPeq9O72weA9ZBJcU9ErZa XtbXSS9P9fkfIKabA+uKZT0U4xWfurgLxyZr7UuAHoWruExLhvJ6DX4hL6Lg8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BO4jPnS1Q6kTfEGu1t4BJxY6wBqHTL7JkPjYS83kzMw=; b=Te3cUdQNzsb63l8QtFxtwqw+x1452AwySFR7vnDN3CgqEZSUDSUb5mGlo161CyVZ5fF50S nF18z+Jedg8NNlV9xdc5k6ZqPW2MnKBPpaI11EGmvwZN73BwRj1KkKJCNEI5HcCg3wHRwZ l7myg+ASlMNnEXv66ah+mfcnJR5Zcm1ncRerz4t1HMDUy+cNisbUJXUMjYtkT8s4UowUtp 13bKioiql5SfhAbqlIdJZgZaP/wB5JhYjc9KlUBEcwzpTkj/sfNDCs7xT+aUPj9icnI+4U 45f09KWVyi368IT4Tar3l1djh4K59ogjGCnqkkScK6k5Qr2PxWsa1T1F6KB/qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548563; a=rsa-sha256; cv=none; b=HE95r5+W1UWmGhB6bNs3yYm86JHPjk9x8yx1znrWnYfWaMGd6mkCYVDjcnFfklvHF0cd0K uW24NN7+rHc/Om71seY4ESIF48CBlXZStNYg9yP2xLQzEWTulLpQLGE0TtKJG0wSokiRGq /umWfbyTf3tvwmNHeEu4oXypTTU7rJ7VamI7J8IEZSWUJ88BC6Q6Ts/1uBCTFSYbJR+elA BgvPgIh8elByzuasY9KnRqyjJLJeGFEqGxlbwrBvQCuMw2pG9LBzpb3tKlKG90w5rTJz4e ZB8nMC4d2tOS+k4AkIKpvGzd51Y3RQ9kKjiVK6T1z9VXbMEdbX/px2YcB3ocZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PHYLW37G0z133q; Thu, 16 Feb 2023 11:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31GBu33U055526; Thu, 16 Feb 2023 11:56:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBu3o2055525; Thu, 16 Feb 2023 11:56:03 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:56:03 GMT Message-Id: <202302161156.31GBu3o2055525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: a64bdffae73e - stable/13 - linuxkpi: Define `pm_suspend_target_state` in List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a64bdffae73e2c591e7dce5d7f45d02a241f13b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a64bdffae73e2c591e7dce5d7f45d02a241f13b6 commit a64bdffae73e2c591e7dce5d7f45d02a241f13b6 Author: Jean-Sébastien Pédron AuthorDate: 2023-01-20 20:13:32 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:15 +0000 linuxkpi: Define `pm_suspend_target_state` in It is set to `PM_SUSPEND_ON`. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38161 (cherry picked from commit ccd31b464568ecf5907dbecf255edf0676124735) --- sys/compat/linuxkpi/common/include/linux/suspend.h | 7 +++++++ sys/compat/linuxkpi/common/src/linux_acpi.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/suspend.h b/sys/compat/linuxkpi/common/include/linux/suspend.h index 5c15b0619bd0..8458a6f6d4c5 100644 --- a/sys/compat/linuxkpi/common/include/linux/suspend.h +++ b/sys/compat/linuxkpi/common/include/linux/suspend.h @@ -3,6 +3,13 @@ #ifndef _LINUXKPI_LINUX_SUSPEND_H_ #define _LINUXKPI_LINUX_SUSPEND_H_ +typedef int suspend_state_t; + +extern suspend_state_t pm_suspend_target_state; + +#define PM_SUSPEND_ON 0 +#define PM_SUSPEND_TO_IDLE 1 + static inline int pm_suspend_via_firmware() { diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index 5eb60941abac..e092481ff979 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -40,6 +40,7 @@ #include #include +#include #include #include @@ -58,6 +59,8 @@ _Static_assert(LINUX_ACPI_TAGS <= LINUX_NOTIFY_TAGS, #ifdef DEV_ACPI +suspend_state_t pm_suspend_target_state = PM_SUSPEND_ON; + static uint32_t linux_acpi_target_sleep_state = ACPI_STATE_S0; static eventhandler_tag resume_tag;