From nobody Thu Aug 01 22:27:16 2024 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 4WZk9J4rGFz5RZ6l; Thu, 01 Aug 2024 22:27:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZk9J4K4rz4YGL; Thu, 1 Aug 2024 22:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551236; 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=cL5mD39Qwp+RiObkHgQb/z3c+Q4lM5LNd5CgCYBSbVA=; b=yow694EUW7iD2welhv3KFtBg1ygBydCbUeR8IHQjnuzKcxsrWqkrt2uMYiXgsjyvPixOtQ lUQvkqcBsveqsDxdKpPLwMUVSxnTE0IhBQLm22BbUs3ArYFZgNE6reDIEQjiRFCCEr0ekv JhWnncyQHmpWyKaWEGUQDD6i4dsS9H1GV8xZhYabuqA/YnuG7LW3EqIX1xD7dmyCl8azbG tESMzvzL+k0bhYPIhegZ81bXmInOSH7ULZ7Hs+cRhu0DlExEWTfAvxuy3ANkRxhz2mh84u jyKuXJQAH641vqJo6Tl8dNoj/LqLMfBBjCrRxMn9QLSNJyH764HMI9o0P19KgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722551236; a=rsa-sha256; cv=none; b=jPKkUfi20zYObIWZzEG38rL8nTUbqPxOVv28qiEMOM8cVCS5b2x/pESn2gbK63k9+V6gyR F3iJewzTR66ZEVv1FvTPOj5RDIye/Fa5sLNljjZcTy9yqf+o7Pz+z/sMSRoO3udt8Q3zp9 +XVi6TNW+gX10o2+3GkUnu0hqv5lqoEPYM77qVRQthIL8KCPa9vRQuafBJ2dUhDkUpk9aP tgr0FOUdSui0ncgJr17ftx5vgND8f/OBtgtNI4XRZe93Nq1uD8xZ6XhtFm4uERc6nDUfBO NnT1RigiE9hXxLHu3kNfJ5UR2Gl8pqMMUsD1bgC/YjJoMAi1JPXkARD1Tr53cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551236; 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=cL5mD39Qwp+RiObkHgQb/z3c+Q4lM5LNd5CgCYBSbVA=; b=oTKes1oTlG6Cv1KaQwckbzpHFTm65XUM0F35GSVC1XcWJl5UKXRH+W0t7bOefM+ScuqPYn GZxq7JQGQQP8ZaLw+4zlN7UphOdM04L4Ro98Iqw7lECp68wwqSO/duM6E4R9Sv4qkmgOZv O0ipR/D4q+soiUJYB/l0f/G6PEqk1xWSjG+poBhPHqZ3g0xQYzwQG5yUB/e/kau2epVBk7 oV/zKC6EKuF8ASTdD81m/hzvY7wywf6CLmXTFdZ0l+GvqgW7lhVlhentvVmR/f1iKgMgpe qeiPhHayYhFHG7C7B/sFc4uV2ePEHuQqQvM2aMo1yvmOaiZFoxXAj4CX93u+7w== 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 4WZk9J3wKLz12Wd; Thu, 1 Aug 2024 22:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471MRGNv026673; Thu, 1 Aug 2024 22:27:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471MRG3h026670; Thu, 1 Aug 2024 22:27:16 GMT (envelope-from git) Date: Thu, 1 Aug 2024 22:27:16 GMT Message-Id: <202408012227.471MRG3h026670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 73b587e2ee99 - stable/14 - LinuxKPI: Set suspend type on syspend/resume cycle enter 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73b587e2ee993512f37fc6ec754ab59d7357ea41 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=73b587e2ee993512f37fc6ec754ab59d7357ea41 commit 73b587e2ee993512f37fc6ec754ab59d7357ea41 Author: Vladimir Kondratyev AuthorDate: 2024-04-08 06:47:41 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-08-01 21:09:37 +0000 LinuxKPI: Set suspend type on syspend/resume cycle enter Recent amdgpu depends on pm_suspend_target_state value to separate S3 and S0ix support. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu (in bugzilla) MFC after: 1 week (cherry picked from commit 8ace984e477b0ee1fcc317752603ec4fe9c7f636) --- sys/compat/linuxkpi/common/src/linux_acpi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index e7b6854ecf13..60ec838e9da7 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -109,12 +109,14 @@ linux_handle_power_suspend_event(void *arg __unused) * TODO: Make acpi_sleep_event consistent */ linux_acpi_target_sleep_state = ACPI_STATE_S3; + pm_suspend_target_state = PM_SUSPEND_MEM; } static void linux_handle_power_resume_event(void *arg __unused) { linux_acpi_target_sleep_state = ACPI_STATE_S0; + pm_suspend_target_state = PM_SUSPEND_ON; } static void