From nobody Thu Dec 15 09:55:54 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 4NXnfy2cD5z4jj7T; Thu, 15 Dec 2022 09:55:54 +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 4NXnfy21k1z4DsJ; Thu, 15 Dec 2022 09:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671098154; 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=UF4p6n/FP7NOUpoXi0GW3g5/LX87UuASYJf2t5ZkcWU=; b=UOvl1wkTb8U7PkSVQkAs9i8FAvHRG0tnnkrynsE27Od9vPmQsvGBi/eEVKBh1ZxngUIesg 8df2Na6vm2GgKKZD+SJTpoEqBTgIoJaVfxeM0VW0TYc4vLSZQv9nX7ELMWK0ZTxssz1mcq AJD9+XBSOAdpCSA5GYfxhJG70NpbcZzs4L8ZnYuBXGReCgdA/5/TWNonCAhagMw1Bq6j2R 4ETc3EquZXIQF6pipqEBJYhsygyU+/QchMEYkdpuIJ5I5OT6z7VNeHcplA5trGcee1xWq0 GKXrqr9Xl2q1YUMP26hEx+2NoZ1XOzYsVYKNG/b+qHdoF5xK0jG/2f6lsa2lGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671098154; 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=UF4p6n/FP7NOUpoXi0GW3g5/LX87UuASYJf2t5ZkcWU=; b=F97KuTCdLI9MRZJv0b0Hnnp1LEPojtei0sr796LF12AWcyaBWrF3PS3R1QFXv5OX15KLk2 Gficqr76L2jozcehGPwk7L9PpORGVxPmvSRdzh0QtlW0Gr+gIjPuYc+0vAWS1qvSengJcg +xgfSoPfqYSzOD1F+1Vz7LR7xvTmAUBxuMkPdq7lr9qDiS6nPDL7/UYd1DbO9nilEr+b4r XHYvdzhUPMEWQ3NORVXqjPQwBb8yREmx/mEBFUcxzYTf/eyY5Ui4/bJBSTt5OA0v2KsSeD llpVXMdrCCchfYBBgPzrOq7STP9J69neDDLVEafb6EwacZ9XFO1hFLN3xw7lzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671098154; a=rsa-sha256; cv=none; b=sffcUiTABKuX6PcAlEz5NJTnQjzNAmOFq78qGxhhkn481LOoT6ywXIJQkJGmAAvxbdbRiE iwMCNk2kZFOHcxHOselT3V/OxiqzRIGo7d/C9I3kvBnxduqZ/LbnghiFmzWxfKDns2n1Sa YuJmu+ve/7xwJD/I2n0U77LLLOv9rI1pSMGcqPoqIgEW5WKExilfQsSNo1zbR92PAeD259 OY7dxGo7owkJvZf8m7Lu5eGMHIPIn4mgwRYNLxVCs4qvlU0dCwBGSRIe+FRKICYoK5iEiC juE81Ses67p7tk+0z4Fu2qIXODzIkkYOWpRLAT8ya3JgLYklpXcU4kC8F5opAA== 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 4NXnfy13JczTHk; Thu, 15 Dec 2022 09:55:54 +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 2BF9ts6I052247; Thu, 15 Dec 2022 09:55:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BF9tsAd052246; Thu, 15 Dec 2022 09:55:54 GMT (envelope-from git) Date: Thu, 15 Dec 2022 09:55:54 GMT Message-Id: <202212150955.2BF9tsAd052246@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: 50f61166f7b9 - stable/13 - Revert "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: 50f61166f7b911a7807b3cb76d0f382a13fbafcd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=50f61166f7b911a7807b3cb76d0f382a13fbafcd commit 50f61166f7b911a7807b3cb76d0f382a13fbafcd Author: Emmanuel Vadot AuthorDate: 2022-12-15 09:55:11 +0000 Commit: Emmanuel Vadot CommitDate: 2022-12-15 09:55:11 +0000 Revert "LinuxKPI: Add pci_power querying for drm-kmod" This reverts commit 5a612b4409286d2dad5d4b482fca6ccbd8c43186. This break KBI for drm-kmod. I prefer to not have full debugfs and that drm-kmod still work. This is a direct commit to stable/13 Sponsored by: Beckhoff Automation GmbH & Co. KG --- 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 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index afb784881b50..6c76836c4d94 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -127,8 +127,6 @@ 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 43517d40b0a7..79999c3912f7 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -204,8 +204,6 @@ 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 @@ -309,7 +307,6 @@ 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; @@ -1603,17 +1600,6 @@ 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 d054a95f17a3..d67cebb9764a 100644 --- a/sys/compat/linuxkpi/common/include/linux/pm.h +++ b/sys/compat/linuxkpi/common/include/linux/pm.h @@ -33,8 +33,6 @@ #ifndef _LINUXKPI_LINUX_PM_H #define _LINUXKPI_LINUX_PM_H -#include - /* Needed but breaks linux_usb.c */ /* #include */ /* #include */ @@ -46,10 +44,6 @@ 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 f71481583238..b0820c9b2c3e 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -117,10 +117,6 @@ 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;