From nobody Sat Jan 17 13:09:13 2026 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 4dtcVx6bBnz6Nh7X for ; Sat, 17 Jan 2026 13:09:13 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dtcVx4jW6z3Dh0 for ; Sat, 17 Jan 2026 13:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768655353; 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=GU+a3nO/tKcr4HEllPpfOoxb4iX52dTPeis4p6HPKWI=; b=f2x3WcO+lOSzaY8TyqB1A2/zEcGC9oSXdyMgvMV5alnYxWPdlHh2+5CrOP5UH/883XyAqN C7dmZjmGweXVBKYyN5lRbtiG8JC37CGQv/GaNtRlQZCwYuTKjPBXqg/abk5aVSEefXzEvK AuWom94QjMQDRlshWb+cf2zfe4zDxmzaAXuk+cs9gCmIzI+PcMx9e+BMCH+UeT7vVDrzbN hkzqUdtsQcp2sP6se5oTcFb7iuJlGVVrqiV3U3z4T2iSpVewD+rV4Py6taDO4NMVr73fwc B1ac9/x3Bwoc/4c1losDLPD5Zjg399M9GjUzuYfnEAzqCmouhZTa2cCHNaxqYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768655353; 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=GU+a3nO/tKcr4HEllPpfOoxb4iX52dTPeis4p6HPKWI=; b=YN62yVp89RdTmZqEScI9KqpQJfhW+plahuUx3gz6SAcUzU2/CBiDtrqpqOAE+vitqCiBVO nBAqc57d6RXwyFZ+8VxtuGa1vHMLDqpZbNrNI3hcAtg/EZPKCv9i3KtqYKLrJOnJ85Xf9P awzxsqhj51/HJCupZ9HHXjorp24AWBGL3nqGRq4jgxbS7qvNl8dLVOmUoeuSpqyIWIQABs UWe61dzA3ecZxVzSC6IQ6Rt6IkOknIHJ9U0mrtgPxPnFFFxIF2v+bNbvCqHLQ//eyxgQYX 5FVs3EDtcCK3drS44TrM45VPCGQ+khmO+rzWSzSQPdz5mmSbE1cQMTkCCfNMmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768655353; a=rsa-sha256; cv=none; b=q00avCHdTcvDNCyl6Hm4lA5NEoxa9j8JQIOMT4lC+WbWwVfolfGBiJRwt0QoHY4du4sMMm iw/lDQU8OCio2eif46c1DQWeWBPq3EsmhnrnCY+6NTaQaswKfLkSNdDmYpXuVRlcadO0Dk eIVTCJjERIEvedLUnvjGuYbw6g8sbj1JLGpDUbiSVht0hei7myIf8BMTsp0GmaqzTVpU9M +KG1c1exX6smYCWM5buc2O7Plozv/WrQIgBCE1E4KH36+4zEceugcKCC3k+0EluDc/6lEo K4dF4TMy1Kr1JmHkRWKSVU/1hkZ8ZhacGoulcs0Vsx97Kg553L6IUrHd/WMl1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dtcVx4CCKz110P for ; Sat, 17 Jan 2026 13:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43565 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Jan 2026 13:09:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c22f46da9d10 - stable/15 - LinuxKPI: pci: fix pcie_get_speed_cap() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: c22f46da9d10383d8b227db8dc305117df758967 Auto-Submitted: auto-generated Date: Sat, 17 Jan 2026 13:09:13 +0000 Message-Id: <696b89f9.43565.317f57b1@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c22f46da9d10383d8b227db8dc305117df758967 commit c22f46da9d10383d8b227db8dc305117df758967 Author: Bjoern A. Zeeb AuthorDate: 2025-09-17 23:37:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-17 07:51:17 +0000 LinuxKPI: pci: fix pcie_get_speed_cap() pcie_get_speed_cap() has a hard coded skip of 3 devices at the beginning. It is either called on a pdev or on a result from pci_upstream_bridge(). In the latter case skipping another three devices might get us to acpi0 or nexus, neither of which is a PCI device still and pci_get_vendor() will panic() on that. Sponsored by: The FreeBSD Foundation (commit) GHI: https://github.com/freebsd/drm-kmod/issues/393 Differential Revision: https://reviews.freebsd.org/D53862 (cherry picked from commit fa24602ca6282d71c26079136a74b85824c0e63b) --- sys/compat/linuxkpi/common/include/linux/pci.h | 27 +++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 06336bf963d6..cda1cf7dfb5e 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -1122,19 +1122,28 @@ pci_num_vf(struct pci_dev *dev) static inline enum pci_bus_speed pcie_get_speed_cap(struct pci_dev *dev) { + struct pci_dev *pbus; device_t root; uint32_t lnkcap, lnkcap2; int error, pos; - root = device_get_parent(dev->dev.bsddev); - if (root == NULL) - return (PCI_SPEED_UNKNOWN); - root = device_get_parent(root); - if (root == NULL) - return (PCI_SPEED_UNKNOWN); - root = device_get_parent(root); - if (root == NULL) - return (PCI_SPEED_UNKNOWN); + /* + * We should always be called on a PCI device. + * The only current consumer I could find was amdgpu which either + * calls us directly on a pdev(drmn?) or with the result of + * pci_upstream_bridge(). + * + * Treat "drmn" as special again as it is not a PCI device. + */ + if (dev->pdrv != NULL && dev->pdrv->isdrm) { + pbus = pci_upstream_bridge(dev); + if (pbus == NULL) + return (PCI_SPEED_UNKNOWN); + } else + pbus = dev; + + /* "root" may be misleading as it may not be that. */ + root = pbus->dev.bsddev; if (pci_get_vendor(root) == PCI_VENDOR_ID_VIA || pci_get_vendor(root) == PCI_VENDOR_ID_SERVERWORKS)