[illumos-gate merge]

commit 207eb048d59b803f49e5ebdbfdb1ed33848b198f
    12872 ioctl(2) needs additional ENOTTY documentation
commit ed5ba7eb5b9baea17a09428feca1d7cfdc912cbf
    12816 Update Intel microcode to 20200616

24 files changed, 12 insertions, 18 deletions

diff --git a/usr/src/data/ucode/README.ucode b/usr/src/data/ucode/README.ucode
index 03dcde42f0..4d074c7d85 100644
--- a/usr/src/data/ucode/README.ucode
+++ b/usr/src/data/ucode/README.ucode
@@ -38,4 +38,4 @@ of updating the manifest as necessary. Be careful about new files.
 AMD: Updated in March 2012 as part of illumos#2546. Exact revision
 unknown.
 
-Intel: Linux 20200508 release
+Intel: Linux 20200616 release
diff --git a/usr/src/data/ucode/intel/000206D6-01 b/usr/src/data/ucode/intel/000206D6-01
index 2c9b69c74d..29eb3e9dd1 100644
--- a/usr/src/data/ucode/intel/000206D6-01
+++ b/usr/src/data/ucode/intel/000206D6-01
diff --git a/usr/src/data/ucode/intel/000206D7-01 b/usr/src/data/ucode/intel/000206D7-01
index 52a3fb66f3..23926a049a 100644
--- a/usr/src/data/ucode/intel/000206D7-01
+++ b/usr/src/data/ucode/intel/000206D7-01
diff --git a/usr/src/data/ucode/intel/000306C3-02 b/usr/src/data/ucode/intel/000306C3-02
index a6c51f0c29..275df730de 100644
--- a/usr/src/data/ucode/intel/000306C3-02
+++ b/usr/src/data/ucode/intel/000306C3-02
diff --git a/usr/src/data/ucode/intel/000306D4-40 b/usr/src/data/ucode/intel/000306D4-40
index ec79c714d3..a788b3c367 100644
--- a/usr/src/data/ucode/intel/000306D4-40
+++ b/usr/src/data/ucode/intel/000306D4-40
diff --git a/usr/src/data/ucode/intel/00040651-02 b/usr/src/data/ucode/intel/00040651-02
index f93f80134b..1fe82fd866 100644
--- a/usr/src/data/ucode/intel/00040651-02
+++ b/usr/src/data/ucode/intel/00040651-02
diff --git a/usr/src/data/ucode/intel/00040661-02 b/usr/src/data/ucode/intel/00040661-02
index d2d8fb5f8a..36a651f483 100644
--- a/usr/src/data/ucode/intel/00040661-02
+++ b/usr/src/data/ucode/intel/00040661-02
diff --git a/usr/src/data/ucode/intel/00040671-02 b/usr/src/data/ucode/intel/00040671-02
index 939c1e93c4..b8dbcb570c 100644
--- a/usr/src/data/ucode/intel/00040671-02
+++ b/usr/src/data/ucode/intel/00040671-02
diff --git a/usr/src/data/ucode/intel/00050653-01 b/usr/src/data/ucode/intel/00050653-01
index 9777db046e..f2708587f7 100644
--- a/usr/src/data/ucode/intel/00050653-01
+++ b/usr/src/data/ucode/intel/00050653-01
diff --git a/usr/src/data/ucode/intel/00050654-01 b/usr/src/data/ucode/intel/00050654-01
index 1dfee4c1db..d78784a2be 100644
--- a/usr/src/data/ucode/intel/00050654-01
+++ b/usr/src/data/ucode/intel/00050654-01
diff --git a/usr/src/data/ucode/intel/00050656-01 b/usr/src/data/ucode/intel/00050656-01
index 644fbd0f77..e0cfe7af57 100644
--- a/usr/src/data/ucode/intel/00050656-01
+++ b/usr/src/data/ucode/intel/00050656-01
diff --git a/usr/src/data/ucode/intel/00050657-01 b/usr/src/data/ucode/intel/00050657-01
index b2c7588119..0ca9df098b 100644
--- a/usr/src/data/ucode/intel/00050657-01
+++ b/usr/src/data/ucode/intel/00050657-01
diff --git a/usr/src/data/ucode/intel/000806E9-10 b/usr/src/data/ucode/intel/000806E9-10
index 3bb022f42a..2a0b938b17 100644
--- a/usr/src/data/ucode/intel/000806E9-10
+++ b/usr/src/data/ucode/intel/000806E9-10
diff --git a/usr/src/data/ucode/intel/000806E9-40 b/usr/src/data/ucode/intel/000806E9-40
index f85a30551e..c338826477 100644
--- a/usr/src/data/ucode/intel/000806E9-40
+++ b/usr/src/data/ucode/intel/000806E9-40
diff --git a/usr/src/data/ucode/intel/000806EA-40 b/usr/src/data/ucode/intel/000806EA-40
index 3b4ef6b354..dc948902df 100644
--- a/usr/src/data/ucode/intel/000806EA-40
+++ b/usr/src/data/ucode/intel/000806EA-40
diff --git a/usr/src/data/ucode/intel/000806EB-10 b/usr/src/data/ucode/intel/000806EB-10
index 5fb3f554a8..024ff57dce 100644
--- a/usr/src/data/ucode/intel/000806EB-10
+++ b/usr/src/data/ucode/intel/000806EB-10
diff --git a/usr/src/data/ucode/intel/000806EC-04 b/usr/src/data/ucode/intel/000806EC-04
index 624e73e5d8..d51735cc27 100644
--- a/usr/src/data/ucode/intel/000806EC-04
+++ b/usr/src/data/ucode/intel/000806EC-04
diff --git a/usr/src/data/ucode/intel/000906E9-02 b/usr/src/data/ucode/intel/000906E9-02
index 26e0452836..c40b1c3f7b 100644
--- a/usr/src/data/ucode/intel/000906E9-02
+++ b/usr/src/data/ucode/intel/000906E9-02
diff --git a/usr/src/data/ucode/intel/000906EA-02 b/usr/src/data/ucode/intel/000906EA-02
index efec04d507..1e40058972 100644
--- a/usr/src/data/ucode/intel/000906EA-02
+++ b/usr/src/data/ucode/intel/000906EA-02
diff --git a/usr/src/data/ucode/intel/000906EB-02 b/usr/src/data/ucode/intel/000906EB-02
index f11c38e307..b97eb12815 100644
--- a/usr/src/data/ucode/intel/000906EB-02
+++ b/usr/src/data/ucode/intel/000906EB-02
diff --git a/usr/src/data/ucode/intel/000906EC-02 b/usr/src/data/ucode/intel/000906EC-02
index c6e61a513c..a77f6eb950 100644
--- a/usr/src/data/ucode/intel/000906EC-02
+++ b/usr/src/data/ucode/intel/000906EC-02
diff --git a/usr/src/data/ucode/intel/000906ED-02 b/usr/src/data/ucode/intel/000906ED-02
index 5f1e794cb2..2678318b87 100644
--- a/usr/src/data/ucode/intel/000906ED-02
+++ b/usr/src/data/ucode/intel/000906ED-02
diff --git a/usr/src/man/man2/ioctl.2 b/usr/src/man/man2/ioctl.2
index 73e5084d27..59271fdcce 100644
--- a/usr/src/man/man2/ioctl.2
+++ b/usr/src/man/man2/ioctl.2
@@ -44,11 +44,10 @@
 .\" Portions Copyright (c) 1992, X/Open Company Limited  All Rights Reserved
 .\" Copyright (c) 1996, Sun Microsystems, Inc.  All Rights Reserved.
 .\"
-.TH IOCTL 2 "Feb 15, 1996"
+.TH IOCTL 2 "June 18, 2020"
 .SH NAME
 ioctl \- control device
 .SH SYNOPSIS
-.LP
 .nf
 #include <unistd.h>
 #include <stropts.h>
@@ -57,12 +56,10 @@ ioctl \- control device
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBioctl()\fR function performs a variety of control functions on devices
 and streams. For non-streams files, the functions performed by this call are
 device-specific control functions.  The \fIrequest\fR argument and an optional
-third argument with varying type are passed to the file designated by
+third argument with varying type are passed to the device file designated by
 \fIfildes\fR and are interpreted by the device driver.
 .sp
 .LP
@@ -81,16 +78,12 @@ to a device-specific data structure.
 .LP
 In addition to device-specific and streams functions, generic functions are
 provided by more than one device driver (for example, the general terminal
-interface.)  See \fBtermio\fR(7I)).
+interface or disk interfaces.)  See \fBtermio\fR(7I)), \fBdkio\fR(7I), etc..
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, the value returned depends upon the device control
 function, but must be a non-negative integer.  Otherwise, \fB\(mi1\fR is
 returned and \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
-.LP
 The \fBioctl()\fR function will fail for any type of file if:
 .sp
 .ne 2
@@ -144,6 +137,7 @@ to by \fIarg\fR, but \fIarg\fR points to an illegal address.
 .ad
 .RS 11n
 The \fIrequest\fR or \fIarg\fR argument is not valid for this device.
+Many devices return \fBENOTTY\fR for an unknown \fIrequest\fR.
 .RE
 
 .sp
@@ -171,8 +165,10 @@ is no longer active.
 \fB\fBENOTTY\fR\fR
 .ad
 .RS 11n
-The \fIfildes\fR argument is not associated with a streams device that accepts
+The \fIfildes\fR argument is not associated with a device that accepts
 control functions.
+.sp
+The device driver does not know the \fIrequest\fR command.
 .RE
 
 .sp
@@ -183,6 +179,8 @@ control functions.
 .RS 11n
 The \fIrequest\fR and \fIarg\fR arguments are valid for this device driver, but
 the service requested can not be performed on this particular subdevice.
+.sp
+The device driver does not support the \fBioctl()\fR function.
 .RE
 
 .sp
@@ -199,8 +197,6 @@ corresponding device driver does not support the \fBioctl()\fR function.
 .LP
 Streams errors are described in \fBstreamio\fR(7I).
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -215,6 +211,4 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBattributes\fR(5), \fBstandards\fR(5), \fBstreamio\fR(7I), \fBtermio\fR(7I)
diff --git a/usr/src/pkg/manifests/system-microcode-intel.mf b/usr/src/pkg/manifests/system-microcode-intel.mf
index 70a0acb483..8ffb8a9eec 100644
--- a/usr/src/pkg/manifests/system-microcode-intel.mf
+++ b/usr/src/pkg/manifests/system-microcode-intel.mf
@@ -24,7 +24,7 @@
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2014 Gary Mills
 # Copyright 2019 Peter Tribble.
-# Copyright 2019 Joyent, Inc.
+# Copyright 2020 Joyent, Inc.
 # Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
 #
 
@@ -35,7 +35,7 @@
 #
 <include global_zone_only_component>
 set name=pkg.fmri \
-    value=pkg:/system/microcode/intel@20200508,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+    value=pkg:/system/microcode/intel@20200616,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
 set name=pkg.description value="Microcode for Intel CPUs"
 set name=pkg.summary value="Microcode for Intel CPUs"
 set name=info.classification value=org.opensolaris.category.2008:System/Core