d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC: Teach pciconf(8) to list PCI capabilities via the new -c flag and

Browse Source 
update some cruft in the manpage.
This commit is contained in:
jhb 2007-02-09 14:47:53 +00:00
parent eaf2392a3d
commit 6ebcfb3d40
3 changed files with 79 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.sbin/pciconf/Makefile
View File

@ -2,6 +2,7 @@
# $FreeBSD$
PROG= pciconf
SRCS= pciconf.c cap.c
MAN= pciconf.8
CFLAGS+= -I${.CURDIR}/../../sys

51
usr.sbin/pciconf/pciconf.8
View File

@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd February 7, 1997
.Dd February 2, 2007
.Dt PCICONF 8
.Os
.Sh NAME
@ -33,7 +33,7 @@
.Nd diagnostic utility for the PCI bus
.Sh SYNOPSIS
.Nm
.Fl l Op Fl v
.Fl l Op Fl cv
.Nm
.Fl a Ar selector
.Nm
@ -61,13 +61,6 @@ bar0@pci0:5:0: class=0x000100 card=0x00000000 chip=0x88c15333 rev=0x00 hdr=0x00
none0@pci0:6:0: class=0x020000 card=0x00000000 chip=0x802910ec rev=0x00 hdr=0x00
.Ed
.Pp
If the
.Fl v
option is supplied,
.Nm
will attempt to load the vendor/device information database, and print
vendor, device, class and subclass identification strings for each device.
.Pp
The first column gives the
device name, unit number, and
.Ar selector .
@ -86,12 +79,7 @@ The third column gives the contents of the subvendorid register, introduced
in revision 2.1 of the
.Tn PCI
standard.
It is 0 for most current (2.0)
.Tn PCI
cards, but is supposed to be loaded with a unique card identification code
in newly developed
.Tn PCI
cards.
Note that it will be 0 for older cards.
The field consists of the card ID in the upper
half and the card vendor ID in the lower half of the value.
.Pp
@ -101,11 +89,16 @@ It consists of two fields, identifying the chip and
its vendor, as above.
The fifth column prints the chip's revision.
The sixth column describes the header type.
Currently assigned header types are 0 for all devices except
Currently assigned header types include 0 for most devices,
1 for
.Tn PCI
to
.Tn PCI
bridges, and 1 for such bridge chips.
bridges, and 2 for
.Tn PCI
to
.Tn CardBus
bridges.
If the most significant bit
of the header type register is set for
function 0 of a
@ -115,6 +108,30 @@ device, it is a
device, which contains several (similar or independent) functions on
one chip.
.Pp
If the
.Fl c
option is supplied,
.Nm
will list any capabilities supported by each device.
Each capability will be enumerated via a line in the following format:
.Bd -literal
cap 10[40] = PCI-Express 1 root port
.Ed
.Pp
The first value after the
.Dq Li cap
prefix is the capability ID in hexadecimal.
The second value in the square brackets is the offset of the capability
in config space in hexadecimal.
The format of the text after the equals sign is capability-specific.
.Pp
If the
.Fl v
option is supplied,
.Nm
will attempt to load the vendor/device information database, and print
vendor, device, class and subclass identification strings for each device.
.Pp
All invocations of
.Nm
except for

74
usr.sbin/pciconf/pciconf.c
View File

@ -35,6 +35,7 @@ static const char rcsid[] =
#include <sys/types.h>
#include <sys/fcntl.h>
#include <ctype.h>
#include <err.h>
#include <stdlib.h>
#include <stdio.h>
@ -46,6 +47,7 @@ static const char rcsid[] =
#include <dev/pci/pcireg.h>
#include "pathnames.h"
#include "pciconf.h"
struct pci_device_info
{
@ -64,10 +66,10 @@ struct pci_vendor_info
TAILQ_HEAD(,pci_vendor_info) pci_vendors;
static void list_devs(int vendors);
static void list_devs(int verbose, int caps);
static void list_verbose(struct pci_conf *p);
static char *guess_class(struct pci_conf *p);
static char *guess_subclass(struct pci_conf *p);
static const char *guess_class(struct pci_conf *p);
static const char *guess_subclass(struct pci_conf *p);
static int load_vendors(void);
static void readit(const char *, const char *, int);
static void writeit(const char *, const char *, const char *, int);
@ -76,10 +78,10 @@ static void chkattached(const char *, int);
static int exitstatus = 0;
static void
usage()
usage(void)
{
fprintf(stderr, "%s\n%s\n%s\n%s\n",
"usage: pciconf -l [-v]",
"usage: pciconf -l [-cv]",
" pciconf -a selector",
" pciconf -r [-b | -h] selector addr[:addr2]",
" pciconf -w [-b | -h] selector addr value");
@ -90,17 +92,21 @@ int
main(int argc, char **argv)
{
int c;
int listmode, readmode, writemode, attachedmode, verbose;
int listmode, readmode, writemode, attachedmode, caps, verbose;
int byte, isshort;
listmode = readmode = writemode = attachedmode = verbose = byte = isshort = 0;
listmode = readmode = writemode = attachedmode = caps = verbose = byte = isshort = 0;
while ((c = getopt(argc, argv, "alrwbhv")) != -1) {
while ((c = getopt(argc, argv, "aclrwbhv")) != -1) {
switch(c) {
case 'a':
attachedmode = 1;
break;
case 'c':
caps = 1;
break;
case 'l':
listmode = 1;
break;
@ -137,7 +143,7 @@ main(int argc, char **argv)
usage();
if (listmode) {
list_devs(verbose);
list_devs(verbose, caps);
} else if (attachedmode) {
chkattached(argv[optind],
byte ? 1 : isshort ? 2 : 4);
@ -155,7 +161,7 @@ main(int argc, char **argv)
}
static void
list_devs(int verbose)
list_devs(int verbose, int caps)
{
int fd;
struct pci_conf_io pc;
@ -165,7 +171,7 @@ list_devs(int verbose)
if (verbose)
load_vendors();
fd = open(_PATH_DEVPCI, O_RDONLY, 0);
fd = open(_PATH_DEVPCI, caps ? O_RDWR : O_RDONLY, 0);
if (fd < 0)
err(1, "%s", _PATH_DEVPCI);
@ -212,6 +218,8 @@ list_devs(int verbose)
p->pc_revid, p->pc_hdr);
if (verbose)
list_verbose(p);
if (caps)
list_caps(fd, p);
}
} while (pc.status == PCI_GETCONF_MORE_DEVS);
@ -223,11 +231,11 @@ list_verbose(struct pci_conf *p)
{
struct pci_vendor_info *vi;
struct pci_device_info *di;
char *dp;
const char *dp;
TAILQ_FOREACH(vi, &pci_vendors, link) {
if (vi->id == p->pc_vendor) {
printf(" vendor = '%s'\n", vi->desc);
printf(" vendor = '%s'\n", vi->desc);
break;
}
}
@ -236,15 +244,15 @@ list_verbose(struct pci_conf *p)
} else {
TAILQ_FOREACH(di, &vi->devs, link) {
if (di->id == p->pc_device) {
printf(" device = '%s'\n", di->desc);
printf(" device = '%s'\n", di->desc);
break;
}
}
}
if ((dp = guess_class(p)) != NULL)
printf(" class = %s\n", dp);
printf(" class = %s\n", dp);
if ((dp = guess_subclass(p)) != NULL)
printf(" subclass = %s\n", dp);
printf(" subclass = %s\n", dp);
}
/*
@ -254,7 +262,7 @@ static struct
{
int class;
int subclass;
char *desc;
const char *desc;
} pci_nomatch_tab[] = {
{PCIC_OLD, -1, "old"},
{PCIC_OLD, PCIS_OLD_NONVGA, "non-VGA display device"},
@ -337,7 +345,7 @@ static struct
{0, 0, NULL}
};
static char *
static const char *
guess_class(struct pci_conf *p)
{
int i;
@ -349,7 +357,7 @@ guess_class(struct pci_conf *p)
return(NULL);
}
static char *
static const char *
guess_subclass(struct pci_conf *p)
{
int i;
@ -365,7 +373,7 @@ guess_subclass(struct pci_conf *p)
static int
load_vendors(void)
{
char *dbf;
const char *dbf;
FILE *db;
struct pci_vendor_info *cv;
struct pci_device_info *cd;
@ -458,6 +466,20 @@ load_vendors(void)
return(error);
}
uint32_t
read_config(int fd, struct pcisel *sel, long reg, int width)
{
struct pci_io pi;
pi.pi_sel = *sel;
pi.pi_reg = reg;
pi.pi_width = width;
if (ioctl(fd, PCIOCREAD, &pi) < 0)
err(1, "ioctl(PCIOCREAD)");
return (pi.pi_data);
}
static struct pcisel
getsel(const char *str)
@ -496,16 +518,8 @@ getsel(const char *str)
static void
readone(int fd, struct pcisel *sel, long reg, int width)
{
struct pci_io pi;
pi.pi_sel = *sel;
pi.pi_reg = reg;
pi.pi_width = width;
if (ioctl(fd, PCIOCREAD, &pi) < 0)
err(1, "ioctl(PCIOCREAD)");
printf("%0*x", width*2, pi.pi_data);
printf("%0*x", width*2, read_config(fd, sel, reg, width));
}
static void
@ -559,7 +573,7 @@ writeit(const char *name, const char *reg, const char *data, int width)
}
static void
chkattached (const char *name, int width)
chkattached(const char *name, int width)
{
int fd;
struct pci_io pi;