 @@ -1,14 +1,14 @@
-.\"	$NetBSD: pcictl.8,v 1.10 2011/02/25 21:40:48 jmcneill Exp $
+.\"	$NetBSD: pcictl.8,v 1.10.22.1 2014/09/10 08:38:31 martin Exp $
 .\"
 .\" Copyright 2001 Wasabi Systems, Inc.
 .\" All rights reserved.
 .\"
 .\" Written by Jason R. Thorpe for Wasabi Systems, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -69,25 +69,50 @@ Any locator not specified defaults
 to a wildcard, or may be explicitly wildcarded by specifying
 .Dq any .
 .Pp
 .Nm dump
 .Op Fl b Ar bus
 .Fl d Ar device
 .Op Fl f Ar function
 .Pp
 Dump the PCI configuration space for the specified device located
 at the specified bus, device, and function.
 If the bus is not specified, it defaults to the bus number of the
 PCI bus specified on the command line.
 If the function is not specified, it defaults to 0.
 .Pp
 .Nm read
 .Op Fl b Ar bus
 .Fl d Ar device
 .Op Fl f Ar function
 .Ar reg
 .Pp
 Read the specified 32-bit aligned PCI configuration register and print
 it in hexadecimal to standard output.
 If the bus is not specified, it defaults to the bus number of the
 PCI bus specified on the command line.
 If the function is not specified, it defaults to 0.
 .Pp
 .Nm write
 .Op Fl b Ar bus
 .Fl d Ar device
 .Op Fl f Ar function
 .Ar reg
 .Ar value
 .Pp
 Write the specified value to the specified 32-bit aligned PCI
 configuration register.
 If the bus is not specified, it defaults to the bus number of the
 PCI bus specified on the command line.
 If the function is not specified, it defaults to 0.
 .Sh FILES
 .Pa /dev/pci*
 - PCI bus device nodes
 .Sh SEE ALSO
 .Xr pci 3 ,
 .Xr pci 4 ,
 .Xr drvctl 8
 .Sh HISTORY
 The
 .Nm
 command first appeared in
 .Nx 1.6 .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcictl.c,v 1.18 2011/08/30 20:08:38 joerg Exp $	*/
+/*	$NetBSD: pcictl.c,v 1.18.20.1 2014/09/10 08:38:31 martin Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -66,42 +66,55 @@ struct command {
 __dead static void	usage(void);
 static int	pcifd;
 static struct pciio_businfo pci_businfo;
 static const	char *dvname;
 static char	dvname_store[MAXPATHLEN];
 static const	char *cmdname;
 static int	print_numbers = 0;
 static void	cmd_list(int, char *[]);
 static void	cmd_dump(int, char *[]);
 static void	cmd_read(int, char *[]);
 static void	cmd_write(int, char *[]);
 static const struct command commands[] = {
 	{ "list",
 	  "[-n] [-b bus] [-d device] [-f function]",
 	  cmd_list,
 	  O_RDONLY },
 	{ "dump",
 	  "[-b bus] -d device [-f function]",
 	  cmd_dump,
 	  O_RDONLY },
 	{ "read",
 	  "[-b bus] -d device [-f function] reg",
 	  cmd_read,
 	  O_RDONLY },
 	{ "write",
 	  "[-b bus] -d device [-f function] reg value",
 	  cmd_write,
 	  O_WRONLY },
 	{ 0, 0, 0, 0 },
 };
 static int	parse_bdf(const char *);
 static u_int	parse_reg(const char *);
 static void	scan_pci(int, int, int, void (*)(u_int, u_int, u_int));
 static void	scan_pci_list(u_int, u_int, u_int);
 static void	scan_pci_dump(u_int, u_int, u_int);
 int
 main(int argc, char *argv[])
+{
 	int i;
 	/* Must have at least: device command */
 	if (argc < 3)
 @@ -220,39 +233,143 @@ cmd_dump(int argc, char *argv[])
 	if (argc != 0)
 		usage();
 	if (bus == -1)
 		errx(EXIT_FAILURE, "dump: wildcard bus number not permitted");
 	if (dev == -1)
 		errx(EXIT_FAILURE, "dump: must specify a device number");
 	if (func == -1)
 		errx(EXIT_FAILURE, "dump: wildcard function number not permitted");
 	scan_pci(bus, dev, func, scan_pci_dump);
+}
 static void
 cmd_read(int argc, char *argv[])
+{
 	int bus, dev, func;
 	u_int reg;
 	pcireg_t value;
 	int ch;
 	bus = pci_businfo.busno;
 	func = 0;
 	dev = -1;
 	while ((ch = getopt(argc, argv, "b:d:f:")) != -1) {
 		switch (ch) {
 		case 'b':
 			bus = parse_bdf(optarg);
 			break;
 		case 'd':
 			dev = parse_bdf(optarg);
 			break;
 		case 'f':
 			func = parse_bdf(optarg);
 			break;
 		default:
 			usage();
+		}
+	}
 	argv += optind;
 	argc -= optind;
 	if (argc != 1)
 		usage();
 	reg = parse_reg(argv[0]);
 	if (pcibus_conf_read(pcifd, bus, dev, func, reg, &value) == -1)
 		err(EXIT_FAILURE, "pcibus_conf_read"
 		    "(bus %d dev %d func %d reg %u)", bus, dev, func, reg);
 	if (printf("%08x\n", value) < 0)
 		err(EXIT_FAILURE, "printf");
+}
 static void
 cmd_write(int argc, char *argv[])
+{
 	int bus, dev, func;
 	u_int reg;
 	pcireg_t value;
 	int ch;
 	bus = pci_businfo.busno;
 	func = 0;
 	dev = -1;
 	while ((ch = getopt(argc, argv, "b:d:f:")) != -1) {
 		switch (ch) {
 		case 'b':
 			bus = parse_bdf(optarg);
 			break;
 		case 'd':
 			dev = parse_bdf(optarg);
 			break;
 		case 'f':
 			func = parse_bdf(optarg);
 			break;
 		default:
 			usage();
+		}
+	}
 	argv += optind;
 	argc -= optind;
 	if (argc != 2)
 		usage();
 	reg = parse_reg(argv[0]);
 	__CTASSERT(sizeof(value) == sizeof(u_int));
 	value = parse_reg(argv[1]);
 	if (pcibus_conf_write(pcifd, bus, dev, func, reg, value) == -1)
 		err(EXIT_FAILURE, "pcibus_conf_write"
 		    "(bus %d dev %d func %d reg %u value 0x%x)",
 		    bus, dev, func, reg, value);
+}
 static int
 parse_bdf(const char *str)
+{
 	long value;
 	char *end;
 	if (strcmp(str, "all") == 0 ||
 	    strcmp(str, "any") == 0)
 		return (-1);
 	errno = 0;
 	value = strtol(str, &end, 0);
-	if (*end != '\0')
+	if ((str[0] == '\0') || (*end != '\0'))
 		errx(EXIT_FAILURE, "\"%s\" is not a number", str);
 	if ((errno == ERANGE) && ((value == LONG_MIN) || (value == LONG_MAX)))
 		errx(EXIT_FAILURE, "out of range: %s", str);
 	if ((value < INT_MIN) || (INT_MAX < value))
 		errx(EXIT_FAILURE, "out of range: %lu", value);
 	return value;
+}
 static u_int
 parse_reg(const char *str)
+{
 	unsigned long value;
 	char *end;
 	errno = 0;
 	value = strtoul(str, &end, 0);
 	if (*end != '\0')
 		errx(EXIT_FAILURE, "\"%s\" is not a number", str);
 	if ((errno == ERANGE) && (value == ULONG_MAX))
 		errx(EXIT_FAILURE, "out of range: %s", str);
 	if (UINT_MAX < value)
 		errx(EXIT_FAILURE, "out of range: %lu", value);
 	return value;
+}
 static void
 scan_pci(int busarg, int devarg, int funcarg, void (*cb)(u_int, u_int, u_int))
+{
 	u_int busmin, busmax;
 	u_int devmin, devmax;
 	u_int funcmin, funcmax;
 	u_int bus, dev, func;
 	pcireg_t id, bhlcr;