From nobody Tue Nov 29 10:39:11 2022 X-Original-To: dev-commits-src-all@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 4NLzNJ0CgTz4jSqW; Tue, 29 Nov 2022 10:39:12 +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 4NLzNH6vH0z3tPS; Tue, 29 Nov 2022 10:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669718352; 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=80UKa0kNubu5H2wDPzrwuKCTgPa5NGZNhkUWoQKAxw0=; b=JIUuV0kITt73Mkjq/Tqlz7bgCDdsdCfoWnqpDfcHMGBm538G+vqjdENFOeepH+/3vz6sGx al+p8A1x31ZFv51d+qbEHdzD9jBvEV94bqDBsekUVB9XAGYGmCGkpj06TZm2mDXgMeLYkm vloc8T4WfrZ/JOA+NpYLHE795T2erfoLmZc2afoAMpzSZsqJ9PynnhdHtQ71FhKrQyRg/e S5oBU8FBDf+a7kI7KsOFNAVoqMixWTyRlUuoZEooUrP9JrbKFijrw94Yw4chC0X/2j1r+g F6U3XlTqUv64+bTFqigLDbaeVOH5ZdigI5zEIjr8wcLiNuj66RLChcHuxWFWQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669718352; 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=80UKa0kNubu5H2wDPzrwuKCTgPa5NGZNhkUWoQKAxw0=; b=qt+HhBuxSGVfSyAqyuPThKyEVCrP4hWMFejCTWx1q4zqzS2vhXyfmGkkEs0hjHEIHvA0Oi 182bXC/Bg0z2jkAUvpB6du8h8VQoJGpHvQ+bzD7J/QGYO89ZV1otjEhKe0Kw9VT8n7vQyG HrfKy+bLWLRsY1kwHaDM+ZvBiGqnjoMrm1aku+C6J60gd8Psh80JH7O2gvGQA8BlLHZiR3 1bIy2u6Y3QLli++m5f8f4SKvOHoQrXmrkXa829t/4rKEFGgOKn+h6V/nkTBOGxNmyMe6EI TtgsNEtFk5JJFx+w19UwUXhnN0UJdC0OINvKiQaGEBu23z+/bWHuJygl1lIbNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669718352; a=rsa-sha256; cv=none; b=iKkJ31jUsoCHGCZJyZeCuGEzZvrQGtIWt21iuSju7hnCwWVkeYaD7OLxIGkxJUzdo5khK3 bgo0WJ4IvkduMcjdINLGMgKuioPmZBfGao7Hl69JANMSmyU9qVSQIGtYGh4QQsBJtvD6QQ ufGCkiIxLgESz3BlerDGdCpQZdipiIhhgvp1lcIeWIXXQyGYuFhuamMpTlvVRlh1ykeWV2 sGf3RFib5xcCtjojmoL5RXHNmf0h62ihlPJQW1aDbviY0Z3VUuuPnEUp8TBPg3QIwtMqur pkFZQsb8sg+xURTnR2sRle6NgTVOCEPgn2RVPRNd+C9Fumox2f3nS1L5Wd9cGA== 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 4NLzNH60JJzFB9; Tue, 29 Nov 2022 10:39:11 +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 2ATAdBQE045171; Tue, 29 Nov 2022 10:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATAdBqm045170; Tue, 29 Nov 2022 10:39:11 GMT (envelope-from git) Date: Tue, 29 Nov 2022 10:39:11 GMT Message-Id: <202211291039.2ATAdBqm045170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 5a612b440928 - stable/13 - LinuxKPI: Add pci_power querying for drm-kmod List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a612b4409286d2dad5d4b482fca6ccbd8c43186 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5a612b4409286d2dad5d4b482fca6ccbd8c43186 commit 5a612b4409286d2dad5d4b482fca6ccbd8c43186 Author: Jake Freeland AuthorDate: 2022-10-06 08:15:41 +0000 Commit: Emmanuel Vadot CommitDate: 2022-11-29 10:10:47 +0000 LinuxKPI: Add pci_power querying for drm-kmod Adds a few struct members and a function to get i915_runtime_pm_status() to compile in drm-kmod. Differential Revision: https://reviews.freebsd.org/D36749 Sponsored by: Google, Inc. (GSoC 2022) (cherry picked from commit 4cb3cb2de2065bccbab65b0139c1be65f1da3fdf) --- sys/compat/linuxkpi/common/include/linux/device.h | 2 ++ sys/compat/linuxkpi/common/include/linux/pci.h | 14 ++++++++++++++ sys/compat/linuxkpi/common/include/linux/pm.h | 6 ++++++ sys/compat/linuxkpi/common/src/linux_pci.c | 4 ++++ 4 files changed, 26 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 6c76836c4d94..afb784881b50 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -127,6 +127,8 @@ struct device { spinlock_t devres_lock; struct list_head devres_head; + + struct dev_pm_info power; }; extern struct device linux_root_device; diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 79999c3912f7..43517d40b0a7 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -204,6 +204,8 @@ typedef int pci_power_t; #define PCI_POWER_ERROR PCI_POWERSTATE_UNKNOWN +extern const char *pci_power_names[6]; + #define PCI_ERR_ROOT_COMMAND PCIR_AER_ROOTERR_CMD #define PCI_ERR_ROOT_ERR_SRC PCIR_AER_COR_SOURCE_ID @@ -307,6 +309,7 @@ struct pci_dev { struct list_head links; struct pci_driver *pdrv; struct pci_bus *bus; + pci_power_t current_state; uint16_t device; uint16_t vendor; uint16_t subsystem_vendor; @@ -1600,6 +1603,17 @@ pci_ignore_hotplug(struct pci_dev *pdev) { } +static inline const char * +pci_power_name(pci_power_t state) +{ + int pstate = state + 1; + + if (pstate >= 0 && pstate < nitems(pci_power_names)) + return (pci_power_names[pstate]); + else + return (pci_power_names[0]); +} + static inline int pcie_get_readrq(struct pci_dev *dev) { diff --git a/sys/compat/linuxkpi/common/include/linux/pm.h b/sys/compat/linuxkpi/common/include/linux/pm.h index d67cebb9764a..d054a95f17a3 100644 --- a/sys/compat/linuxkpi/common/include/linux/pm.h +++ b/sys/compat/linuxkpi/common/include/linux/pm.h @@ -33,6 +33,8 @@ #ifndef _LINUXKPI_LINUX_PM_H #define _LINUXKPI_LINUX_PM_H +#include + /* Needed but breaks linux_usb.c */ /* #include */ /* #include */ @@ -44,6 +46,10 @@ typedef struct pm_message { struct dev_pm_domain { }; +struct dev_pm_info { + atomic_t usage_count; +}; + #define PM_EVENT_FREEZE 0x0001 #define PM_EVENT_SUSPEND 0x0002 diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index b0820c9b2c3e..f71481583238 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -117,6 +117,10 @@ static device_method_t pci_methods[] = { DEVMETHOD_END }; +const char *pci_power_names[] = { + "UNKNOWN", "D0", "D1", "D2", "D3hot", "D3cold" +}; + struct linux_dma_priv { uint64_t dma_mask; bus_dma_tag_t dmat;