summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/man/man4/alc.44
-rw-r--r--share/man/man4/sfxge.410
-rw-r--r--share/man/man5/tmpfs.556
-rw-r--r--share/man/man9/ifnet.914
-rw-r--r--share/misc/bsd-family-tree113
-rw-r--r--share/misc/pci_vendors222
-rw-r--r--share/misc/scsi_modes187
-rw-r--r--share/mk/bsd.README76
-rw-r--r--share/mk/bsd.own.mk36
-rw-r--r--share/mk/bsd.snmpmod.mk14
-rw-r--r--share/skel/dot.shrc8
-rw-r--r--share/zoneinfo/Makefile6
12 files changed, 570 insertions, 176 deletions
diff --git a/share/man/man4/alc.4 b/share/man/man4/alc.4
index b67e31d..1fff8ba 100644
--- a/share/man/man4/alc.4
+++ b/share/man/man4/alc.4
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 8, 2014
+.Dd August 22, 2016
.Dt ALC 4
.Os
.Sh NAME
@@ -122,6 +122,8 @@ Atheros AR8171 PCI Express Gigabit Ethernet controller
Atheros AR8172 PCI Express Fast Ethernet controller
.It
Killer E2200 Gigabit Ethernet controller
+.It
+Killer E2400 Gigabit Ethernet controller
.El
.Sh LOADER TUNABLES
Tunables can be set at the
diff --git a/share/man/man4/sfxge.4 b/share/man/man4/sfxge.4
index 40f324c..9e80991 100644
--- a/share/man/man4/sfxge.4
+++ b/share/man/man4/sfxge.4
@@ -158,6 +158,16 @@ port will be the value of
.Va hw.sfxge.mcdi_logging.
The logging may also be enabled or disabled after the driver is loaded using the sysctl
.Va dev.sfxge.%d.mcdi_logging.
+.It Va hw.sfxge.stats_update_period_ms
+Period in milliseconds to refresh interface statistics from hardware.
+The accepted range is 0 to 65535, the default is 1000 (1 second).
+Use zero value to disable periodic statistics update.
+Supported on SFN8xxx series adapters with firmware v6.2.1.1033 and later and
+SFN5xxx and SFN6xxx series adapters.
+SFN7xxx series adapters and SFN8xxx series with earlier firmware use a
+fixed 1000 milliseconds statistics update period.
+The period may also be changed after the driver is loaded using the sysctl
+.Va dev.sfxge.%d.stats_update_period_ms .
.El
.Sh SUPPORT
For general information and support,
diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5
index 78568d2..6f785de 100644
--- a/share/man/man5/tmpfs.5
+++ b/share/man/man5/tmpfs.5
@@ -1,7 +1,12 @@
.\"-
.\" Copyright (c) 2007 Xin LI
+.\" Copyright (c) 2017 The FreeBSD Foundation, Inc.
.\" All rights reserved.
.\"
+.\" Part of this documentation was written by
+.\" Konstantin Belousov <kib@FreeBSD.org> under sponsorship
+.\" from the FreeBSD Foundation.
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -49,12 +54,12 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 23, 2012
+.Dd January 20, 2017
.Dt TMPFS 5
.Os
.Sh NAME
.Nm tmpfs
-.Nd "efficient memory file system"
+.Nd "in-memory file system"
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following line in your
@@ -72,17 +77,40 @@ tmpfs_load="YES"
.Sh DESCRIPTION
The
.Nm
-driver will permit the
-.Fx
-kernel to access
+driver implements an in-memory, or
.Tn tmpfs
-file systems.
+file system.
+The filesystem stores both file metadata and data in main memory.
+This allows very fast and low latency accesses to the data.
+The data is volatile.
+An umount or system reboot invalidates it.
+These properties make the filesystem's mounts suitable for fast
+scratch storage, like
+.Pa /tmp .
+.Pp
+If the system becomes low on memory and swap is configured (see
+.Xr swapon 8 ),
+the system can transfer file data to swap space, freeing memory
+for other needs.
+Metadata, including the directory content, is never swapped out by the
+current implementation.
+Keep this in mind when planning the mount limits, especially when expecting
+to place many small files on a tmpfs mount.
+.Pp
+When
+.Xr mmap 2
+is used on a file from a tmpfs mount, the swap VM object managing the
+file pages is used to implement mapping and avoid double-copying of
+the file data.
+This quirk causes process inspection tools, like
+.Xr procstat 1 ,
+to report anonymous memory mappings instead of file mappings.
.Sh OPTIONS
The following options are available when
mounting
.Nm
file systems:
-.Bl -tag -width indent
+.Bl -tag -width "It Cm maxfilesize"
.It Cm gid
Specifies the group ID of the root inode of the file system.
Defaults to the mount point's GID.
@@ -92,6 +120,10 @@ Defaults to the mount point's UID.
.It Cm mode
Specifies the mode (in octal notation) of the root inode of the file system.
Defaults to the mount point's mode.
+.It Cm nonc
+Do not use namecache to resolve names to files for the created mount.
+This saves memory, but currently might impair scalability for highly
+used mounts on large machines.
.It Cm inodes
Specifies the maximum number of nodes available to the file system.
If not specified, the file system chooses a reasonable maximum based on
@@ -114,11 +146,15 @@ memory file system:
.Pp
.Dl "mount -t tmpfs tmpfs /tmp"
.Sh SEE ALSO
+.Xr procstat 1 ,
.Xr nmount 2 ,
+.Xr mmap 2 ,
.Xr unmount 2 ,
.Xr fstab 5 ,
.Xr mdmfs 8 ,
-.Xr mount 8
+.Xr mount 8 ,
+.Xr swapinfo 8 ,
+.Xr swapon 8
.Sh HISTORY
The
.Nm
@@ -130,7 +166,7 @@ The
.Nm
kernel implementation was written by
.An Julio M. Merino Vidal Aq jmmv@NetBSD.org
-as a Google SoC project.
+as a Google Summer of Code project.
.Pp
.An Rohit Jalan
and others ported it from
@@ -140,5 +176,3 @@ to
.Pp
This manual page was written by
.An Xin LI Aq delphij@FreeBSD.org .
-.Sh BUGS
-Some file system mount time options may not be well-supported.
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index 8cb436f7..43ab012 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 26, 2013
+.Dd July 11, 2016
.Dt IFNET 9
.Os
.Sh NAME
@@ -795,18 +795,6 @@ The interface will compute IP checksums.
The interface will compute TCP checksums.
.It Dv CSUM_UDP
The interface will compute UDP checksums.
-.It Dv CSUM_IP_FRAGS
-The interface can compute a TCP or UDP checksum for a packet
-fragmented by the host CPU.
-Makes sense only along with
-.Dv CSUM_TCP
-or
-.Dv CSUM_UDP .
-.It Dv CSUM_FRAGMENT
-The interface will do the fragmentation of IP packets if necessary.
-The host CPU does not need to care about MTU on this interface
-as long as a packet to transmit through it is an IP one and it
-does not exceed the size of the hardware buffer.
.El
.Pp
An interface notifies the TCP/IP module about the tasks
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index c3a2d25..ff36c6f 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -258,6 +258,9 @@ FreeBSD 5.2 | | | |
| | 8.3 | | | | | |
| | | | | | NetBSD | |
| | | | | | 5.1.3 | |
+ | | | | | | | | |
+ | | | | | | NetBSD | |
+ | | | | | | 5.1.4 | |
| | | | | | OpenBSD 5.1 |
| | | Mac OS X | `----. | |
| | | 10.8 | \ | |
@@ -268,14 +271,17 @@ FreeBSD 5.2 | | | |
| | | | | | | | | |
| | | | | | | NetBSD | |
| | | | | | | 5.2.1 | |
+ | | | | | | | | | |
+ | | | | | | | NetBSD | |
+ | | | | | | | 5.2.2 | |
| | | | | | | | |
| | | | | | \ | |
| | | | | | NetBSD | |
| | | | | | 6.0.1 | |
- | | | | | | | | |
+ | | | | | | | OpenBSD 5.3 DragonFly 3.4.1
| | | | | | NetBSD | |
| | | | | | 6.0.2 | |
- | | | | | | | OpenBSD 5.3 DragonFly 3.4.1
+ | | | | | | | | |
| | | | | | NetBSD | |
| | | | | | 6.0.3 | |
| | | | | | | | |
@@ -296,25 +302,55 @@ FreeBSD 5.2 | | | |
| \ | | | | |
*--FreeBSD | | | NetBSD 6.1.3 | |
| 10.0 | | | | | |
- | | | | | | DragonFly 3.6.1
- | | | | | | |
- | | | | | | |
- | | | | | | DragonFly 3.6.2
- | | | | NetBSD 6.1.4 | |
- | | | | | |
- | | | | OpenBSD 5.5 |
- | | | | | DragonFly 3.8.0
- | FreeBSD | | | |
- | 9.3 | | | |
- | | | | |
- | | | | |
- | | | | |
- | | | | |
- | | | | |
- | | | | |
+ | | | | | | | DragonFly 3.6.1
+ | | | | | | | |
+ | | | | | | | |
+ | | | | | | | DragonFly 3.6.2
+ | | | | | NetBSD 6.1.4 | |
+ | | | | | | | |
+ | | | | | | OpenBSD 5.5 |
+ | | | | | | | |
+ | | | | | | | DragonFly 3.8.0
+ | | | | | | | |
+ | | | | | | | |
+ | | | | | | | DragonFly 3.8.1
+ | | | | | | | |
+ | | | | | | | |
+ | | | | | | | DragonFly 3.6.3
+ | | | | | | | |
+ | | FreeBSD | | | | |
+ | | 9.3 | | | | |
+ | | | | NetBSD 6.1.5 | DragonFly 3.8.2
+ | | Mac OS X | | |
+ | | 10.10 | | |
+ | | | | OpenBSD 5.6 |
+ | FreeBSD | | | |
+ | 10.1 | | | DragonFly 4.0.1
+ | | | | | |
+ | | | | | DragonFly 4.0.2
+ | | | | | |
+ | | | | | DragonFly 4.0.3
+ | | | | | |
+ | | | | | DragonFly 4.0.4
+ | | | | | |
+ | | | | | DragonFly 4.0.5
+ | | | | | |
+ | | | | OpenBSD 5.7 |
+ | | | | | DragonFly 4.2.0
+ | FreeBSD | | | |
+ | 10.2 | | | |
+ | | OS X NetBSD 7.0 | |
+ | | 10.11 | OpenBSD 5.8 |
+ | | | | | DragonFly 4.4.1
+ | FreeBSD | | OpenBSD 5.9 |
+ | 10.3 | | | |
+ | | NetBSD 7.0.1 | |
+ | | | | DragonFly 4.6.0
+ *--FreeBSD | | OpenBSD 6.0 |
+ | 11.0 | | | |
| | | | |
| | | | |
-FreeBSD 11 -current | NetBSD -current OpenBSD -current DragonFly -current
+FreeBSD 12 -current | NetBSD -current OpenBSD -current DragonFly -current
| | | | |
v v v v v
@@ -632,15 +668,42 @@ Mac OS X 10.9 2013-10-22 [APL]
OpenBSD 5.4 2013-11-01 [OBD]
DragonFly 3.6.0 2013-11-25 [DFB]
FreeBSD 10.0 2014-01-20 [FBD]
-NetBSD 6.0.4 2014-01-27 [NBD]
-NetBSD 6.1.3 2014-01-27 [NBD]
+NetBSD 5.1.4 2014-01-25 [NBD]
+NetBSD 5.2.2 2014-01-25 [NBD]
+NetBSD 6.0.4 2014-01-25 [NBD]
+NetBSD 6.1.3 2014-01-25 [NBD]
DragonFly 3.6.1 2014-02-22 [DFB]
DragonFly 3.6.2 2014-04-10 [DFB]
-NetBSD 6.0.5 2014-04-19 [NDB]
-NetBSD 6.1.4 2014-04-19 [NDB]
+NetBSD 6.0.5 2014-04-12 [NDB]
+NetBSD 6.1.4 2014-04-12 [NDB]
OpenBSD 5.5 2014-05-01 [OBD]
DragonFly 3.8.0 2014-06-04 [DFB]
+DragonFly 3.8.1 2014-06-16 [DFB]
+DragonFly 3.6.3 2014-06-17 [DFB]
FreeBSD 9.3 2014-07-05 [FBD]
+DragonFly 3.8.2 2014-08-08 [DFB]
+NetBSD 6.1.5 2014-09-22 [NBD]
+Mac OS X 10.10 2014-10-16 [APL]
+OpenBSD 5.6 2014-11-01 [OBD]
+FreeBSD 10.1 2014-11-14 [FBD]
+DragonFly 4.0.1 2014-11-25 [DFB]
+DragonFly 4.0.2 2015-01-07 [DFB]
+DragonFly 4.0.3 2015-01-21 [DFB]
+DragonFly 4.0.4 2015-03-09 [DFB]
+DragonFly 4.0.5 2015-03-23 [DFB]
+OpenBSD 5.7 2015-05-01 [OBD]
+DragonFly 4.2.0 2015-06-29 [DFB]
+FreeBSD 10.2 2015-08-13 [FBD]
+NetBSD 7.0 2015-09-25 [NBD]
+OS X 10.11 2015-09-30 [APL]
+OpenBSD 5.8 2015-10-18 [OBD]
+DragonFly 4.4.1 2015-12-07 [DFB]
+OpenBSD 5.9 2016-03-29 [OBD]
+FreeBSD 10.3 2016-04-04 [FBD]
+NetBSD 7.0.1 2016-05-22 [NBD]
+DragonFly 4.6.0 2016-08-02 [DFB]
+OpenBSD 6.0 2016-09-01 [OBD]
+FreeBSD 11.0 2016-10-10 [FBD]
Bibliography
------------------------
@@ -660,6 +723,10 @@ McKusick, Marshall Kirk, George Neville-Neil. The Design and
Implementation of the FreeBSD Operating System.
Addison-Wesley Professional, Published: Aug 2, 2004. ISBN 0-201-70245-2
+McKusick, Marshall Kirk, George Neville-Neil, Robert Watson. The
+Design and Implementation of the FreeBSD Operating System, 2nd Edition.
+Pearson Education, Inc., 2014. ISBN 0-321-96897-2
+
Doug McIlroy. Research Unix Reader.
Michael G. Brown. The Role of BSD in the Development of Unix.
diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors
index 6254a60..7ffc6df 100644
--- a/share/misc/pci_vendors
+++ b/share/misc/pci_vendors
@@ -3,8 +3,8 @@
#
# List of PCI ID's
#
-# Version: 2016.11.21
-# Date: 2016-11-21 03:15:01
+# Version: 2017.01.08
+# Date: 2017-01-08 03:15:02
#
# Maintained by Albert Pool, Martin Mares, and other volunteers from
# the PCI ID Project at http://pci-ids.ucw.cz/.
@@ -249,6 +249,7 @@
0014 MegaRAID Tri-Mode SAS3516
1028 1fd4 PERC H745P MX
1d49 0602 ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter
+ 0015 MegaRAID Tri-Mode SAS3416
0016 MegaRAID Tri-Mode SAS3508
1028 1fc9 PERC H840 Adapter
1028 1fcb PERC H740P Adapter
@@ -548,6 +549,7 @@
1028 1f53 HBA330 Mini
1028 1fd2 HBA330 MX
1028 1fd3 HBA330 MMZ
+ 1bd4 0011 Inspur 12Gb 8i-3008 IT SAS HBA
00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
00ac SAS3416 Fusion-MPT Tri-Mode I/O Controller Chip (IOC)
1d49 0201 ThinkSystem 430-16i SAS/SATA 12Gb HBA
@@ -2201,6 +2203,11 @@
67b9 Vesuvius [Radeon R9 295X2]
67be Hawaii LE
67c0 Ellesmere [Polaris10]
+ 67c4 Ellesmere [Radeon Pro WX 7100]
+ 67c7 Ellesmere [Radeon Pro WX 5100]
+ 67ca Ellesmere [Polaris10]
+ 67cc Ellesmere [Polaris10]
+ 67cf Ellesmere [Polaris10]
67df Ellesmere [Radeon RX 470/480]
1002 0b37 Radeon RX 480
1043 04a8 Radeon RX 480
@@ -2218,6 +2225,7 @@
1787 a480 Radeon RX 480
67e0 Baffin [Polaris11]
67e1 Baffin [Polaris11]
+ 67e3 Baffin [Radeon Pro WX 4100]
67e8 Baffin [Polaris11]
67e9 Baffin [Polaris11]
67eb Baffin [Polaris11]
@@ -2924,6 +2932,12 @@
148c 9380 Radeon R9 380
# Make naming scheme consistent
174b e308 Radeon R9 380 Nitro 4G D5
+ 6980 Polaris12
+ 6981 Polaris12
+ 6985 Polaris12
+ 6986 Polaris12
+ 6987 Polaris12
+ 699f Polaris12
700f RS100 AGP Bridge
7010 RS200/RS250 AGP Bridge
7100 R520 [Radeon X1800 XT]
@@ -5095,6 +5109,7 @@
0675 1704 ISDN Adapter (PCI Bus, D, C)
0675 1707 ISDN Adapter (PCI Bus, DV, W)
10cf 105e ISDN Adapter (PCI Bus, DV, W)
+ 13a0 Transformer Book T101HA-GR030R
# Should be 1022:9602
9602 AMD RS780/RS880 PCI to PCI bridge (int gfx)
1043 83a2 M4A785TD Motherboard
@@ -10077,6 +10092,7 @@
10c3 GT218 [GeForce 8400 GS Rev. 3]
10c5 GT218 [GeForce 405]
10d8 GT218 [NVS 300]
+ 10ef GP102 HDMI Audio Controller
10f0 GP104 High Definition Audio Controller
1140 GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M]
1019 0799 GeForce 820M
@@ -10620,7 +10636,7 @@
13f1 GM204GL [Quadro M4000]
13f2 GM204GL [Tesla M60]
13f3 GM204GL [Tesla M6]
- 13f8 GM204GLM [Quadro M5000M]
+ 13f8 GM204GLM [Quadro M5000M / M5000 SE]
13f9 GM204GLM [Quadro M4000M]
13fa GM204GLM [Quadro M3000M]
10de 11c9 Quadro M3000 SE
@@ -10634,8 +10650,9 @@
1431 GM206GL [Tesla M4]
15f0 GP100GL
15f1 GP100GL
- 15f8 GP100GL
- 15f9 GP100GL
+ 15f7 GP100GL [Tesla P100 PCIe 12GB]
+ 15f8 GP100GL [Tesla P100 PCIe 16GB]
+ 15f9 GP100GL [Tesla P100 SMX2 16GB]
1617 GM204M [GeForce GTX 980M]
1618 GM204M [GeForce GTX 970M]
1619 GM204M [GeForce GTX 965M]
@@ -10659,10 +10676,12 @@
1b81 GP104 [GeForce GTX 1070]
1b82 GP104
1b83 GP104
+ 1b84 GP104 [GeForce GTX 1060 3GB]
1ba0 GP104M [GeForce GTX 1080]
1ba1 GP104M [GeForce GTX 1070]
1bb0 GP104GL [Quadro P5000]
1bb1 GP104GL
+ 1bb3 GP104GL [Tesla P4]
1bb4 GP104GL
1be0 GP104M [GeForce GTX 1080]
1be1 GP104M [GeForce GTX 1070]
@@ -10678,6 +10697,9 @@
1c80 GP107
1c81 GP107 [GeForce GTX 1050]
1c82 GP107 [GeForce GTX 1050 Ti]
+ 1c8c GP107M [GeForce GTX 1050 Ti]
+ 1c8d GP107M [GeForce GTX 1050]
+ 1c8e GP107M
1ca7 GP107GL
1ca8 GP107GL
1caa GP107GL
@@ -12103,7 +12125,11 @@
111f Precision Digital Images
4a47 Precision MX Video engine interface
5243 Frame capture bus interface
-1120 EMC Corporation
+# formerly EMC Corporation
+1120 Dell EMC
+ 2306 Unity Fibre Channel Controller
+ 2501 Unity Ethernet Controller
+ 2505 Unity Fibre Channel Controller
1121 Zilog
1122 Multi-tech Systems, Inc.
1123 Excellent Design, Inc.
@@ -15975,7 +16001,7 @@
5081 T540-5081 Unified Wire Ethernet Controller
5082 T504-5082 Unified Wire Ethernet Controller
5083 T540-5083 Unified Wire Ethernet Controller
- 5084 T580-5084 Unified Wire Ethernet Controller
+ 5084 T540-5084 Unified Wire Ethernet Controller
5085 T580-5085 Unified Wire Ethernet Controller
5086 T580-5086 Unified Wire Ethernet Controller
5087 T580-5087 Unified Wire Ethernet Controller
@@ -15994,6 +16020,7 @@
509a T520-509A Unified Wire Ethernet Controller
509b T540-509B Unified Wire Ethernet Controller
509c T520-509C Unified Wire Ethernet Controller
+ 509d T540-509D Unified Wire Ethernet Controller
5401 T520-CR Unified Wire Ethernet Controller
5402 T522-CR Unified Wire Ethernet Controller
5403 T540-CR Unified Wire Ethernet Controller
@@ -16041,6 +16068,7 @@
549a T520-509A Unified Wire Ethernet Controller
549b T540-509B Unified Wire Ethernet Controller
549c T520-509C Unified Wire Ethernet Controller
+ 549d T540-509D Unified Wire Ethernet Controller
5501 T520-CR Unified Wire Storage Controller
5502 T522-CR Unified Wire Storage Controller
5503 T540-CR Unified Wire Storage Controller
@@ -16088,6 +16116,7 @@
559a T520-509A Unified Wire Storage Controller
559b T540-509B Unified Wire Storage Controller
559c T520-509C Unified Wire Storage Controller
+ 559d T540-509D Unified Wire Storage Controller
5601 T520-CR Unified Wire Storage Controller
5602 T522-CR Unified Wire Storage Controller
5603 T540-CR Unified Wire Storage Controller
@@ -16135,6 +16164,7 @@
569a T520-509A Unified Wire Storage Controller
569b T540-509B Unified Wire Storage Controller
569c T520-509C Unified Wire Storage Controller
+ 569d T540-509D Unified Wire Storage Controller
5701 T520-CR Unified Wire Ethernet Controller
5702 T522-CR Unified Wire Ethernet Controller
5703 T540-CR Unified Wire Ethernet Controller
@@ -16221,6 +16251,7 @@
589a T520-509A Unified Wire Ethernet Controller [VF]
589b T540-509B Unified Wire Ethernet Controller [VF]
589c T520-509C Unified Wire Ethernet Controller [VF]
+ 589d T540-509D Unified Wire Ethernet Controller [VF]
6001 T6225-CR Unified Wire Ethernet Controller
6002 T6225-SO-CR Unified Wire Ethernet Controller
6003 T6425-CR Unified Wire Ethernet Controller
@@ -16357,7 +16388,8 @@
144d Samsung Electronics Co Ltd
1600 Apple PCIe SSD
a800 XP941 PCIe SSD
- a802 NVMe SSD Controller
+ a802 NVMe SSD Controller SM951/PM951
+ a804 NVMe SSD Controller SM961/PM961
a820 NVMe SSD Controller 171X
1028 1f95 Express Flash NVMe XS1715 SSD 400GB
1028 1f96 Express Flash NVMe XS1715 SSD 800GB
@@ -17968,11 +18000,13 @@
15b3 Mellanox Technologies
0191 MT25408 [ConnectX IB Flash Recovery]
01f6 MT27500 Family [ConnectX-3 Flash Recovery]
+ 01f8 MT27520 Family [ConnectX-3 Pro Flash Recovery]
01ff MT27600 Family [Connect-IB Flash Recovery]
0209 MT27700 Family [ConnectX-4 Flash Recovery]
020b MT27710 Family [ConnectX-4 Lx Flash Recovery]
020d MT28800 Family [ConnectX-5 Flash Recovery]
020f MT28908A0 Family [ConnectX-6 Flash Recovery]
+ 0211 MT416842 Family [BlueField SoC Flash Recovery]
# reserved for RM#105916
024e MT53100 [Spectrum-2, Flash recovery mode]
# Actual value to be used
@@ -18732,6 +18766,7 @@
7013 AP440-3: 32-Channel Isolated Digital Input Module
7014 AP445: 32-Channel Isolated Digital Output Module
7016 AP470 48-Channel TTL Level Digital Input/Output Module
+ 7017 AP323 16-bit, 20 or 40 Channel Analog Input Module
7018 AP408: 32-Channel Digital I/O Module
701a AP220-16 12-Bit, 16-Channel Analog Output Module
701b AP231-16 16-Bit, 16-Channel Analog Output Module
@@ -18992,6 +19027,7 @@
1160 ARC-1160 16-Port PCI-X to SATA RAID Controller
1170 ARC-1170 24-Port PCI-X to SATA RAID Controller
1201 ARC-1200 2-Port PCI-Express to SATA II RAID Controller
+ 1203 ARC-1203 2/4/8 Port PCIe 2.0 to SATA 6Gb RAID Controller
1210 ARC-1210 4-Port PCI-Express to SATA RAID Controller
1214 ARC-12x4 PCIe 2.0 to SAS/SATA 6Gb RAID Controller
17d3 1214 ARC-1214 4-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
@@ -19510,7 +19546,7 @@
1924 5105 SFN4111T-R5
1924 5201 SFN4112F-R1
1924 5202 SFN4112F-R2
- 0803 SFC9020 [Solarstorm]
+ 0803 SFC9020 10G Ethernet Controller
1014 0478 2-port 10GbE Low-Latency (R7)
1014 0479 2-port 10GbE OpenOnload (R7)
1014 04a7 Solarflare 10Gb Low-latency Dual-port HBA (R7)
@@ -19540,7 +19576,7 @@
1924 7207 SFN5162F-R7 SFP+ Server Adapter
1924 7a06 SFN5152F-R6 SFP+ Server Adapter
1924 7a07 SFN5152F-R7 SFP+ Server Adapter
- 0813 SFL9021 [Solarstorm]
+ 0813 SFL9021 10GBASE-T Ethernet Controller
1924 6100 SFN5121T-R0 10GBASE-T Server Adapter
1924 6102 SFN5121T-R2 10GBASE-T Server Adapter
1924 6103 SFN5121T-R3 10GBASE-T Server Adapter
@@ -19549,7 +19585,7 @@
1924 6904 SFN5111T-R4 10GBASE-T Server Adapter
1924 7104 SFN5161T-R4 10GBASE-T Server Adapter
1924 7904 SFN5151T-R4 10GBASE-T Server Adapter
- 0903 SFC9120
+ 0903 SFC9120 10G Ethernet Controller
1014 04cc SFN7122F-R2 2x10GbE SFP+ Flareon Ultra
1924 8002 SFN7122F-R1 SFP+ Server Adapter
1924 8003 SFN7x41Q-R1 Flareon Ultra 7000 Series 10/40G Adapter
@@ -19561,11 +19597,11 @@
1924 800d SFN7x02F-R3 Flareon 7000 Series 10G Adapter
1924 8010 SFA7942Q-R1 QSFP+ AOE Adapter
1924 8015 SFA7942Q-A5-0-R1 QSFP+ AOE Adapter
- 0923 SFC9140
+ 0923 SFC9140 10/40G Ethernet Controller
1924 800b SFN7x42Q-R1 Flareon Ultra 7000 Series 10/40G Adapter
1924 800e SFN7x42Q-R2 Flareon Ultra 7000 Series 10/40G Adapter
1924 800f SFN7xx4F-R1 Flareon Ultra 7000 Series 10G Adapter
- 0a03 SFC9220
+ 0a03 SFC9220 10/40G Ethernet Controller
1924 8011 SFN 8022-R1 Solarflare Flareon 8000 Series 10G Adapter
1924 8012 SFN8522-R1 Flareon Ultra 8000 Series 10G Adapter
1924 8013 SFN8042-R1 Solarflare Flareon 8000 Series 10/40G Adapter
@@ -19574,10 +19610,11 @@
1924 8017 SFN8522-R2 Flareon Ultra 8000 Series 10G Adapter
1924 8018 SFN8042-R2 Flareon 8000 Series 10/40G Adapter
1924 8019 SFN8542-R2 Flareon Ultra 8000 Series 10/40G Adapter
- 1803 SFC9020 Virtual Function [Solarstorm]
- 1813 SFL9021 Virtual Function [Solarstorm]
- 1903 SFC9120 Virtual Function
- 1923 SFC9140 Virtual Function
+ 1803 SFC9020 10G Ethernet Controller (Virtual Function)
+ 1813 SFL9021 10GBASE-T Ethernet Controller (Virtual Function)
+ 1903 SFC9120 10G Ethernet Controller (Virtual Function)
+ 1923 SFC9140 10/40G Ethernet Controller (Virtual Function)
+ 1a03 SFC9220 10/40G Ethernet Controller (Virtual Function)
6703 SFC4000 rev A iSCSI/Onload [Solarstorm]
10b8 0102 SMC10GPCIe-10BT (A2) [TigerCard]
10b8 0103 SMC10GPCIe-10BT (A3) [TigerCard]
@@ -19864,6 +19901,7 @@
5801 DDRdrive X1
5808 DDRdrive X8
dd52 DDRdrive X1-30
+19e5 Huawei Technologies Co., Ltd.
19e7 NET (Network Equipment Technologies)
1001 STIX DSP Card
1002 STIX - 1 Port T1/E1 Card
@@ -20303,6 +20341,8 @@
0303 Simulyzer-RT CompactPCI Serial PSI5-SIM-1 card
0304 Simulyzer-RT CompactPCI Serial PWR-ANA-1 card
0305 Simulyzer-RT CompactPCI Serial CAN-1 card
+1cd7 Nanjing Magewell Electronics Co., Ltd.
+ 0010 Pro Capture Endpoint
1cdd secunet Security Networks AG
1ce4 Exablaze
0001 ExaNIC X4
@@ -20310,6 +20350,7 @@
0003 ExaNIC X10
0004 ExaNIC X10-GM
0005 ExaNIC X40
+ 0006 ExaNIC X10-HPT
1cf7 Subspace Dynamics
1d00 Pure Storage
1d1d CNEX Labs
@@ -21336,6 +21377,27 @@
0813 Moorestown SC DMA
0814 Moorestown LPE DMA
0815 Moorestown SSP0
+ 0817 Medfield Serial IO I2C Controller #3
+ 0818 Medfield Serial IO I2C Controller #4
+ 0819 Medfield Serial IO I2C Controller #5
+ 081a Medfield GPIO Controller [Core]
+ 081b Medfield Serial IO HSUART Controller #1
+ 081c Medfield Serial IO HSUART Controller #2
+ 081d Medfield Serial IO HSUART Controller #3
+ 081e Medfield Serial IO HSUART DMA Controller
+ 081f Medfield GPIO Controller [AON]
+ 0820 Medfield SD Host Controller
+ 0821 Medfield SDIO Controller #1
+ 0822 Medfield SDIO Controller #2
+ 0823 Medfield eMMC Controller #0
+ 0824 Medfield eMMC Controller #1
+ 0827 Medfield Serial IO DMA Controller
+ 0828 Medfield Power Management Unit
+ 0829 Medfield USB Device Controller (OTG)
+ 082a Medfield SCU IPC
+ 082c Medfield Serial IO I2C Controller #0
+ 082d Medfield Serial IO I2C Controller #1
+ 082e Medfield Serial IO I2C Controller #2
0885 Centrino Wireless-N + WiMAX 6150
8086 1305 Centrino Wireless-N + WiMAX 6150 BGN
8086 1307 Centrino Wireless-N + WiMAX 6150 BG
@@ -22445,6 +22507,18 @@
1161 82806AA PCI64 Hub Advanced Programmable Interrupt Controller
8086 1161 82806AA PCI64 Hub APIC
1162 Xscale 80200 Big Endian Companion Chip
+ 1190 Merrifield SD/SDIO/eMMC Controller
+ 1191 Merrifield Serial IO HSUART Controller
+ 1192 Merrifield Serial IO HSUART DMA Controller
+ 1194 Merrifield Serial IO SPI Controller
+ 1195 Merrifield Serial IO I2C Controller
+ 1196 Merrifield Serial IO I2C Controller
+ 1199 Merrifield GPIO Controller
+ 119e Merrifield USB Device Controller (OTG)
+ 11a0 Merrifield SCU IPC
+ 11a1 Merrifield Power Management Unit
+ 11a2 Merrifield Serial IO DMA Controller
+ 11a5 Merrifield Serial IO PWM Controller
1200 IXP1200 Network Processor
172a 0000 AEP SSL Accelerator
1209 8255xER/82551IT Fast Ethernet Controller
@@ -22917,8 +22991,8 @@
103c 0000 HPE Ethernet 10/20Gb 2-port 660FLB Adapter
103c 22fe HPE Ethernet 10/20Gb 2-port 660FLB Adapter
1588 Ethernet Controller XL710 for 20GbE backplane
- 103c 0000 HPE Ethernet 10/20Gb 2-port 660M Adapter
- 103c 22ff HPE Ethernet 10/20Gb 2-port 660M Adapter
+ 103c 0000 Ethernet 10/20Gb 2-port 660M Adapter
+ 103c 22ff Ethernet 10/20Gb 2-port 660M Adapter
1589 Ethernet Controller X710/X557-AT 10GBASE-T
108e 0000 Quad Port 10GBase-T Adapter
108e 7b1c Quad Port 10GBase-T Adapter
@@ -22951,12 +23025,17 @@
15ac Ethernet Connection X552 10 GbE SFP+
15ad Ethernet Connection X552/X557-AT 10GBASE-T
15ae Ethernet Connection X552 1000BASE-T
+ 15b0 Ethernet Connection X552 Backplane
15b4 X553 Virtual Function
15b5 DSL6340 USB 3.1 Controller [Alpine Ridge]
15b6 DSL6540 USB 3.1 Controller [Alpine Ridge]
15b7 Ethernet Connection (2) I219-LM
15b8 Ethernet Connection (2) I219-V
15b9 Ethernet Connection (3) I219-LM
+ 15bb Ethernet Connection (7) I219-LM
+ 15bc Ethernet Connection (7) I219-V
+ 15bd Ethernet Connection (6) I219-LM
+ 15be Ethernet Connection (6) I219-V
15bf JHL6240 Thunderbolt 3 NHI (Low Power) [Alpine Ridge LP 2016]
15c0 JHL6240 Thunderbolt 3 Bridge (Low Power) [Alpine Ridge LP 2016]
15c5 X553 Virtual Function
@@ -24258,6 +24337,9 @@
24f4 Wireless 8260
# Snow Field Peak AC
8086 0030 Dual Band Wireless-AC 8260
+ 24fd Wireless 8265 / 8275
+# Windstorm Peak
+ 8086 0010 Dual Band Wireless-AC 8265
2500 82820 820 (Camino) Chipset Host Bridge (MCH)
1028 0095 Precision Workstation 220 Chipset
1043 801c P3C-2000 system chipset
@@ -25145,12 +25227,12 @@
1028 01da OptiPlex 745
1462 7235 P965 Neo MS-7235 mainboard
2826 C600/X79 series chipset SATA RAID Controller
- 1d49 0100 ThinkSystem RAID 331
- 1d49 0101 ThinkSystem RAID 331
- 1d49 0102 ThinkSystem RAID 331
- 1d49 0103 ThinkSystem RAID 331
- 1d49 0104 ThinkSystem RAID 331
- 1d49 0105 ThinkSystem RAID 331
+ 1d49 0100 Intel RSTe SATA Software RAID
+ 1d49 0101 Intel RSTe SATA Software RAID
+ 1d49 0102 Intel RSTe SATA Software RAID
+ 1d49 0103 Intel RSTe SATA Software RAID
+ 1d49 0104 Intel RSTe SATA Software RAID
+ 1d49 0105 Intel RSTe SATA Software RAID
2827 C610/X99 series chipset sSATA Controller [RAID mode]
2828 82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [IDE mode]
1028 01f3 Inspiron 1420
@@ -26950,41 +27032,41 @@
530d 80310 (IOP) IO Processor
5845 QEMU NVM Express Controller
1af4 1100 QEMU Virtual Machine
- 5a84 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Integrated Graphics Controller
- 5a88 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Imaging Unit
- 5a98 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Audio Cluster
- 5a9a Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Trusted Execution Engine
- 5aa2 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Integrated Sensor Hub
- 5aa8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series USB xHCI
- 5aac Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #1
- 5aae Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #2
- 5ab0 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #3
- 5ab2 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #4
- 5ab4 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #5
- 5ab6 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #6
- 5ab8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #7
- 5aba Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #8
- 5abc Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series HSUART Controller #1
- 5abe Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series HSUART Controller #2
- 5ac0 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series HSUART Controller #3
- 5ac2 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SPI Controller #1
- 5ac4 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SPI Controller #2
- 5ac6 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SPI Controller #3
- 5ac8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PWM Pin Controller
- 5aca Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SDXC/MMC Host Controller
- 5acc Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series eMMC Controller
- 5ad0 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SDIO Controller
- 5ad4 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SMBus Controller
- 5ad6 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port B #1
- 5ad7 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port B #2
- 5ad8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port A #1
- 5ad9 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port A #2
- 5ada Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port A #3
- 5adb Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port A #4
- 5ae3 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SATA AHCI Controller
- 5ae8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Low Pin Count Interface
- 5aee Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series HSUART Controller #4
- 5af0 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Host Bridge
+ 5a84 Celeron N3350/Pentium N4200/Atom E3900 Series Integrated Graphics Controller
+ 5a88 Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit
+ 5a98 Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster
+ 5a9a Celeron N3350/Pentium N4200/Atom E3900 Series Trusted Execution Engine
+ 5aa2 Celeron N3350/Pentium N4200/Atom E3900 Series Integrated Sensor Hub
+ 5aa8 Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI
+ 5aac Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #1
+ 5aae Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #2
+ 5ab0 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #3
+ 5ab2 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #4
+ 5ab4 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #5
+ 5ab6 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #6
+ 5ab8 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #7
+ 5aba Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #8
+ 5abc Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #1
+ 5abe Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #2
+ 5ac0 Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #3
+ 5ac2 Celeron N3350/Pentium N4200/Atom E3900 Series SPI Controller #1
+ 5ac4 Celeron N3350/Pentium N4200/Atom E3900 Series SPI Controller #2
+ 5ac6 Celeron N3350/Pentium N4200/Atom E3900 Series SPI Controller #3
+ 5ac8 Celeron N3350/Pentium N4200/Atom E3900 Series PWM Pin Controller
+ 5aca Celeron N3350/Pentium N4200/Atom E3900 Series SDXC/MMC Host Controller
+ 5acc Celeron N3350/Pentium N4200/Atom E3900 Series eMMC Controller
+ 5ad0 Celeron N3350/Pentium N4200/Atom E3900 Series SDIO Controller
+ 5ad4 Celeron N3350/Pentium N4200/Atom E3900 Series SMBus Controller
+ 5ad6 Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port B #1
+ 5ad7 Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port B #2
+ 5ad8 Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port A #1
+ 5ad9 Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port A #2
+ 5ada Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port A #3
+ 5adb Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port A #4
+ 5ae3 Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller
+ 5ae8 Celeron N3350/Pentium N4200/Atom E3900 Series Low Pin Count Interface
+ 5aee Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #4
+ 5af0 Celeron N3350/Pentium N4200/Atom E3900 Series Host Bridge
65c0 5100 Chipset Memory Controller Hub
65e2 5100 Chipset PCI Express x4 Port 2
65e3 5100 Chipset PCI Express x4 Port 3
@@ -27826,6 +27908,25 @@
a243 Lewisburg LPC or eSPI Controller
a252 Lewisburg SSATA Controller [AHCI mode]
a256 Lewisburg SSATA Controller [RAID mode]
+ a282 200 Series PCH SATA controller [AHCI mode]
+ a294 200 Series PCH PCI Express Root Port #1
+ a2a1 200 Series PCH PMC
+ a2a3 200 Series PCH SMBus Controller
+ a2a7 200 Series PCH Serial IO UART Controller #0
+ a2a8 200 Series PCH Serial IO UART Controller #1
+ a2a9 200 Series PCH Serial IO SPI Controller #0
+ a2aa 200 Series PCH Serial IO SPI Controller #1
+ a2af 200 Series PCH USB 3.0 xHCI Controller
+ a2b1 200 Series PCH Thermal Subsystem
+ a2ba 200 Series PCH CSME HECI #1
+ a2bb 200 Series PCH CSME HECI #2
+ a2c6 200 Series PCH LPC Controller
+ a2e0 200 Series PCH Serial IO I2C Controller #0
+ a2e1 200 Series PCH Serial IO I2C Controller #1
+ a2e2 200 Series PCH Serial IO I2C Controller #2
+ a2e3 200 Series PCH Serial IO I2C Controller #3
+ a2e6 200 Series PCH Serial IO UART Controller #2
+ a2f0 200 Series PCH HD Audio
a620 6400/6402 Advanced Memory Buffer (AMB)
abc0 Omni-Path Fabric Switch Silicon 100 Series
b152 21152 PCI-to-PCI Bridge
@@ -28605,6 +28706,7 @@ f1d0 AJA Video
cafe Kona SD
cfee Xena LS/SD-22-DA/SD-DA
daff KONA LHi
+ db09 Corvid 24
dcaf Kona HD
dfee Xena HD-DA
efac Xena SD-MM/SD-22-MM
diff --git a/share/misc/scsi_modes b/share/misc/scsi_modes
index 80752e7..f51721a 100644
--- a/share/misc/scsi_modes
+++ b/share/misc/scsi_modes
@@ -49,7 +49,11 @@
# ALL DEVICE TYPES
-0x0a "Control Mode Page" {
+0x0a,0x03 "Command Duration Limit A";
+
+0x0a,0x04 "Command Duration Limit B";
+
+0x0a "Control" {
{TST} t3
{TMF_ONLY} t1
{DPICZ} t1
@@ -71,14 +75,25 @@
{TAS} t1
{ATMPE} t1
{RWWP} t1
- {Reserved} *t1
+ {SBLP (Supported Block Lengths and Protection)} t1
{Autoload Mode} t3
{Ready AEN Holdoff Period} i2
{Busy Timeout Period} i2
{Extended Self-Test Completion Time} i2
}
-0x02 "Disconnect-Reconnect Page" {
+0x0a,0x01 "Control Extension" {
+ {Reserved} *t4
+ {DLC} t1
+ {TCMOS} t1
+ {SCSIP} t1
+ {IALUAE} t1
+ {Reserved} *t4
+ {Initial Command Priority} t4
+ {Maximum Sense Data Length} i1
+}
+
+0x02 "Disconnect-Reconnect" {
{Buffer Full Ratio} i1
{Buffer Empty Ratio} i1
{Bus Inactivity Limit} i2
@@ -92,26 +107,11 @@
{Reserved} *i1
}
-0x15 "Extended Page";
-
-0x16 "Extended Device-Type Specific Page";
+0x15 "Extended";
-0x1c "Informational Exceptions Control Page" {
- {PERF} t1
- {Reserved} *t1
- {EBF} t1
- {EWasc} t1
- {DExcpt} t1
- {TEST} t1
- {EBACKERR} t1
- {LogErr} t1
- {Reserved} *t4
- {MRIE} t4
- {Interval Timer} i4
- {Report Count} i4
-}
+0x16 "Extended Device-Type Specific";
-0x09 "Peripheral Device Page" {
+0x09 "Peripheral Device" {
{Interface Identifier} i2
{Reserved} *i1
{Reserved} *i1
@@ -119,21 +119,69 @@
{Reserved} *i1
}
-0x1a "Power Condition Page" {
- {Reserved} *i1
+0x1a "Power Condition" {
+ {PM_BG_PRECEDENCE} t1
{Reserved} *t6
- {Idle} t1
- {Standby} t1
- {Idle Condition Timer} i4
- {Standby Condition Timer} i4
+ {STANDBY_Y} t1
+ {Reserved} *t4
+ {IDLE_C} t1
+ {IDLE_B} t1
+ {IDLE_A} t1
+ {STANDBY_Z} t1
+ {IDLE_A Condition Timer} i4
+ {STANDBY_Z Condition Timer} i4
+ {IDLE_B Condition Timer} i4
+ {IDLE_C Condition Timer} i4
+ {STANDBY_Y Condition Timer} i4
+ {Reserved} *i4
+ {Reserved} *i4
+ {Reserved} *i4
+ {Reserved} *i3
+ {CCF Idle} t2
+ {CCF Standby} t2
+ {CCF Stopped} t2
+ {Reserved} *t2
}
-0x18 "Protocol-Specific LUN Page";
+0x1a,0x01 "Power Consumption" {
+ {Reserved} *i2
+ {Reserved} *t6
+ {Active Level} t2
+ {Power Consumption Identifier} i1
+ {Reserved} *i4
+ {Reserved} *i4
+}
-0x19 "Protocol-Specific Port Page";
+0x18 "Protocol-Specific Logical Unit";
+
+0x19 "Protocol-Specific Port";
# DIRECT ACCESS DEVICES
-0x08 "Caching Page" {
+
+0x0a,0x02 "Application Tag";
+
+0x1a,0xf1 "ATA Power Condition";
+
+0x1c,0x01 "Background Control" {
+ {Reserved} *t5
+ {S_L_FULL} *t1
+ {LOWIR} *t1
+ {EN_BMS} *t1
+ {Reserved} *t7
+ {EN_PS} *t1
+ {Background Medium Scan Interval Time} i2
+ {Background Pre-Scan Time Limit} i2
+ {Minimum Idle Time Before Background Scan} i2
+ {Maximum Time To Suspend Background Scan} i2
+ {Reserved} *i2
+}
+
+0x0a,0x06 "Background Operation Control" {
+ {BO_MODE} t2
+ {Reserved} *t6
+}
+
+0x08 "Caching" {
{IC} t1
{ABPF} t1
{CAP} t1
@@ -148,9 +196,18 @@
{Minimum Pre-fetch} i2
{Maximum Pre-fetch} i2
{Maximum Pre-fetch Ceiling} i2
+ {FSW (Force Sequential Write)} t1
+ {LBCSS (Logical Block Cache Segment Size)} t1
+ {DRA (Disable Read-Ahead)} t1
+ {Vendor Specific} t2
+ {SYNC_PROG} t1
+ {NV_DIS} t1
+ {Number of Cache Segments} i1
+ {Cache Segment Size} i2
+ {Reserved} *t4
}
-0x05 "Flexible Disk Page" {
+0x05 "Flexible Disk" {
{Transfer rate} i2
{Number of heads} i1
{Sectors per track} i1
@@ -181,7 +238,7 @@
{Reserved} *i1
}
-0x03 "Format Device Page" {
+0x03 "Format Device" {
{Tracks per Zone} i2
{Alternate Sectors per Zone} i2
{Alternate Tracks per Zone} i2
@@ -198,7 +255,34 @@
{Reserved} *t4
}
-0x0b "Medium Types Supported Page" {
+0x0a,0x05 "I/O Advice Hints Grouping";
+
+0x1c "Informational Exceptions Control" {
+ {PERF} t1
+ {Reserved} *t1
+ {EBF} t1
+ {EWasc} t1
+ {DExcpt} t1
+ {TEST} t1
+ {EBACKERR} t1
+ {LogErr} t1
+ {Reserved} *t4
+ {MRIE} t4
+ {Interval Timer} i4
+ {Report Count} i4
+}
+
+0x1c,0x02 "Logical Block Provisioning" {
+ {Reserved} *t7
+ {SITUA} t1
+ {Reserved} *i1
+ {Reserved} *i1
+ {Reserved} *i1
+ {Reserved} *i4
+ {Reserved} *i4
+}
+
+0x0b "Medium Types Supported" {
{Reserved} *i1
{Reserved} *i1
{Medium type one supported} i1
@@ -207,10 +291,11 @@
{Medium type four supported} i1
}
-# Notch page (0x0c)
-0x0c "Notch and Partition Page";
+0x0c "Notch and Partition";
+
+0x0a,0xf1 "PATA Control";
-0x01 "Read-Write Error Recovery Page" {
+0x01 "Read-Write Error Recovery" {
{AWRE (Auto Write Reallocation Enbld)} t1
{ARRE (Auto Read Reallocation Enbld)} t1
{TB (Transfer Block)} t1
@@ -224,13 +309,14 @@
{Head Offset Count} i1
{Data Strobe Offset Count} i1
{LBPERE (LBP Error Reporting Enabled)} t1
- {Reserved} *t7
+ {MWR (Misaligned Write Reporting)} t2
+ {Reserved} *t5
{Write Retry Count} i1
{Reserved} *i1
{Recovery Time Limit} i2
}
-0x04 "Rigid Disk Drive Geometry Page" {
+0x04 "Rigid Disk Drive Geometry" {
{Number of Cylinders} i3
{Number of Heads} i1
{Starting Cylinder-Write Precompensation} i3
@@ -246,7 +332,7 @@
{Reserved} *i1
}
-0x07 "Verify Error Recovery Page" {
+0x07 "Verify Error Recovery" {
{Reserved} *t4
{EER} t1
{PER} t1
@@ -262,7 +348,7 @@
{Verify Recovery Time Limit} i2
}
-0x0E "CD-ROM Audio Control Parameters Page" {
+0x0E "CD-ROM Audio Control Parameters" {
{Reserved} *t5
{Immed} t1
{SOTC} t1
@@ -287,7 +373,7 @@
}
# SEQUENTIAL ACCESS DEVICES
-0x10 "Device Configuration Page" {
+0x10 "Device Configuration" {
{Reserved} *t1
{Change Active Partition} t1
{Change Active Format} t1
@@ -316,7 +402,7 @@
{SCSI-3 Permanent Write Protect} t1
}
-0x0f "Data Compression Page" {
+0x0f "Data Compression" {
{Data Compression Enabled} t1
{Date Compression Capable} t1
{Reserved} *t6
@@ -329,7 +415,7 @@
}
# Removable devices
-0x1b "Removable Block Access Capacities Page" {
+0x1b "Removable Block Access Capacities" {
{System Floppy Type Device} t1
{Supports Reporting Format Progress} t1
{Reserved} *t6
@@ -341,7 +427,7 @@
}
# CD-ROM (and CD-R[W]) devices
-0x2a "CD capabilities and mechanical status page" {
+0x2a "CD capabilities and mechanical status" {
{Reserved} *t4
{Method 2} t1
{CD-RW Read} t1
@@ -392,4 +478,17 @@
{Current Write Speed Supported (kBps)} i2
};
+0x1d "Timeout and Protect" {
+ {Reserved} *i2
+ {Reserved} *t4
+ {G3Enable} t1
+ {TMOE} t1
+ {DISP} t1
+ {SWPP} t1
+ {Reserved} *i1
+ {Group 1 Minimum Timeout} i2
+ {Group 2 Minimum Timeout} i2
+ {Group 3 Timeout} i2
+};
+
0x00 "Vendor-Specific";
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index df973d5..ea46202 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -350,6 +350,82 @@ If foo has multiple source files, add the line:
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+The include file, <bsd.snmpmod.mk>, handles building MIB modules for bsnmpd
+from one or more source files, along with their manual pages. It has a
+limited number of suffixes, consistent with the current needs of the BSD
+tree.
+
+bsd.snmpmod.mk leverages bsd.lib.mk for building MIB modules and
+bsd.files.mk for installing MIB description and definition files.
+
+It implements the following additional targets:
+
+ smilint:
+ execute smilint on the MIBs defined by BMIBS.
+
+ The net-mgmt/libsmi package must be installed before
+ executing this target. The net-mgmt/net-snmp package
+ should be installed as well to reduce false positives
+ from smilint.
+
+It sets/uses the following variables:
+
+BMIBS The MIB definitions to install.
+
+BMIBSDIR The directory where the MIB definitions are installed.
+ This defaults to `${SHAREDIR}/snmp/mibs`.
+
+DEFS The MIB description files to install.
+
+DEFSDIR The directory where MIB description files are installed.
+ This defaults to `${SHAREDIR}/snmp/defs`.
+
+EXTRAMIBDEFS Extra MIB description files to use as input when
+ generating ${MOD}_oid.h and ${MOD}_tree.[ch].
+
+EXTRAMIBSYMS Extra MIB definition files used only for extracting
+ symbols.
+
+ EXTRAMIBSYMS are useful when resolving inter-module
+ dependencies and are useful with files containing only
+ enum-definitions.
+
+ See ${MOD}_oid.h for more details.
+
+LOCALBASE The package root where smilint and the net-snmp
+ definitions can be found
+
+MOD The bsnmpd module name.
+
+SMILINT smilint binary to use with the smilint make target.
+
+SMILINT_FLAGS flags to pass to smilint.
+
+SMIPATH A colon-separated directory path where MIBs definitions
+ can be found. See "SMIPATH" in smi_config for more
+ details.
+
+XSYM MIB names to extract symbols for. See ${MOD}_oid.h for
+ more details.
+
+It generates the following files:
+
+${MOD}_tree.c A source file and header which programmatically describes
+${MOD}_tree.h the MIB (type, OID name, ACCESS attributes, etc).
+
+ The files are generated via "gensnmptree -p".
+
+ See gensnmptree(1) for more details.
+
+${MOD}_oid.h A header which programmatically describes the MIB root and
+ MIB tables.
+
+ The files are generated via "gensnmptree -e".
+
+ See gensnmptree(1) for more details.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
The include file <bsd.subdir.mk> contains the default targets for building
subdirectories. It has the same seven targets as <bsd.prog.mk>: all, clean,
cleandir, depend, install, lint, and tags. For all of the directories
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 6f0fd3e..0d21cb3 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -602,6 +602,24 @@ MK_TESTS:= no
#
#
+# MK_* options whose default value depends on another option.
+#
+.for vv in \
+ GSSAPI/KERBEROS \
+ MAN_UTILS/MAN
+.if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H})
+.error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set.
+.endif
+.if defined(WITH_${vv:H})
+MK_${vv:H}:= yes
+.elif defined(WITHOUT_${vv:H})
+MK_${vv:H}:= no
+.else
+MK_${vv:H}:= ${MK_${vv:T}}
+.endif
+.endfor
+
+#
# MK_*_SUPPORT options which default to "yes" unless their corresponding
# MK_* variable is set to "no".
#
@@ -627,24 +645,6 @@ MK_${var}_SUPPORT:= yes
.endfor
#
-# MK_* options whose default value depends on another option.
-#
-.for vv in \
- GSSAPI/KERBEROS \
- MAN_UTILS/MAN
-.if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H})
-.error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set.
-.endif
-.if defined(WITH_${vv:H})
-MK_${vv:H}:= yes
-.elif defined(WITHOUT_${vv:H})
-MK_${vv:H}:= no
-.else
-MK_${vv:H}:= ${MK_${vv:T}}
-.endif
-.endfor
-
-#
# MK_* options that default to "yes" if the compiler is a C++11 compiler.
#
.include <bsd.compiler.mk>
diff --git a/share/mk/bsd.snmpmod.mk b/share/mk/bsd.snmpmod.mk
index 552f936..2814da9 100644
--- a/share/mk/bsd.snmpmod.mk
+++ b/share/mk/bsd.snmpmod.mk
@@ -24,4 +24,18 @@ FILESGROUPS+= BMIBS
BMIBSDIR= ${SHAREDIR}/snmp/mibs
.endif
+.if !target(smilint) && !empty(BMIBS)
+LOCALBASE?= /usr/local
+
+SMILINT?= ${LOCALBASE}/bin/smilint
+
+SMIPATH?= ${BMIBSDIR}:${LOCALBASE}/share/snmp/mibs
+
+SMILINT_FLAGS?= -c /dev/null -l6 -i group-membership
+
+smilint: ${BMIBS}
+ SMIPATH=${SMIPATH} ${SMILINT} ${SMILINT_FLAGS} ${.ALLSRC}
+.endif
+smilint: .PHONY
+
.include <bsd.lib.mk>
diff --git a/share/skel/dot.shrc b/share/skel/dot.shrc
index ea32f35..974db46 100644
--- a/share/skel/dot.shrc
+++ b/share/skel/dot.shrc
@@ -13,12 +13,8 @@
#
# umask 022
-# Enable the builtin emacs(1) command line editor in sh(1),
-# e.g. C-a -> beginning-of-line.
-set -o emacs
-
-# Uncomment this and comment the above to enable the builtin vi(1) command
-# line editor in sh(1), e.g. ESC to go into visual mode.
+# Uncomment this to enable the builtin vi(1) command line editor in sh(1),
+# e.g. ESC to go into visual mode.
# set -o vi
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 7f022c8..a3c81b9 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -67,6 +67,10 @@ TZBUILDSUBDIRS= \
Pacific \
SystemV
+.if defined(OLDTIMEZONES)
+TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
+.endif
+
all: zoneinfo
.PHONY: zoneinfo
@@ -78,6 +82,8 @@ zoneinfo: yearistype ${TDATA}
${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
beforeinstall:
+ mkdir -p ${DESTDIR}/usr/share/zoneinfo
+ cd ${DESTDIR}/usr/share/zoneinfo; mkdir -p ${TZBUILDSUBDIRS}
cd ${TZBUILDDIR} && \
find -s * -type f -print -exec ${INSTALL} \
-o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
OpenPOWER on IntegriCloud