From nobody Fri Apr 24 17:56:17 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 4g2LHQ2YtJz6ZxRG for ; Fri, 24 Apr 2026 17:56:18 +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 4g2LHP6SjPz3qXd for ; Fri, 24 Apr 2026 17:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053377; 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=FtFdk/qGqr/TufaXTYWJ/ABk2MZ5CD8wM5D9Uyz6doM=; b=CbDWMz5YxkywH0ImBBZE/Ntj0vCm1bwHRu3PEe3WfrIk7flFHKLWU2GUOHmg9rT1GVCvYZ yevliBYS4CulE51Y8S8+hpz5qK4TzelIIGPzYon8nCIijJeowOc7LAUlCENg+3VBE2rtJ6 35W3v64C4gGNQClfCr9ynrZKxbPKyd4HCffAha/34YuVm2gVUbtGixMCOPV1VKUAzMdS1a 5DGgv6d9ITVS19pM1rUwxPWdYQHNFVEto1P0S5AOFsPFwIOBimFbmpA3Lyk85AL+vzopRf RgjXSuKjjSIaAMA65MmLkoA8SA3LTL4/SdWW6vUMnFrtlgbyByH1uYNTXLtMqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053377; a=rsa-sha256; cv=none; b=skVDbmevfZTgq6xDBFfNpLynzE+Sv+Pb0tG/kA4fftnPemqmWQkgp1YzQW69P5YxsBa8WS bD5xwbmb0lZ9VNDm39W4OhTfROYEhbBFNvJkcxhGu4z1MJ8F7bvWzjzAfsHGIa8jNji9NO XLf9BkRFwcGjZa9bERbUg7Whd9KNj3LZOm4nGRFs1e3npaViwPugz4NlKWwm1S0NCoDNGA TKiSXFNaI9MKEjyctDA21mWMdQ8AG13WhFfpRh9fUAEUR2/yu8ndW2JRtPzpYaPMXSJd9H b5gh4pIFy9vxivgykX9L5naebmR1hHTzr6M1sOwC8+kzWYt2M83BPNx7VFW1zA== 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=1777053377; 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=FtFdk/qGqr/TufaXTYWJ/ABk2MZ5CD8wM5D9Uyz6doM=; b=vcxCj9aUYNi6a+4OzWDlenCWYGyez7ChFPnISMNxu9NWAlzB7fR3OdiebI9XupdjIB4vvh H9PROsvWFYUZihe2374/ThuDSdNUhpDS3Df6SODrKPa/vQz8x2cBxB2oN+mIF4a82IuDTY vG4XFI+gw4WufDjgBbxKE2aWFsx3Vg4AESo93oSj0CIQ/MS4FvgJ5qx6rHrzP7yt89itkp e7/r4h+fNbsXtTVdj7s5v9ZFYiB1rDPRVmnttx9KqACrVGyWsab7kELGCXUkgkNbSUvj1q KEdZD5jB8khjdvPhsoTlblQDd2GOUGOMQU3K10/zana0bFIOhYab+/gfx0nWEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LHP641Pz1C4b for ; Fri, 24 Apr 2026 17:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:56:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f1bf5417c64e - stable/15 - pciconf: Use a single enum to track the current operation mode 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: f1bf5417c64ef9aef4878e3ae5a7854f7d87b771 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:56:17 +0000 Message-Id: <69ebaec1.1ec05.307b0caa@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f1bf5417c64ef9aef4878e3ae5a7854f7d87b771 commit f1bf5417c64ef9aef4878e3ae5a7854f7d87b771 Author: John Baldwin AuthorDate: 2026-03-10 16:48:16 +0000 Commit: John Baldwin CommitDate: 2026-04-24 17:33:52 +0000 pciconf: Use a single enum to track the current operation mode Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55769 (cherry picked from commit c8fb16542a52ca889c1adf56b2ce13b4ad4cf887) --- usr.sbin/pciconf/pciconf.c | 66 ++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index 6aa33d332c08..6c26621ae186 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -71,7 +71,7 @@ static struct pcisel getsel(const char *str); static void list_bridge(int fd, struct pci_conf *p); static void list_bars(int fd, struct pci_conf *p); static void list_devs(const char *name, int verbose, int bars, int bridge, - int caps, int errors, int vpd, int listmode); + int caps, int errors, int vpd, int compact); static void list_verbose(struct pci_conf *p); static void list_vpd(int fd, struct pci_conf *p); static const char *guess_class(struct pci_conf *p); @@ -103,17 +103,17 @@ int main(int argc, char **argv) { int c, width; - int listmode, readmode, writemode, attachedmode, dumpbarmode; - int bars, bridge, caps, errors, verbose, vpd; + enum { NONE, LIST, READ, WRITE, ATTACHED, DUMPBAR } mode; + int compact, bars, bridge, caps, errors, verbose, vpd; - listmode = readmode = writemode = attachedmode = dumpbarmode = 0; - bars = bridge = caps = errors = verbose = vpd= 0; + mode = NONE; + compact = bars = bridge = caps = errors = verbose = vpd = 0; width = 4; while ((c = getopt(argc, argv, "aBbcDehlrwVvx")) != -1) { switch(c) { case 'a': - attachedmode = 1; + mode = ATTACHED; break; case 'B': @@ -130,7 +130,7 @@ main(int argc, char **argv) break; case 'D': - dumpbarmode = 1; + mode = DUMPBAR; break; case 'e': @@ -142,15 +142,17 @@ main(int argc, char **argv) break; case 'l': - listmode++; + if (mode == LIST) + compact = 1; + mode = LIST; break; case 'r': - readmode = 1; + mode = READ; break; case 'w': - writemode = 1; + mode = WRITE; break; case 'v': @@ -170,30 +172,38 @@ main(int argc, char **argv) } } - if ((listmode && optind >= argc + 1) - || (writemode && optind + 3 != argc) - || (readmode && optind + 2 != argc) - || (attachedmode && optind + 1 != argc) - || (dumpbarmode && (optind + 2 > argc || optind + 4 < argc)) - || (width == 8 && !dumpbarmode)) - usage(); - - if (listmode) { + switch (mode) { + case LIST: + if (optind >= argc + 1) + usage(); list_devs(optind + 1 == argc ? argv[optind] : NULL, verbose, - bars, bridge, caps, errors, vpd, listmode); - } else if (attachedmode) { + bars, bridge, caps, errors, vpd, compact); + break; + case ATTACHED: + if (optind + 1 != argc) + usage(); chkattached(argv[optind]); - } else if (readmode) { + break; + case READ: + if (optind + 2 != argc || width == 8) + usage(); readit(argv[optind], argv[optind + 1], width); - } else if (writemode) { + break; + case WRITE: + if (optind + 3 != argc || width == 8) + usage(); writeit(argv[optind], argv[optind + 1], argv[optind + 2], width); - } else if (dumpbarmode) { + break; + case DUMPBAR: + if (optind + 2 > argc || optind + 4 < argc) + usage(); dump_bar(argv[optind], argv[optind + 1], optind + 2 < argc ? argv[optind + 2] : NULL, optind + 3 < argc ? argv[optind + 3] : NULL, width, verbose); - } else { + break; + default: usage(); } @@ -258,7 +268,7 @@ fetch_devs(int fd, const char *name, struct pci_conf **confp, size_t *countp) static void list_devs(const char *name, int verbose, int bars, int bridge, int caps, - int errors, int vpd, int listmode) + int errors, int vpd, int compact) { int fd; struct pci_conf *conf, *p; @@ -279,11 +289,11 @@ list_devs(const char *name, int verbose, int bars, int bridge, int caps, return; } - if (listmode == 2) + if (compact) printf("drv\tselector\tclass rev hdr " "vendor device subven subdev\n"); for (p = conf; p < conf + count; p++) { - if (listmode == 2) + if (compact) printf("%s%d@pci%d:%d:%d:%d:" "\t%06x %02x %02x " "%04x %04x %04x %04x\n",