From nobody Wed Jan 18 16:24:51 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 4Nxrh430CXz2yJNx; Wed, 18 Jan 2023 16:24:52 +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 4Nxrh40R72z3Dm9; Wed, 18 Jan 2023 16:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059092; 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=Zo1FVrFZ1dS65A4hnbMRtoZ8btNednOuLaJSwD/ZR0U=; b=qpIlurthlibhLZgp/kf+BMJmecJUoVQM6juZDI8z7IhTFURsmp6C7JfOgziih3Mzbohpg5 fUApfYqd2znlnWpNnDXCspanZ09dNeq3PrLftw7aYnxvWkO9D1PY1L/Tf/shzxOpVaHsQV sTvjjjO1A2jDIxDBHWKJoXWRyWL3box5b/4npRCIbTXHWxut47Mw3zpjFsWVpzrJd/IyZy R7afzRTS9vdJ0eVJtHapXLfV9rqC8Mm+/FGlN+XfhINXJJQgiRg93aSWxZ89VLCkygZAeT e3SjizuLHEVF188z69VhDSEbnjCv/DOnoDeLLJe8WllQqv73XBzTwmLoU0/TeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059092; 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=Zo1FVrFZ1dS65A4hnbMRtoZ8btNednOuLaJSwD/ZR0U=; b=HWP+ZTO5lePKQBXBxSUFmux+SoJcYW4fmU5Qt6VwW6zBjUailJF8pz1C8oggvk4gNBoKzl UAPAaXLGfd/+LIFFf0U+H84Wb0/K+kEf2dxf0DJzo2RurG+EY26HNfAsu7GlB14S/o8Eir Ivn7ulFtNzQq0Z0wSWA3yY0+kVhu/qOUr40jaFE8YlyA5dc59m7T4mSrpAcdRT5mpF5Ivb KkjIGb5yVFEmEVTE5XfCoGt1XSlgNDiW6IFgE2QKZ/IRks17x/24+q8kMHKTrZJ46fuyVx arf1pTYelST/2OEhKHlTyUVxW8KCjEtcgb+YLR65jc3ebZb4FSfbAMlxpxieJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059092; a=rsa-sha256; cv=none; b=snrxYUwIlhnDnP6SzYhM0ydUPyXeDdO8ViqY6rZbgL8xlOVNZ0kxQ/crZ8jR4hw8I4+/l3 /JHVnfT/LC+KvhqUjQgJVx7hjnZ9PVL1qw7fBqpMVsiIsrGzphS2H/cHBFkP+fL43NSPay rM0rtCG8HMdjst4ufhjA8QQVn+uD+upAB7LcslRm19lT3928YHNImIRlzOZ8UHIfhuzJXA Fjr7aw17dsBPff54eDSNivPtL3j7E0uv+iJMn4QKRPOViymXhTVbGV5z3A8pMIyO7uh10U xRByFbOo+I4uf7CDCivXtJqy8eCW5OgsmoD0ZJ+X9OqehTWQia7X8AYtMjiaGg== 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 4Nxrh36QQtzHZZ; Wed, 18 Jan 2023 16:24:51 +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 30IGOpe7037987; Wed, 18 Jan 2023 16:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGOp4M037986; Wed, 18 Jan 2023 16:24:51 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:24:51 GMT Message-Id: <202301181624.30IGOp4M037986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: aca218556485 - stable/13 - LinuxKPI: pm.h add pm_sleep_ptr and DEFINE_SIMPLE_DEV_PM_OPS 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aca2185564859f967943058925ccc71975df911c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=aca2185564859f967943058925ccc71975df911c commit aca2185564859f967943058925ccc71975df911c Author: Bjoern A. Zeeb AuthorDate: 2022-11-28 22:31:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:24:27 +0000 LinuxKPI: pm.h add pm_sleep_ptr and DEFINE_SIMPLE_DEV_PM_OPS Extend pm.h by pm_sleep_ptr and DEFINE_SIMPLE_DEV_PM_OPS(). For the moment this duplicates some parts (as can be seen in the earlier review I tried to simplify bits but given our implementation this was easier in the end). While here and cleanup the SIMPLE_DEV_PM_OPS() bits (white-space only). Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D37527 (cherry picked from commit 4052b0e4b218f916b1f491a5ec9e41d38029215b) --- sys/compat/linuxkpi/common/include/linux/pm.h | 28 +++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pm.h b/sys/compat/linuxkpi/common/include/linux/pm.h index d67cebb9764a..eb3316088787 100644 --- a/sys/compat/linuxkpi/common/include/linux/pm.h +++ b/sys/compat/linuxkpi/common/include/linux/pm.h @@ -47,20 +47,36 @@ struct dev_pm_domain { #define PM_EVENT_FREEZE 0x0001 #define PM_EVENT_SUSPEND 0x0002 +#define pm_sleep_ptr(_p) \ + IS_ENABLED(CONFIG_PM_SLEEP) ? (_p) : NULL + #ifdef CONFIG_PM_SLEEP #define SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc) \ const struct dev_pm_ops _name = { \ - .suspend = _suspendfunc, \ - .resume = _resumefunc, \ - .freeze = _suspendfunc, \ - .thaw = _resumefunc, \ - .poweroff = _suspendfunc, \ - .restore = _resumefunc, \ + .suspend = _suspendfunc, \ + .resume = _resumefunc, \ + .freeze = _suspendfunc, \ + .thaw = _resumefunc, \ + .poweroff = _suspendfunc, \ + .restore = _resumefunc, \ +} + +#define DEFINE_SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc) \ +const struct dev_pm_ops _name = { \ + .suspend = _suspendfunc, \ + .resume = _resumefunc, \ + .freeze = _suspendfunc, \ + .thaw = _resumefunc, \ + .poweroff = _suspendfunc, \ + .restore = _resumefunc, \ } #else #define SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc) \ const struct dev_pm_ops _name = { \ } +#define DEFINE_SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc) \ +const struct dev_pm_ops _name = { \ +} #endif #endif /* _LINUXKPI_LINUX_PM_H */