From 788f55534e7d77bd65120ace7785679059516f1e Mon Sep 17 00:00:00 2001
From: Dan McDonald <danmcd@joyent.com>
Date: Thu, 10 Feb 2022 11:03:52 -0500
Subject: [PATCH] 14484 Update Intel microcode to 20220207

---
 usr/src/data/ucode/Makefile.links             |   4 ----
 usr/src/data/ucode/README.ucode               |   2 +-
 usr/src/data/ucode/intel/000306F2-01          | Bin 34816 -> 38912 bytes
 usr/src/data/ucode/intel/000306F4-80          | Bin 19456 -> 23552 bytes
 usr/src/data/ucode/intel/000406E3-40          | Bin 105472 -> 105472 bytes
 usr/src/data/ucode/intel/000406F1-01          | Bin 31744 -> 35840 bytes
 usr/src/data/ucode/intel/00050653-01          | Bin 34816 -> 34816 bytes
 usr/src/data/ucode/intel/00050654-01          | Bin 36864 -> 43008 bytes
 usr/src/data/ucode/intel/00050656-01          | Bin 30720 -> 35840 bytes
 usr/src/data/ucode/intel/00050657-01          | Bin 30720 -> 36864 bytes
 usr/src/data/ucode/intel/0005065B-01          | Bin 27648 -> 28672 bytes
 usr/src/data/ucode/intel/00050663-10          | Bin 24576 -> 28672 bytes
 usr/src/data/ucode/intel/00050664-10          | Bin 24576 -> 27648 bytes
 usr/src/data/ucode/intel/00050665-10          | Bin 19456 -> 23552 bytes
 usr/src/data/ucode/intel/000506C9-01          | Bin 17408 -> 17408 bytes
 usr/src/data/ucode/intel/000506CA-01          | Bin 15360 -> 16384 bytes
 usr/src/data/ucode/intel/000506E3-02          | Bin 105472 -> 108544 bytes
 usr/src/data/ucode/intel/000506F1-01          | Bin 11264 -> 11264 bytes
 usr/src/data/ucode/intel/000606A6-01          | Bin 283648 -> 291840 bytes
 usr/src/data/ucode/intel/000706A1-01          | Bin 74752 -> 74752 bytes
 usr/src/data/ucode/intel/000706A8-01          | Bin 75776 -> 75776 bytes
 usr/src/data/ucode/intel/000706E5-80          | Bin 110592 -> 110592 bytes
 usr/src/data/ucode/intel/00080664-01          | Bin 130048 -> 0 bytes
 usr/src/data/ucode/intel/000806A1-10          | Bin 32768 -> 34816 bytes
 usr/src/data/ucode/intel/000806C1-80          | Bin 109568 -> 109568 bytes
 usr/src/data/ucode/intel/000806C2-02          | Bin 94208 -> 96256 bytes
 usr/src/data/ucode/intel/000806D1-02          | Bin 99328 -> 101376 bytes
 usr/src/data/ucode/intel/000806E9-10          | Bin 104448 -> 104448 bytes
 usr/src/data/ucode/intel/000806E9-40          | Bin 104448 -> 104448 bytes
 usr/src/data/ucode/intel/000806EA-40          | Bin 103424 -> 103424 bytes
 usr/src/data/ucode/intel/000806EB-10          | Bin 104448 -> 104448 bytes
 usr/src/data/ucode/intel/000806EC-04          | Bin 104448 -> 104448 bytes
 usr/src/data/ucode/intel/00090661-01          | Bin 19456 -> 20480 bytes
 usr/src/data/ucode/intel/000906C0-01          | Bin 19456 -> 20480 bytes
 usr/src/data/ucode/intel/000906E9-02          | Bin 104448 -> 106496 bytes
 usr/src/data/ucode/intel/000906EA-02          | Bin 102400 -> 102400 bytes
 usr/src/data/ucode/intel/000906EB-02          | Bin 104448 -> 104448 bytes
 usr/src/data/ucode/intel/000906EC-02          | Bin 103424 -> 103424 bytes
 usr/src/data/ucode/intel/000906ED-02          | Bin 103424 -> 103424 bytes
 usr/src/data/ucode/intel/000A0652-20          | Bin 93184 -> 93184 bytes
 usr/src/data/ucode/intel/000A0653-02          | Bin 94208 -> 94208 bytes
 usr/src/data/ucode/intel/000A0655-02          | Bin 94208 -> 94208 bytes
 usr/src/data/ucode/intel/000A0660-80          | Bin 94208 -> 94208 bytes
 usr/src/data/ucode/intel/000A0661-80          | Bin 93184 -> 93184 bytes
 usr/src/data/ucode/intel/000A0671-02          | Bin 100352 -> 102400 bytes
 usr/src/data/ucode/intel/THIRDPARTYLICENSE    |   2 +-
 .../pkg/manifests/system-microcode-intel.p5m  |   5 +----
 47 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 usr/src/data/ucode/intel/00080664-01

diff --git a/usr/src/data/ucode/Makefile.links b/usr/src/data/ucode/Makefile.links
index 39be3efa48..7c7233d9ca 100644
--- a/usr/src/data/ucode/Makefile.links
+++ b/usr/src/data/ucode/Makefile.links
@@ -153,7 +153,6 @@ INTEL_LINKS = \
 	000606A6-02 \
 	000606A6-04 \
 	000606A6-80 \
-	00080665-01 \
 	000806C2-40 \
 	000806C2-80 \
 	000806D1-40 \
@@ -601,9 +600,6 @@ $(ROOTINTELDIR)/000606A6-04: $(ROOTINTELDIR)/000606A6-01
 $(ROOTINTELDIR)/000606A6-80: $(ROOTINTELDIR)/000606A6-01
 	$(RM) $@; $(LN) $^ $@
 
-$(ROOTINTELDIR)/00080665-01: $(ROOTINTELDIR)/00080664-01
-	$(RM) $@; $(LN) $^ $@
-
 $(ROOTINTELDIR)/000806C2-40: $(ROOTINTELDIR)/000806C2-02
 	$(RM) $@; $(LN) $^ $@
 
diff --git a/usr/src/data/ucode/README.ucode b/usr/src/data/ucode/README.ucode
index c2f0b03d81..b7785b5f99 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 20210608 release
+Intel: Linux 20220207 release
diff --git a/usr/src/data/ucode/intel/000306F2-01 b/usr/src/data/ucode/intel/000306F2-01
index 04a67cf050b37bdaf3c11b201b7f9632a3102b10..41a9d903b9512226ba4df223f2d133f2a76ef29f 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000306F4-80 b/usr/src/data/ucode/intel/000306F4-80
index fa7f56f52b79f5439d983dc287295dc5c48cb5e8..5f87dd2fabdec83129e4cf443293b0114c885606 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000406E3-40 b/usr/src/data/ucode/intel/000406E3-40
index d9426ae9708e70e020c6e5685a1e1af0dd79d8d4..13b343ad2a10b83c41c33338b2e93e1c719b4335 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000406F1-01 b/usr/src/data/ucode/intel/000406F1-01
index 1c6e7933a5d530cbaa11441add9e689554319d48..7ed66eabe2766009e4c59b3566c7126c4d1159ba 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00050653-01 b/usr/src/data/ucode/intel/00050653-01
index c76fac3ab0cde896bbd530cbc6bc33fae45b92dc..9ec944d6cdec90cb7b546ec374106a109e4de14e 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00050654-01 b/usr/src/data/ucode/intel/00050654-01
index cca28e70a8274731ad4eaeff0c626ca298845e1a..894e5e172b7bbb8601de473eb8fc7ca603953831 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00050656-01 b/usr/src/data/ucode/intel/00050656-01
index 96169ce3fe39fee66ee2f87f91f65d988db5f916..64aabb0e2100b53f25090fba5f8e683e8067fec9 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00050657-01 b/usr/src/data/ucode/intel/00050657-01
index f7779ee1ddff525a9e3f77c2b38876df5e74c4d4..2749da188e3684f8c636d8f0cb67b6de749a2f0a 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/0005065B-01 b/usr/src/data/ucode/intel/0005065B-01
index 96deb26c6eebb066accb06e99853132f37da4cc8..8363e7cf7f108a28dc20fd4b791dd76adab3cf7e 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00050663-10 b/usr/src/data/ucode/intel/00050663-10
index 2a9d8eaf7c8a353fa8883f182a5ecbb716b883ba..b4d965ff618af157954b1ecf39d6142e15406655 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00050664-10 b/usr/src/data/ucode/intel/00050664-10
index 9bb6fbea806e0c3b435202305a9df74dffaec10d..4d66e5532d92feddfe82e9bb57dbc10b4fc0729d 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00050665-10 b/usr/src/data/ucode/intel/00050665-10
index 12badd38911d903294c71caef714cd428590564c..65c658567427cdcbeae1eedca9791ffa58e320bc 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000506C9-01 b/usr/src/data/ucode/intel/000506C9-01
index 34e1525d17c7b6cb9e57f0d1bdbedf03ab7159fa..3d1aa34e938e1a5ae3cf13ef0f9999bb038daab6 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000506CA-01 b/usr/src/data/ucode/intel/000506CA-01
index 44ca47239abed4301fb18b5901d2a0286ac742cd..ca6f520ea541dd0fb69550c3eea405a6eb410ac5 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000506E3-02 b/usr/src/data/ucode/intel/000506E3-02
index b44e31abaead66f3573457847a44e85dd11f77ba..761fa6660e2dacf8b5a91200478005e88e6f0792 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000506F1-01 b/usr/src/data/ucode/intel/000506F1-01
index f0f4c78068f70963760a83bead7df4d6527cc1c2..943afa9f0d405a367738de2931161f4aa1109a5b 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000606A6-01 b/usr/src/data/ucode/intel/000606A6-01
index e19f676689c6c3d320fc32ac3df26e7d63c6f0b3..7a126f970f37650789a0c82e629851cbc49a13b3 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000706A1-01 b/usr/src/data/ucode/intel/000706A1-01
index ee8a144fad476a891a780bf5d4bf2660f6a68c94..51866a1d01bc40bc9303c4058c040bb50ab8c6bb 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000706A8-01 b/usr/src/data/ucode/intel/000706A8-01
index 9099bd310860a13980d3492fedb47614716bcefd..ddd7034a4a66193e41f19ffe9f1d77bf1e0cef14 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000706E5-80 b/usr/src/data/ucode/intel/000706E5-80
index 0f8b5772f8cd1a1d4a1d357863a6e633e0ae0f2d..c005889fce2844f45f39e79ff293c4c79182ab0d 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00080664-01 b/usr/src/data/ucode/intel/00080664-01
deleted file mode 100644
index 2d3c357f8c4257c7842553ce49732944bf16a8c5..0000000000000000000000000000000000000000
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806A1-10 b/usr/src/data/ucode/intel/000806A1-10
index 45b544affe1ded588cdf57db164b8fa2d4a8be11..2c0c71b9ceffb585c55c2d1aa5cf073ee1ad49ba 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806C1-80 b/usr/src/data/ucode/intel/000806C1-80
index e01ba0c1e9fb247b2b61bf25895d7357e192978b..906c56c3db429cc0a9ff71332cf4f4abd2972db9 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806C2-02 b/usr/src/data/ucode/intel/000806C2-02
index 12da9fe36f7dc0d0558bc24a3112486a1b29ef7e..21f3c4ded7ada05ba439042fc5d3a43edb1eb5b0 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806D1-02 b/usr/src/data/ucode/intel/000806D1-02
index 5ac418b3957cb52e24c88f675b1a3187a0b56542..55cc03ab0f70c10d677af631d3199f623494e9f6 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806E9-10 b/usr/src/data/ucode/intel/000806E9-10
index 11fcf69c93363cc72afcca0d55401be4d529e010..42f0b936d7c58d049cd64d64465cdd3695244fcd 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806E9-40 b/usr/src/data/ucode/intel/000806E9-40
index e08e7da081429c9c7a2756cfe97e0e53947c473a..8bce192d28f15b0f00677f3c1dc77d6adae2dcce 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806EA-40 b/usr/src/data/ucode/intel/000806EA-40
index d9b7508844af4f77b259cbb06f256f313a524b4b..ef6d4f138ecb56ede46deaaf18712c22783dad46 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806EB-10 b/usr/src/data/ucode/intel/000806EB-10
index 6fb591d3bc0adfde6505215b68abb72e5ff530cc..53d5ef011a45cd0ced1265596059a317f02d1cec 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000806EC-04 b/usr/src/data/ucode/intel/000806EC-04
index 00980231fe381fdd182dcb3c76aadd130697ec0c..2d65ba226b5c067721b2005666607ac295327925 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/00090661-01 b/usr/src/data/ucode/intel/00090661-01
index 8140fcc082340983a439fec96732faa7678ef6e1..06548466d37a06c1342c79f66f149d648dccf40e 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000906C0-01 b/usr/src/data/ucode/intel/000906C0-01
index 2cf44b1befb31b3f1b9d4c4bed0ca43c1a596064..7bc9cce4417e3348b685b40d455e34a49d73dcf0 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000906E9-02 b/usr/src/data/ucode/intel/000906E9-02
index 23327ecf8f0eed951b253d405b5b3f7109c288a1..10af087b2e87882284bbfb28b6248b3764d7f0c6 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000906EA-02 b/usr/src/data/ucode/intel/000906EA-02
index 13855bb02335d333fd30c9a9cdbee123f3987480..bab21517f71a273e0ecbea8dedd1a53467e27b0d 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000906EB-02 b/usr/src/data/ucode/intel/000906EB-02
index c49cdc673c850a202019ece8f3fc962f373de7b1..0482e4b141894ae1f80d86717c01ee1a2d5f23ba 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000906EC-02 b/usr/src/data/ucode/intel/000906EC-02
index f9b5c5ae9f76ec9c3741d4c924ef8c3cd3ccc36a..ea21168781faf675ce58a4f6f9186ea26d7c7ad4 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000906ED-02 b/usr/src/data/ucode/intel/000906ED-02
index 9b5a312dfc310308d92e3dd8e65912674abbb426..ca07dec5381ae71cd7fb91ddb5a9219bbd81e727 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000A0652-20 b/usr/src/data/ucode/intel/000A0652-20
index eed05a986894cc7e9e0339abedbc62cae660dade..cceb88c302224b57801b162ec3f1378611e5aa9c 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000A0653-02 b/usr/src/data/ucode/intel/000A0653-02
index 9bf967dfcdec03a988e330b7aa0c360f4df3191a..f2b8b4dff5cb74738b407705591944cef9f401a0 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000A0655-02 b/usr/src/data/ucode/intel/000A0655-02
index b8ede54fe693bbbcb15a0bc9b2120890bd570b7f..ddc0e872463f1b03689f1fe120c956d1a65476dc 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000A0660-80 b/usr/src/data/ucode/intel/000A0660-80
index 601bce535410c1a097692a9d9b7f244b7f0189f9..0f003e98b2985c33b41f4dd3d25c660c5b2889d4 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000A0661-80 b/usr/src/data/ucode/intel/000A0661-80
index c38c1510f6f8ec0a85beff0c76ec6fd874b2a26b..ab16cc4e0c099f8eff89a186de35147884dff10b 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/000A0671-02 b/usr/src/data/ucode/intel/000A0671-02
index b8e29c36c773916ebf48b30afca88ea1054c8cd1..9970cf58dd53770f7accd520df5abe8ea8954536 100644
GIT binary patch
diff --git a/usr/src/data/ucode/intel/THIRDPARTYLICENSE b/usr/src/data/ucode/intel/THIRDPARTYLICENSE
index 8fbad3dd21..cb763c91a3 100644
--- a/usr/src/data/ucode/intel/THIRDPARTYLICENSE
+++ b/usr/src/data/ucode/intel/THIRDPARTYLICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2020 Intel Corporation.
+Copyright (c) 2018-2021 Intel Corporation.
 All rights reserved.
 
 Redistribution.
diff --git a/usr/src/pkg/manifests/system-microcode-intel.p5m b/usr/src/pkg/manifests/system-microcode-intel.p5m
index 9590f18276..aaa9b97465 100644
--- a/usr/src/pkg/manifests/system-microcode-intel.p5m
+++ b/usr/src/pkg/manifests/system-microcode-intel.p5m
@@ -24,8 +24,8 @@
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2014 Gary Mills
 # Copyright 2019 Peter Tribble.
-# Copyright 2020 Joyent, Inc.
 # Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2022 Joyent, Inc.
 #
 
 #
@@ -550,9 +550,6 @@ file path=platform/i86pc/ucode/GenuineIntel/000706A8-01 group=sys mode=0444 \
     reboot-needed=true
 file path=platform/i86pc/ucode/GenuineIntel/000706E5-80 group=sys mode=0444 \
     reboot-needed=true
-file path=platform/i86pc/ucode/GenuineIntel/00080664-01 group=sys mode=0444 \
-    reboot-needed=true
-hardlink path=platform/i86pc/ucode/GenuineIntel/00080665-01 target=00080664-01
 file path=platform/i86pc/ucode/GenuineIntel/000806A1-10 group=sys mode=0444 \
     reboot-needed=true
 file path=platform/i86pc/ucode/GenuineIntel/000806C1-80 group=sys mode=0444 \
-- 
2.33.1

