From nobody Wed Jan 14 18:37:16 2026 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 4drvws2NYRz6NmBN for ; Wed, 14 Jan 2026 18:37:17 +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 4drvws057Vz3hfx for ; Wed, 14 Jan 2026 18:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768415837; 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=Nlc/prc3y02hu4//3Pziy8J0514RU+KDUHLQQ94Lw5E=; b=CWY620kbg4nOZxJDm6EAFFP3dAIndKYwnLJW6HnvU1ElrTVfHttEyO3B4V3eP/buPhIUQF GByc66HCjzDIixNK4kIrfOfBHCflEfnwA0Z6WMXqttfAHbFilyX16XdaSOxoqMFMM1fZHI PT2zvDoyfCGZZRPzMlBzkL2gkgXW3kbsr96+8mbPHWwgaRrD8BhXeUSl1Pr69WezEHmLrq rZktQSam3QwZsev3IgjIXRT7YoQTWZ54ZIDTVSrxG2Se5HSZRw713PEh/lHL7Ti4di1oMy 2xAWZ6l7XTzhbl4Inyw6MIxWsnGDqJb2tU9OSlxz2+Wv6ZzxJ0tIDoz8sbJ5Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768415837; 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=Nlc/prc3y02hu4//3Pziy8J0514RU+KDUHLQQ94Lw5E=; b=KQL30/fES7Nd7be/9uOm0jIvsC42UgBS0y4gUsVpe2e/A9XhvLVtdOoLKC05AMRp3G2zaW 2LFMOEl4FklwepO82tfYva6Xt9HPJq6/+vxjMSBNg8ZcVIsR27QFk31GiklOGLEOTt6Amu reMdUmnsuqVmL/0E2+8CyXVpKXh01dbe8BO+0fibmogg9Hw40Dez6S1sykjsVF/dMW3rmH tquh10Hce0fHYDz0kM+gVlHQtchx0m/hrqmL/7MuXLh792ukSj3fyqoVrAFy1qzamY1HfW C8rauH/UMLGQdQUiSRz8YSIwRC+5AObc42Gz+MgodLGLDQs8W+YlxWUxTcyB5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768415837; a=rsa-sha256; cv=none; b=HPzHRLfZe5Pe7VSB5IEzWtZLrekXzHpfb8n4lemkZZLPboQ2kkXA+7ilqyq5dgbHCqKu6X xUo27oSbk2Tl3WJIEp2xPZZKCuUTlMEv7mO3/ndoFUnb6c6vL1e/h+FHwntz4waTCt8PzY 5FHCSwD8nm1/N/r9u4v0JEeMwddfcbmKQQAgP7KGjpp/uH2CGhznyp81RpXFpariWD8FAW TJvwIS9TNwLJmZ1T83YxA18+3NX8ZmC6UTa2MSJMw19ywuYHRg/rbREQ/cb05QTT/2Qxwg Q9h6zsZYS6A59hvY+B3rRuwyaDdOqxwdVjiuWXnT/ilBVb9ZgXF7TXTH7wFEwA== 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 4drvwr5t30z18WX for ; Wed, 14 Jan 2026 18:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a2de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Jan 2026 18:37:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: fa24602ca628 - main - LinuxKPI: pci: fix pcie_get_speed_cap() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: fa24602ca6282d71c26079136a74b85824c0e63b Auto-Submitted: auto-generated Date: Wed, 14 Jan 2026 18:37:16 +0000 Message-Id: <6967e25c.3a2de.76567693@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fa24602ca6282d71c26079136a74b85824c0e63b commit fa24602ca6282d71c26079136a74b85824c0e63b Author: Bjoern A. Zeeb AuthorDate: 2025-09-17 23:37:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-14 18:36:09 +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 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53862 --- 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 8fe09554aed2..c337be67f5a4 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -1136,19 +1136,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)