From nobody Mon Mar 21 16:20:25 2022 X-Original-To: dev-commits-src-main@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 8F1681A21651; Mon, 21 Mar 2022 16:20:25 +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 4KMfwn3NPhz54FL; Mon, 21 Mar 2022 16:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647879625; 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=Tf2+j2b06tMWcM95D8jT9Zd1kvaTSVtbgBxsAs9cIGs=; b=BqhIT+xvYciZTkBjBbEEA3iEorej+Wlrsbo14mBxBY9mjM//+n+ebmGgdm802YxxSJ+2Eo pF9rqFa8kc90zPlxF0IbOpLyoOpJYVvALxQRk4vEeBzzTMZ60XqgoAJNGN/DdSk5oaKeQX abyueRLzwtzEW1Ys6jkThSazIRasSM72aF3YPgxBbJnWh4ON+0576M+KMsouwhaQQjp4rP j5Y1dYUfiBmGf3xEhpXxpXe1J45mSmyBTnKib+eDJyM1IiStWEsE/O2zX/oPw6NgbBtFCC 822KZEZf/Osk24rAgZWzrNTJQdNbRmZwPNU0/pbJqS9FPFkj27AdtcHnVTqhwA== 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 555A71E4E3; Mon, 21 Mar 2022 16:20:25 +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 22LGKPDU053826; Mon, 21 Mar 2022 16:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22LGKPdb053825; Mon, 21 Mar 2022 16:20:25 GMT (envelope-from git) Date: Mon, 21 Mar 2022 16:20:25 GMT Message-Id: <202203211620.22LGKPdb053825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b3b836251f9f - main - LinuxKPI: pci: implement pci_upstream_bridge() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b3b836251f9fefa817d158784189f6d336917f7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647879625; 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=Tf2+j2b06tMWcM95D8jT9Zd1kvaTSVtbgBxsAs9cIGs=; b=TsOja0HU+F4f72B7GlHcQBMg0ebtA7OnYzpIJVOx5i+Ceke6HPziLFPVDW5qc1SKq/sdh1 qRdY9CQMYGVDkENLUPRl/9jHOsRaY7TEkJOpT0MBb1x3j6sWVUZ85Mtto5IJCB6EMH0QAO r1qDGd+Cbu/s79EIa+IObdwOqaPohSbIh23/xxw76fSuaKbk+3gKAnYCNXmRB/rcdD7yl2 kgS86SIaox5C5CQmPT3sOp92dXJvUFPbcaM1pL1xnqq7cydU9dcyDnIvoHAYlc6ZG00pKH kqeZi0KOUcj7nj3lQRdN6iXjrYJWyUR2GxsNFt4mACpcZe9TqzrsoM6hV+bNtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647879625; a=rsa-sha256; cv=none; b=DMQdyi4IcelN0J9wHWdVSprJaKt7PoXQyGgY+SZ2TIKQELE0kroYKuWkU0Ebe0k4XtWR8l WElNYDUf8MowTwiDU6iS5lOqSrTd8rpFGc1ycmSQanjEQqpZGbjZmpZHGDbuslKoowkmx1 S2+3RFL/LDNADGKMWjtYy5P0XbXwcF3quH7VfJ2se+2q3IO7c/4f5RVzCaEWGInNGk6QlU Bl0jr4au7ZmKo4WEpzi2W8FQ2BJ/xCDzrBN/4RSTzfeE7QC8ym6Bopb9dTIJ87DLHhyS16 Hd49rJlyFvm6D6l7KeVcx5hHw7tiB6KJrxCnGn8/VbhRxSCO3/T5CaTozQVdTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b3b836251f9fefa817d158784189f6d336917f7a commit b3b836251f9fefa817d158784189f6d336917f7a Author: Bjoern A. Zeeb AuthorDate: 2022-02-16 18:04:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-21 14:35:23 +0000 LinuxKPI: pci: implement pci_upstream_bridge() Allow drivers to query the "upstream PCI bridge". Currently we point back to ourselves on pdev->bus->self rather than to the parent PCI bridge. We keep this as status-quo with an extra comment and only on-demand allocate a pci_dev for the parent bridge if we are asked for in pci_upstream_bridge(). When releasing the pci_dev we check if pdev->bus->self has changed and call pci_dev_put() to release the reference count on the parent bridge as well. This code moves pci_is_root_bus() higher up in pci.h but no functional change there. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: hselasky, (jhb some earlier) Thanks to: wulf for handling drm-kmod Differential Revision: https://reviews.freebsd.org/D34305 --- sys/compat/linuxkpi/common/include/linux/pci.h | 49 ++++++++++++++++++++++---- sys/compat/linuxkpi/common/src/linux_pci.c | 7 ++++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 7bf785fb209a..0b4cee0f8dc2 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -478,6 +478,48 @@ pci_clear_master(struct pci_dev *pdev) return (0); } +static inline bool +pci_is_root_bus(struct pci_bus *pbus) +{ + + return (pbus->self == NULL); +} + +static inline struct pci_dev * +pci_upstream_bridge(struct pci_dev *pdev) +{ + + if (pci_is_root_bus(pdev->bus)) + return (NULL); + + /* + * If we do not have a (proper) "upstream bridge" set, e.g., we point + * to ourselves, try to handle this case on the fly like we do + * for pcie_find_root_port(). + */ + if (pdev == pdev->bus->self) { + device_t bridge; + + bridge = device_get_parent(pdev->dev.bsddev); + if (bridge == NULL) + goto done; + bridge = device_get_parent(bridge); + if (bridge == NULL) + goto done; + if (device_get_devclass(device_get_parent(bridge)) != + devclass_find("pci")) + goto done; + + /* + * "bridge" is a PCI-to-PCI bridge. Create a Linux pci_dev + * for it so it can be returned. + */ + pdev->bus->self = lkpinew_pci_dev(bridge); + } +done: + return (pdev->bus->self); +} + static inline struct pci_devres * lkpi_pci_devres_get_alloc(struct pci_dev *pdev) { @@ -1399,13 +1441,6 @@ pci_dev_present(const struct pci_device_id *cur) return (0); } -static inline bool -pci_is_root_bus(struct pci_bus *pbus) -{ - - return (pbus->self == NULL); -} - struct pci_dev *lkpi_pci_get_domain_bus_and_slot(int domain, unsigned int bus, unsigned int devfn); #define pci_get_domain_bus_and_slot(domain, bus, devfn) \ diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 5f0ec07d3841..b4f4a2219bb4 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -278,6 +278,11 @@ lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) pdev->class = pci_get_class(dev); pdev->revision = pci_get_revid(dev); pdev->bus = malloc(sizeof(*pdev->bus), M_DEVBUF, M_WAITOK | M_ZERO); + /* + * This should be the upstream bridge; pci_upstream_bridge() + * handles that case on demand as otherwise we'll shadow the + * entire PCI hierarchy. + */ pdev->bus->self = pdev; pdev->bus->number = pci_get_bus(dev); pdev->bus->domain = pci_get_domain(dev); @@ -301,6 +306,8 @@ lkpinew_pci_dev_release(struct device *dev) pdev = to_pci_dev(dev); if (pdev->root != NULL) pci_dev_put(pdev->root); + if (pdev->bus->self != pdev) + pci_dev_put(pdev->bus->self); free(pdev->bus, M_DEVBUF); free(pdev, M_DEVBUF); }