From nobody Fri Apr 24 17:56:20 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 4g2LHS5MgKz6Zxf3 for ; Fri, 24 Apr 2026 17:56:20 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2LHS0xfnz3qMx for ; Fri, 24 Apr 2026 17:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053380; 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=LdFRgrkPZCXK0FKWxA8pLRqac+ZiOe3NZRjU9E5FNj8=; b=fPS3JOiqXrtuhdzI+yzFkuh8lIpfNtXB7rjAiGzHUB1ReI05jWGZKVi/PuO5Kzl8n3uhmI gcFOdVQN1sOswqdPuON1X/C1KcPjNcr4hfIlnaWd2hJa69DONnx7nqHEFYM95Y+8Duom96 woSFLCckSV3yF99jzH+VY+hKFFA01CMleDxR8Nxs3nlup1i848+OFAtvoTCtMAFztVNRSY MVd3ke6PUL3xdCfxlWteX7T0vNL2BUEEE1qxu3MBoKjDl2zJKh65MuwK1xCn+6uoSb08A5 jqalhYyftuid9q+EGJAxicOieqElaM/1rh3VguYbMsR/j9oevxKBwORRRMZBgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053380; a=rsa-sha256; cv=none; b=P/159HeFjuaz6trCVV6NgO/hcpP1ytMfIR5FP6kB7ikylR/keOSBYbPb7jCxflZ3Eu0Ijc V2v2kjqAcjOdvJvQTas02oihEFr/FaCErm4s+8CWgyuOUS3lnpH88zoCnbTOdH5M5gFyW/ L711UCDCpFIYZBq3ni/YS45pTmvEwfHFzeX527Np6KV2ktM5777i7EgxmfRb3JqH/OwdSL jhwaJx2cwWlkdsBJcRHm1hQuIY2mVCxVlRwCwHRCcVKZ6MIZ1XA9r4molXJZySRZ2CE2Vg hhqGjdtVwLUrB1FE3eIb4V83KZhYBoXGS6NrLaA+WO0Jh0o5BOFS5EyJ4zrVSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053380; 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=LdFRgrkPZCXK0FKWxA8pLRqac+ZiOe3NZRjU9E5FNj8=; b=A/nlmYY7tOr45WZ0Jm/CpfRK58gNUSAR9o7FQyUjRoT+d6j0bo4nwjqXg6Yh+bpltS61+u 4RorGqg37ciRzFpCC29Ly1IShR3JcD1zed70DdwOFc+VNvt6MRsyIvCf6RqL4ohUThR7yJ g67yZbnfwxovIr99qfyxw38T/J6wB3vWthw3aE/PhUtT0PlAnMo3jHAv/Vm2aAqmY2JKde hiSIDysrMjXWMRcseBjST5GuMOmTDkD4JLKLXwuN3wn0RJPxreZT4Z6PvGokIif8sGe3AU OTwkcvwkcTatpMG6xgqsmJkhS1b7iZ/xGxfL4s6g3AV5u3jZskBgNlQQEV2X7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LHS0S1Sz1CZ9 for ; Fri, 24 Apr 2026 17:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d5c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:56:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 920d0afddc82 - stable/15 - pci: Export bus numbers for bridge devices in struct pci_conf 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 920d0afddc82a1a9e95f81ec3760555084050217 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:56:20 +0000 Message-Id: <69ebaec4.1d5c0.3d3d8959@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=920d0afddc82a1a9e95f81ec3760555084050217 commit 920d0afddc82a1a9e95f81ec3760555084050217 Author: John Baldwin AuthorDate: 2026-03-10 16:49:21 +0000 Commit: John Baldwin CommitDate: 2026-04-24 17:33:53 +0000 pci: Export bus numbers for bridge devices in struct pci_conf This exports bus information about bridges to userspace via the less-privileged PCIOCGETCONF ioctl. Previously if userspace wished to query this information, it had to use direct PCI config register access which requires higher privilege. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55771 (cherry picked from commit 7e7a1b61531a29b4a0a5cdac66b96f420e6c66e4) --- share/man/man4/pci.4 | 6 ++++++ sys/dev/pci/pci.c | 3 +++ sys/dev/pci/pci_user.c | 32 +++++++++++++++++++++++++++++++- sys/sys/pciio.h | 4 +++- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4 index f5d42efb4f37..38a427e64f4f 100644 --- a/share/man/man4/pci.4 +++ b/share/man/man4/pci.4 @@ -244,6 +244,12 @@ structure. This should always be equivalent to the offset of the .Va pc_spare member. +.It pc_secbus +Secondary PCI bus number. +.Pq Only valid for bridge devices +.It pc_subbus +Subordinate PCI bus number. +.Pq Only valid for bridge devices .It pc_spare Reserved for future use. .El diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index cde98cb62cef..9a1dbc5f66ed 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -798,6 +798,9 @@ pci_fill_devinfo(device_t pcib, device_t bus, int d, int b, int s, int f, devlist_entry->conf.pc_progif = cfg->progif; devlist_entry->conf.pc_revid = cfg->revid; + devlist_entry->conf.pc_secbus = cfg->bridge.br_secbus; + devlist_entry->conf.pc_subbus = cfg->bridge.br_subbus; + pci_numdevs++; pci_generation++; diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c index 9768030995e7..0e23363fba73 100644 --- a/sys/dev/pci/pci_user.c +++ b/sys/dev/pci/pci_user.c @@ -81,7 +81,9 @@ struct pci_conf32 { u_int32_t pd_unit; /* device unit number */ int pd_numa_domain; /* device NUMA domain */ u_int32_t pc_reported_len;/* length of PCI data reported */ - char pc_spare[64]; /* space for future fields */ + uint8_t pc_secbus; /* secondary bus number */ + uint8_t pc_subbus; /* subordinate bus number */ + char pc_spare[62]; /* space for future fields */ }; struct pci_match_conf32 { @@ -889,6 +891,8 @@ pci_conf_for_copyout(const struct pci_conf *pcp, union pci_conf_union *pcup, pcup->pc32.pd_unit = (uint32_t)pcp->pd_unit; if (cmd == PCIOCGETCONF32) { pcup->pc32.pd_numa_domain = pcp->pd_numa_domain; + pcup->pc32.pc_secbus = pcp->pc_secbus; + pcup->pc32.pc_subbus = pcp->pc_subbus; pcup->pc32.pc_reported_len = (uint32_t)offsetof(struct pci_conf32, pc_spare); } @@ -1315,6 +1319,32 @@ pci_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t else dinfo->conf.pd_numa_domain = 0; + if (dinfo->cfg.dev != NULL) { + /* + * Re-read the values in case a driver + * changed them after the device was + * initially scanned. + */ + switch (dinfo->conf.pc_hdr) { + case PCIM_HDRTYPE_BRIDGE: + dinfo->conf.pc_secbus = + pci_read_config(dinfo->cfg.dev, + PCIR_SECBUS_1, 1); + dinfo->conf.pc_subbus = + pci_read_config(dinfo->cfg.dev, + PCIR_SUBBUS_1, 1); + break; + case PCIM_HDRTYPE_CARDBUS: + dinfo->conf.pc_secbus = + pci_read_config(dinfo->cfg.dev, + PCIR_SECBUS_2, 1); + dinfo->conf.pc_subbus = + pci_read_config(dinfo->cfg.dev, + PCIR_SUBBUS_2, 1); + break; + } + } + if (pattern_buf == NULL || pci_conf_match(cmd, pattern_buf, num_patterns, &dinfo->conf) == 0) { diff --git a/sys/sys/pciio.h b/sys/sys/pciio.h index 64c0b32cb8e2..58928544f171 100644 --- a/sys/sys/pciio.h +++ b/sys/sys/pciio.h @@ -79,7 +79,9 @@ struct pci_conf { u_long pd_unit; /* device unit number */ int pd_numa_domain; /* device NUMA domain */ size_t pc_reported_len;/* length of PCI data reported */ - char pc_spare[64]; /* space for future fields */ + uint8_t pc_secbus; /* secondary bus number */ + uint8_t pc_subbus; /* subordinate bus number */ + char pc_spare[62]; /* space for future fields */ }; struct pci_match_conf {