[illumos-gate merge]

commit f8e9c7b3ba7100b047717589235b6d05ec43646c
    14925 plumb DFv4 into amdzen(4D)
commit ba215efe42e70993d3838f7af671f9d9fc0ebc33
    14936 need a better SMN addressing mechanism
commit 56726c7e321b6e5ecb2f10215f5386016547e68c
    14821 Add additional AVX512 capabilities
    14822 Need new word of hardware capabilities
    14823 aux vector feature mapping should use x86_featureset
commit f2ae17ede4a9a93585872a9aa83120497285bdd0
    14077 Want wrapper for external SMB server tests
commit 544783ca6fcbe20a0c82b42aabd4e88a9ac69e68
    14960 mountd: cleaning up some build gags
commit 153f3212c5a48deec74be10ba87dd04bc99edbbb
    14815 nvmeadm: identify support for namespace management

Conflicts:
    manifest
    usr/src/cmd/sgs/libconv/common/corenote.c
    usr/src/cmd/sgs/libconv/common/corenote.msg
    usr/src/cmd/sgs/rtld/common/globals.c
    usr/src/cmd/sgs/rtld/common/rtld.msg
    usr/src/cmd/sgs/rtld/common/setup.c
    usr/src/uts/common/exec/elf/elf.c
    usr/src/uts/common/os/exec.c
    usr/src/uts/common/sys/user.h
    usr/src/uts/intel/os/cpuid.c
    usr/src/uts/intel/os/driver_aliases

2 files changed, 98 insertions, 11 deletions

diff --git a/usr/src/man/man4d/amdzen.4d b/usr/src/man/man4d/amdzen.4d
index 7d17a6a9d4..e8ee713c85 100644
--- a/usr/src/man/man4d/amdzen.4d
+++ b/usr/src/man/man4d/amdzen.4d
@@ -9,9 +9,9 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2021 Oxide Computer Company
+.\" Copyright 2022 Oxide Computer Company
 .\"
-.Dd September 26, 2020
+.Dd August 6, 2022
 .Dt AMDZEN 4D
 .Os
 .Sh NAME
@@ -34,11 +34,17 @@ AMD Zen Naples, Summit Ridge, Whitehaven
 AMD Zen+ Colfax, Picasso, and Pinnacle Ridge
 .Pq Family 17h
 .It
-AMD Zen 2 Castle Peak, Matisse, Rome, and Renoir
+AMD Zen 2 Castle Peak, Matisse, Mendocino, Rome, Renoir, and Van Gogh
 .Pq Family 17h
 .It
 AMD Zen 3 Cezanne, Milan, and Vermeer
 .Pq Family 19h
+.It
+AMD Zen 3+ Rembrandt
+.Pq Family 19h
+.It
+AMD Zen 4 Genoa and Raphael
+.Pq Family 19h
 .El
 .Pp
 This driver is a nexus driver and facilitates access to the northbridge,
diff --git a/usr/src/man/man8/nvmeadm.8 b/usr/src/man/man8/nvmeadm.8
index 009b89bcf4..04508b2c22 100644
--- a/usr/src/man/man8/nvmeadm.8
+++ b/usr/src/man/man8/nvmeadm.8
@@ -33,9 +33,20 @@
 .Nm
 .Op Fl dv
 .Cm identify
+.Op Fl C | c | d | Oo Fl a Oc Fl n
 .Ar ctl[/ns] Ns [,...]
 .Nm
 .Op Fl dv
+.Cm identify-controller
+.Op Fl C | c | Oo Fl a Oc Fl n
+.Ar ctl Ns [,...]
+.Nm
+.Op Fl dv
+.Cm identify-namespace
+.Op Fl c | d
+.Ar ctl/ns Ns [,...]
+.Nm
+.Op Fl dv
 .Cm get-logpage
 .Ar ctl[/ns] Ns [,...]
 .Ar logpage
@@ -247,17 +258,87 @@ The name of the disk device that corresponds to the namespace, if any.
 .El
 .It Xo
 .Nm
-.Cm identify
-.Ar ctl[/ns] Ns [,...]
+.Cm identify-controller
+.Op Fl C | c | Oo Fl a Oc Fl n
+.Ar ctl Ns [,...]
 .Xc
-Print detailed information about the specified controllers and/or
-namespaces.
-The information returned differs depending on whether a controller or
-a namespace is specified.
-For an explanation of the data printed by this command refer to the
-description of the
+Print detailed information about the specified controllers.
+For an explanation of the data printed by this command refer to the description
+of the
+.Qq IDENTIFY
+admin command in the NVMe specification.
+.Pp
+By default, a relevant subset of the
+.Qq IDENTIFY CONTROLLER
+data structure is printed.
+The full data structure is only printed when verbose output is requested.
+.Pp
+The following options can be used to print other
+.Qq IDENTIFY
+information:
+.Bl -tag -width Fl
+.It Fl C
+Print the Common Namespace Identification of the controller.
+.It Fl a
+Alter the output of the
+.Fl n
+option to print the list allocated namespace identifiers.
+Can only be specified together with the
+.Fl n
+option.
+.It Fl c
+Print the list of all unique controller identifiers in the NVMe subsystem the
+specified controller belongs to.
+.It Fl n
+Print the list of active namespace identifiers of the controller.
+.El
+.It Xo
+.Nm
+.Cm identify-namespace
+.Op Fl c | d
+.Ar ctl/ns Ns [,...]
+.Xc
+Print detailed information about the specified namespace.
+For an explanation of the data printed by this command refer to the description
+of the
 .Qq IDENTIFY
 admin command in the NVMe specification.
+.Pp
+By default, a relevant subset of the
+.Qq IDENTIFY NAMESPACE
+data structure is printed.
+The full data structure is only printed when verbose output is requested.
+.Pp
+The following options can be used to print other
+.Qq IDENTIFY
+information:
+.Bl -tag -width Fl
+.It Fl c
+Print the list of all unique controller identifiers in the NVMe subsystem the
+specified namespace belongs to and which are currently attached to this
+namespace.
+.It Fl d
+Print the list of namespace identification descriptors of the namespace.
+.El
+.It Xo
+.Nm
+.Cm identify
+.Op Fl C | c | d | Oo Fl a Oc Fl n
+.Ar ctl[/ns] Ns [,...]
+.Xc
+Short-hand for the
+.Cm identify-controller
+and
+.Cm identify-namespace
+commands, prints the same information about the specified controllers and/or
+namespaces, depending on whether a controller or a namespace was specified.
+.Pp
+For a description of the various optional flags refer to the above description
+of the
+.Cm identify-controller
+and
+.Cm identify-namespace
+commands.
 .It Xo
 .Nm
 .Cm get-logpage