.gitignore

@@ -4,4 +4,4 @@ SOURCES/06-55-04
 SOURCES/06-5e-03
 SOURCES/microcode-20190918.tar.gz
 SOURCES/microcode-20191115.tar.gz
-SOURCES/microcode-20240910.tar.gz
+SOURCES/microcode-20220510.tar.gz

.microcode_ctl.metadata

@@ -4,4 +4,4 @@ bcf2173cd3dd499c37defbc2533703cfa6ec2430 SOURCES/06-2d-07
 86c60ee7d5d0d7115a4962c1c61ceecb0fd3a95a SOURCES/06-5e-03
 bc20d6789e6614b9d9f88ee321ab82bed220f26f SOURCES/microcode-20190918.tar.gz
 774636f4d440623b0ee6a2dad65260e81208074d SOURCES/microcode-20191115.tar.gz
-2815182aa376dba6d534bc087a27fe9f27def1d2 SOURCES/microcode-20240910.tar.gz
+0aeb386e2f4650e04bb748a75ecec10f4642e4a5 SOURCES/microcode-20220510.tar.gz

SOURCES/0001-releasenote.md-changes-summary-fixes-for-microcode-2.patch

@@ -0,0 +1,47 @@
+From 6ff5aa24a9460441cf2f1008792af134aeca0931 Mon Sep 17 00:00:00 2001
+From: Eugene Syromiatnikov <esyr@redhat.com>
+Date: Tue, 10 May 2022 20:48:31 +0200
+Subject: [PATCH] releasenote.md: changes summary fixes for microcode-20220510
+
+* releasenote.md (New Platforms): Change the second 06-bf-02/03 entry
+to 06-bf-05/03.
+(Updated Platforms): Change the case to lower in PF of 06-37-09/0f;
+change "GKL-R" to "GLK-R" (stands for Gemini Lake Refresh).
+
+Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
+---
+ releasenote.md | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/releasenote.md b/releasenote.md
+index 7fac640..c4a1ba7 100644
+--- a/releasenote.md
++++ b/releasenote.md
+@@ -18,13 +18,13 @@
+ | ADL            | L0       | 06-9a-03/80 |          | 0000041c | Core Gen12
+ | ADL            | L0       | 06-9a-04/80 |          | 0000041c | Core Gen12
+ | ADL            | C0       | 06-bf-02/03 |          | 0000001f | Core Gen12
+-| ADL            | C0       | 06-bf-02/03 |          | 0000001f | Core Gen12
++| ADL            | C0       | 06-bf-05/03 |          | 0000001f | Core Gen12
+ 
+ ### Updated Platforms
+ 
+ | Processor      | Stepping | F-M-S/PI    | Old Ver  | New Ver  | Products
+ |:---------------|:---------|:------------|:---------|:---------|:---------
+-| VLV            | D0       | 06-37-09/0F | 0000090c | 0000090d | Atom E38xx
++| VLV            | D0       | 06-37-09/0f | 0000090c | 0000090d | Atom E38xx
+ | SKL-U/Y        | D0       | 06-4e-03/c0 | 000000ec | 000000f0 | Core Gen6 Mobile
+ | SKX-SP         | B1       | 06-55-03/97 | 0100015c | 0100015d | Xeon Scalable
+ | SKX-SP         | H0/M0/U0 | 06-55-04/b7 | 02006c0a | 02006d05 | Xeon Scalable
+@@ -38,7 +38,7 @@
+ | DNV            | B0       | 06-5f-01/01 | 00000036 | 00000038 | Atom C Series
+ | ICX-SP         | D0       | 06-6a-06/87 | 0d000331 | 0d000363 | Xeon Scalable Gen3
+ | GLK            | B0       | 06-7a-01/01 | 00000038 | 0000003a | Pentium Silver N/J5xxx, Celeron N/J4xxx
+-| GKL-R          | R0       | 06-7a-08/01 | 0000001c | 0000001e | Pentium J5040/N5030, Celeron J4125/J4025/N4020/N4120
++| GLK-R          | R0       | 06-7a-08/01 | 0000001c | 0000001e | Pentium J5040/N5030, Celeron J4125/J4025/N4020/N4120
+ | ICL-U/Y        | D1       | 06-7e-05/80 | 000000a8 | 000000b0 | Core Gen10 Mobile
+ | LKF            | B2/B3    | 06-8a-01/10 | 0000002d | 00000031 | Core w/Hybrid Technology
+ | TGL            | B1       | 06-8c-01/80 | 0000009a | 000000a4 | Core Gen11 Mobile
+-- 
+2.13.6
+

SOURCES/06-55-04_readme

@@ -22,9 +22,6 @@ microcode revisions in question are listed below:
  * 06-55-04, revision 0x2006b06: cb5bec976cb9754e3a22ab6828b3262a8f9eccf7
  * 06-55-04, revision 0x2006c0a: 76b641375d136c08f5feb46aacebee40468ac085
  * 06-55-04, revision 0x2006d05: dc4207cf4eb916ff34acbdddc474db0df781234f
- * 06-55-04, revision 0x2006e05: bc67d247ad1c9a834bec5e452606db1381d6bc7e
- * 06-55-04, revision 0x2006f05: c47277a6a47caedb518f311ce5d339528a8347e2
- * 06-55-04, revision 0x2007006: 68ae0f321685ff97b50266bc20818f31563fc67c
 
 Please contact your system vendor for a BIOS/firmware update that contains
 the latest microcode version.  For the information regarding microcode versions
@@ -68,8 +65,6 @@ to the following knowledge base articles:
    CVE-2022-21151 (Optimization Removal-Induced Informational Disclosure),
    CVE-2022-21166 (Device Register Partial Write):
    https://access.redhat.com/articles/6963124
- * CVE-2022-21233 (Stale Data Read from legacy xAPIC):
-   https://access.redhat.com/articles/6976398
 
 The information regarding disabling microcode update is provided below.
 

SOURCES/06-8c-01_readme

@@ -13,12 +13,6 @@ microcode revisions in question are listed below:
  * 06-8c-01, revision 0x88: 61b6590feb2769046d5b0c394179beaf2df51290
  * 06-8c-01, revision 0x9a: 48b3ae8d27d8138b5b47052d2f8184bf555ad18e
  * 06-8c-01, revision 0xa4: 70753f54f5be84376bdebeb710595e4dc2f6d92f
- * 06-8c-01, revision 0xa6: fdcf89e3a15a20df8aeee215b78bf5d13d731044
- * 06-8c-01, revision 0xaa: cf84883f6b3184690c25ccade0b10fa839ac8657
- * 06-8c-01, revision 0xac: b9f342e564a0be372ed1f4709263bf811feb022a
- * 06-8c-01, revision 0xb4: 6596bb8696cde85538bb833d090f0b7a42d6ae14
- * 06-8c-01, revision 0xb6: 76556e8248a89f38cd55a6c83dccc995ba176091
- * 06-8c-01, revision 0xb8: 6e9b138d1db2934479b179af4a3a19e843c4b4e4
 
 Please contact your system vendor for a BIOS/firmware update that contains
 the latest microcode version.  For the information regarding microcode versions

SOURCES/06-8e-9e-0x-0xca_readme

@@ -112,44 +112,6 @@ in question:
  * 06-9e-0c, revision 0xf0: 3702f21e87b75bea6f4b1ee0407b941ef31d4ad1
  * 06-9e-0d, revision 0xf0: 226feaaa431eb76e734ab68efc2ea7b07aa3c7d9
 
- * 06-8e-0c, revision 0xf4: 6a5e140bf8c046acb6958bad1db1fee66c8601ad
- * 06-9e-0d, revision 0xf4: 3433d4394b05a9c8aefb9c46674bad7b7e934f11
-
- * 06-8e-09, revision 0xf2: 2e67e55d7b805edcfaac57898088323df7315b25
- * 06-8e-0a, revision 0xf2: f9e1dbeb969ded845b726c62336f243099714bcf
- * 06-8e-0b, revision 0xf2: 3d45fbcbefd92dbbedf0eed04aeb29c7430c7c0e
- * 06-8e-0c, revision 0xf6: bd37be38dbd046d4d66f126cfaa79e43bfe88c0d
- * 06-9e-09, revision 0xf2: 716257544acf2c871d74e4627e7de86ee1024185
- * 06-9e-0a, revision 0xf2: 933c5d6710195336381e15a160d36aaa52d358fd
- * 06-9e-0b, revision 0xf2: 92eaafdb72f6d4231046aadb92caa0038e94fca8
- * 06-9e-0c, revision 0xf2: ad8922b4f91b5214dd88c56c0a12d15edb9cea5b
- * 06-9e-0d, revision 0xf8: 8fdea727c6ce46b26e0cffa6ee4ff1ba0c45cf14
-
- * 06-8e-09, revision 0xf4: e059ab6b168f3831d624acc153e18ab1c8488570
- * 06-8e-0a, revision 0xf4: d1ade1ccfe5c6105d0786dfe887696808954f8b4
- * 06-8e-0b, revision 0xf4: 0bc93736f3f5b8b6569bebac4e9627ab923621e0
- * 06-8e-0c, revision 0xf8: be93b4826a3f40219a9fc4fc5afa87b320279f6e
- * 06-9e-09, revision 0xf4: 317564f3ac7b99b5900b91e2be3e23b9b66bc2c0
- * 06-9e-0a, revision 0xf4: 9659f73e2c6081eb5c146c5ed763fa5db21df901
- * 06-9e-0b, revision 0xf4: e60b567ad54da129d05a77e305cae4488579979d
- * 06-9e-0c, revision 0xf4: 74d52a11a905dd7b254fa72b014c3bab8022ba3d
- * 06-9e-0d, revision 0xfa: 484738563e793d5b90b94869dc06edf0407182f1
-
- * 06-8e-0c, revision 0xfa: d2c2ed4634b2f345382991237bedb90430fcc0b3
- * 06-9e-09, revision 0xf8: 69b8a5435bfb976ef5ec5930dae870e26835442e
- * 06-9e-0a, revision 0xf6: c1f0f556cd203aa6e1d0d1ffb0a65b32f32692be
- * 06-9e-0c, revision 0xf6: a8dfddd009f750b6528f93556b67d4eeca1e5dfa
- * 06-9e-0d, revision 0xfc: a0ad865fd2d3b9d955a889c96fabc67da0235dda
-
- * 06-8e-09, revision 0xf6: c2786ef2eb4feb8ac3e3efae83c361de3ad8df0d
- * 06-8e-0a, revision 0xf6: 9bb2839d451ecee40c1eb08f40e4baec9a159e90
- * 06-8e-0b, revision 0xf6: 7b60fc7d44654976df32971a45399b3b910f3390
- * 06-8e-0c, revision 0xfc: 34efc9a54dc32082b898116840c0a1a1cef59e69
- * 06-9e-0a, revision 0xf8: 880163a2da13ed1eae1654535d751a788de6fa3f
- * 06-9e-0b, revision 0xf6: ca90c9139d0c1554f6d17ae1bdcf94d0faa6ece7
- * 06-9e-0c, revision 0xf8: 97dcc36772894619ab28be8c35c4ff9f15d684ae
- * 06-9e-0d, revision 0x100: 1a00b6a4373b95811c6396f2a0d8d497f4006fb7
-
 Please contact your system vendor for a BIOS/firmware update that contains
 the latest microcode version.  For the information regarding microcode versions
 required for mitigating specific side-channel cache attacks, please refer

SOURCES/06-8e-9e-0x-dell_readme

@@ -112,44 +112,6 @@ in question:
  * 06-9e-0c, revision 0xf0: 3702f21e87b75bea6f4b1ee0407b941ef31d4ad1
  * 06-9e-0d, revision 0xf0: 226feaaa431eb76e734ab68efc2ea7b07aa3c7d9
 
- * 06-8e-0c, revision 0xf4: 6a5e140bf8c046acb6958bad1db1fee66c8601ad
- * 06-9e-0d, revision 0xf4: 3433d4394b05a9c8aefb9c46674bad7b7e934f11
-
- * 06-8e-09, revision 0xf2: 2e67e55d7b805edcfaac57898088323df7315b25
- * 06-8e-0a, revision 0xf2: f9e1dbeb969ded845b726c62336f243099714bcf
- * 06-8e-0b, revision 0xf2: 3d45fbcbefd92dbbedf0eed04aeb29c7430c7c0e
- * 06-8e-0c, revision 0xf6: bd37be38dbd046d4d66f126cfaa79e43bfe88c0d
- * 06-9e-09, revision 0xf2: 716257544acf2c871d74e4627e7de86ee1024185
- * 06-9e-0a, revision 0xf2: 933c5d6710195336381e15a160d36aaa52d358fd
- * 06-9e-0b, revision 0xf2: 92eaafdb72f6d4231046aadb92caa0038e94fca8
- * 06-9e-0c, revision 0xf2: ad8922b4f91b5214dd88c56c0a12d15edb9cea5b
- * 06-9e-0d, revision 0xf8: 8fdea727c6ce46b26e0cffa6ee4ff1ba0c45cf14
-
- * 06-8e-09, revision 0xf4: e059ab6b168f3831d624acc153e18ab1c8488570
- * 06-8e-0a, revision 0xf4: d1ade1ccfe5c6105d0786dfe887696808954f8b4
- * 06-8e-0b, revision 0xf4: 0bc93736f3f5b8b6569bebac4e9627ab923621e0
- * 06-8e-0c, revision 0xf8: be93b4826a3f40219a9fc4fc5afa87b320279f6e
- * 06-9e-09, revision 0xf4: 317564f3ac7b99b5900b91e2be3e23b9b66bc2c0
- * 06-9e-0a, revision 0xf4: 9659f73e2c6081eb5c146c5ed763fa5db21df901
- * 06-9e-0b, revision 0xf4: e60b567ad54da129d05a77e305cae4488579979d
- * 06-9e-0c, revision 0xf4: 74d52a11a905dd7b254fa72b014c3bab8022ba3d
- * 06-9e-0d, revision 0xfa: 484738563e793d5b90b94869dc06edf0407182f1
-
- * 06-8e-0c, revision 0xfa: d2c2ed4634b2f345382991237bedb90430fcc0b3
- * 06-9e-09, revision 0xf8: 69b8a5435bfb976ef5ec5930dae870e26835442e
- * 06-9e-0a, revision 0xf6: c1f0f556cd203aa6e1d0d1ffb0a65b32f32692be
- * 06-9e-0c, revision 0xf6: a8dfddd009f750b6528f93556b67d4eeca1e5dfa
- * 06-9e-0d, revision 0xfc: a0ad865fd2d3b9d955a889c96fabc67da0235dda
-
- * 06-8e-09, revision 0xf6: c2786ef2eb4feb8ac3e3efae83c361de3ad8df0d
- * 06-8e-0a, revision 0xf6: 9bb2839d451ecee40c1eb08f40e4baec9a159e90
- * 06-8e-0b, revision 0xf6: 7b60fc7d44654976df32971a45399b3b910f3390
- * 06-8e-0c, revision 0xfc: 34efc9a54dc32082b898116840c0a1a1cef59e69
- * 06-9e-0a, revision 0xf8: 880163a2da13ed1eae1654535d751a788de6fa3f
- * 06-9e-0b, revision 0xf6: ca90c9139d0c1554f6d17ae1bdcf94d0faa6ece7
- * 06-9e-0c, revision 0xf8: 97dcc36772894619ab28be8c35c4ff9f15d684ae
- * 06-9e-0d, revision 0x100: 1a00b6a4373b95811c6396f2a0d8d497f4006fb7
-
 Please contact your system vendor for a BIOS/firmware update that contains
 the latest microcode version.  For the information regarding microcode versions
 required for mitigating specific side-channel cache attacks, please refer

SOURCES/README.caveats

@@ -874,5 +874,3 @@ Intel CPU vulnerabilities is available in the following knowledge base articles:
    CVE-2022-21151 (Optimization Removal-Induced Informational Disclosure),
    CVE-2022-21166 (Device Register Partial Write):
    https://access.redhat.com/articles/6963124
- * CVE-2022-21233 (Stale Data Read from legacy xAPIC):
-   https://access.redhat.com/articles/6976398

SOURCES/check_caveats

@@ -5,8 +5,6 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
-export LC_ALL=C
-
 : ${MC_CAVEATS_DATA_DIR=/usr/share/microcode_ctl/ucode_with_caveats}
 : ${FW_DIR=/lib/firmware}
 : ${CFG_DIR=/etc/microcode_ctl/ucode_with_caveats}

SOURCES/codenames.list

@@ -265,7 +265,6 @@ SOC;;XMM 7272 (SoFIA);;01;60650;;;XMM 7272
 Mobile;;Cannon Lake;D0;80;60663;CNL;U;Core Gen8 Mobile;
 Server;;Ice Lake;C0;87;606a5;ICX;SP;Xeon Scalable Gen3;
 Server;;Ice Lake;D0;87;606a6;ICX;SP;Xeon Scalable Gen3;
-Server;;Ice Lake;B0;10;606c1;ICL;D;;Xeon D-17xx, D-27xx
 SOC;;Gemini Lake;B0;01;706a1;GLK;;;Pentium J5005/N5000, Celeron J4005/J4105/N4000/N4100
 SOC;;Gemini Lake;R0;01;706a8;GLK;R;;Pentium J5040/N5030, Celeron J4125/J4025/N4020/N4120
 Mobile;;Ice Lake;D1;80;706e5;ICL;U,Y;Core Gen10 Mobile;
@@ -287,20 +286,12 @@ Mobile;;Comet Lake;V0;94;806ec;CML;U 4+2;Core Gen10 Mobile;
 Mobile;;Whiskey Lake;W0;d0;806eb;WHL;U;Core Gen8 Mobile;
 Mobile;;Whiskey Lake;V0;94;806ec;WHL;U;Core Gen8 Mobile;
 Mobile;;Whiskey Lake;V0;94;806ed;WHL;U;Core Gen8 Mobile;
-Server;;Sapphire Rapids;E0,S1;87;806f4;SPR;SP;Xeon Scalable Gen4;
-Server;;Sapphire Rapids;B1;10;806f5;SPR;HBM;Xeon Max;
-Server;;Sapphire Rapids;E2;87;806f5;SPR;SP;Xeon Scalable Gen4;
-Server;;Sapphire Rapids;E3;87;806f6;SPR;SP;Xeon Scalable Gen4;
-Server;;Sapphire Rapids;E4,S2;87;806f7;SPR;SP;Xeon Scalable Gen4;
-Server;;Sapphire Rapids;B3;10;806f8;SPR;HBM;Xeon Max;
-Server;;Sapphire Rapids;E5,S3;87;806f8;SPR;SP;Xeon Scalable Gen4;
 SOC;;Elkhart Rate;B1;01;90661;EHL;;Pentium J6426/N6415, Celeron J6412/J6413/N6210/N6211, Atom x6000E;
 Desktop;;Alder Lake;C0;02;90672;ADL;S 8+8;Core Gen12;
 Mobile;;Alder Lake;C0;03;90672;ADL;HX;Core Gen12 Mobile;
 Desktop;;Alder Lake;K0;01;90675;ADL;S 6+0;Core Gen12;
 Mobile;;Alder Lake;L0;82;906a3;ADL;P 6+8;Core Gen12 Mobile;
 Mobile;;Alder Lake;R0;80;906a3;ADL;U 9W;Core Gen12 Mobile;
-Mobile;;Arizona Beach;A0;40;906a4;AZB;;;Intel(R) Atom(R) C1100
 Mobile;;Alder Lake;R0;82;906a4;ADL;P 2+8;Core Gen12 Mobile;
 Desktop;;Kaby Lake;B0;2a;906e9;KBL;S,X;Core Gen7;
 Mobile;;Kaby Lake;B0;2a;906e9;KBL;G,H;Core Gen7 Mobile;
@@ -324,15 +315,8 @@ Desktop;;Comet Lake;Q0;22;a0655;CML;S 10+2;Core Gen10 Desktop;
 Mobile;;Comet Lake;A0;80;a0660;CML;U 6+2;Core Gen10 Mobile;
 Mobile;;Comet Lake;K1;80;a0661;CML;U 6+2 v2;Core Gen10 Mobile;
 Desktop;;Rocket Lake;B0;02;a0671;RKL;S;Core Gen11;
-Mobile;;Meteor Lake;C0;e6;a06a4;MTL;H,U;Core™ Ultra Processor;
-Desktop;;Raptor Lake;B0;32;b0671;RPL;S;Core Gen13;
-Mobile;;Raptor Lake;J0;e0;b06a2;RPL;P 6+8,H 6+8;Core Gen13;
-Mobile;;Raptor Lake;Q0;e0;b06a3;RPL;U 2+8;Core Gen13;
-SOC;;Alder Lake;A0;01;b06e0;ADL;N;;Core i3-N305/N300, N50/N97/N100/N200, Atom x7211E/x7213E/x7425E
 Desktop;;Alder Lake;C0;03;b06f2;ADL;;Core Gen12;
 Desktop;;Alder Lake;C0;03;b06f5;ADL;;Core Gen12;
-Server;;Emerald Rapids;A0;87;c06f1;EMR;SP;Xeon Scalable Gen5;
-Server;;Emerald Rapids;A1;87;c06f2;EMR;SP;Xeon Scalable Gen5;
 
 # sources:
 # https://en.wikichip.org/wiki/intel/cpuid

SOURCES/dracut_99microcode_ctl-fw_dir_override_module_init.sh

@@ -13,7 +13,6 @@ install() {
 	local DATA_DIR=/usr/share/microcode_ctl/ucode_with_caveats
 	local CFG_DIR="/etc/microcode_ctl/ucode_with_caveats"
 	local check_caveats=/usr/libexec/microcode_ctl/check_caveats
-	local fw_path_para=$(< /sys/module/firmware_class/parameters/path)
 
 	local verbose_opt
 	local cc_out
@@ -37,13 +36,9 @@ install() {
 	}
 
 	# Reset fw_dir to avoid inclusion of kernel-version-specific directories
-	# populated with microcode for the late load, only in case it is set
+	# populated with microcode for the late load
-	# to the default value to avoid meddling with user-enforced changes.
+	[ "x$fw_dir" != \
-	# The second variant has been introduced in dracut-057~5.
+	  "x/lib/firmware/updates /lib/firmware /lib/firmware/$kernel" ] || {
-	[ \( "x$fw_dir" != \
-	     "x/lib/firmware/updates /lib/firmware /lib/firmware/$kernel" \) -a \
-	  \( "x$fw_dir" != \
-	     "x${fw_path_para:+$fw_path_para }/lib/firmware/updates/$kernel /lib/firmware/updates /lib/firmware/$kernel /lib/firmware" \) ] || {
 		fw_dir="/lib/firmware/updates /lib/firmware"
 		dinfo "    microcode_ctl: reset fw_dir to \"${fw_dir}\""
 	}

SOURCES/reload_microcode

@@ -5,8 +5,6 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
-export LC_ALL=C
-
 CHECK_CAVEATS=/usr/libexec/microcode_ctl/check_caveats
 IGNORE_HYPERVISOR="/etc/microcode_ctl/ignore-hypervisor-flag"
 

SOURCES/update_ucode

@@ -5,8 +5,6 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
-export LC_ALL=C
-
 usage()
 {
 	echo "Usage: update_ucode [--action {add|remove|refresh|list}]" \
@@ -17,11 +15,6 @@ usage()
 
 debug() { [ 0 = "$verbose" ] || echo "$*" >&2; }
 
-# Calls find only if the first argument exists and is a directory.
-# Avoids spurious "find: '...' No such file or directory" for the directories
-# that may not exist.
-find_d() { [ \! -d "$1" ] || find "$@"; }
-
 MC_DIR=/usr/share/microcode_ctl
 INTEL_UCODE_DIR=intel-ucode
 DATA_DIR=/usr/share/microcode_ctl/ucode_with_caveats
@@ -86,16 +79,16 @@ add|remove|refresh|list)
 	if [ -z "$kernel" ]; then
 		debug "No kernel versions provided, scanning..."
 
-		kvers=$(find_d /lib/modules/ -name '[2-9].*' -print)
+		kvers=$(find /lib/modules/ -name '[2-9].*' -print)
 		for k_dir in $kvers; do
 			k="${k_dir#/lib/modules/}"
-			[ ! -e "${k_dir}/symvers.gz" -a ! -e "${k_dir}/symvers.xz" ] || {
+			[ ! -e "${k_dir}/symvers.gz" ] || {
 				debug "  Adding $k (from /lib/modules)"
 				kernel="$kernel $k"
 			}
 		done
 
-		kvers=$(find_d /lib/firmware/ -name '[2-9].*' -print)
+		kvers=$(find /lib/firmware/ -name '[2-9].*' -print)
 		for k_dir in $kvers; do
 			k="${k_dir#/lib/firmware/}"
 			[ ! -d "$k_dir" ] || {
@@ -136,7 +129,7 @@ while :; do
 	refresh|remove|list)
 		debug "  Removing old files from ${FW_DIR}/${INTEL_UCODE_DIR}"
 		if [ 0 = "$remove_cleanup" ]; then
-			find_d "${MC_DIR}/${INTEL_UCODE_DIR}" \
+			find "${MC_DIR}/${INTEL_UCODE_DIR}" \
 				-maxdepth 1 -mindepth 1 \
 				-type f -printf '%f\n'
 		else
@@ -158,17 +151,6 @@ while :; do
 			$cmd rm -f $verbose_opt "$name"
 		done
 		[ "xlist" = "x$action" ] || {
-			# Removing possible dangling symlinks
-			find_d "${FW_DIR}/${INTEL_UCODE_DIR}" \
-				-maxdepth 1 -mindepth 1 \
-				-type l -printf '%p\n' \
-			| while read -r fname; do
-				[ -e "$fname" ] || {
-					debug "    Removing danging symlink \"$fname\""
-					$cmd rm -f $verbose_opt "$fname"
-				}
-			done
-
 			$cmd rmdir -p $verbose_opt \
 				"${FW_DIR}/${INTEL_UCODE_DIR}" 2>/dev/null \
 				|| true
@@ -221,7 +203,7 @@ fi | while read -r i; do
 				debug "    Removing \"$paths\" (part of $action)..."
 
 			for p in $(printf "%s" "$paths"); do
-				find_d "$DATA_DIR/$i" -path "$DATA_DIR/$i/$p" \
+				find "$DATA_DIR/$i" -path "$DATA_DIR/$i/$p" \
 					-printf "%P\n"
 			done | while read -r path; do
 				[ -e "$FW_DIR/$k/readme-$i" ] || {
@@ -243,7 +225,6 @@ fi | while read -r i; do
 				fi
 			done
 
-
 			if [ -e "$FW_DIR/$k/readme-$i" ]; then
 				if [ "xlist" = "x$action" ]; then
 					echo "$FW_DIR/$k/readme-$i"
@@ -272,14 +253,14 @@ fi | while read -r i; do
 		add|refresh)
 			debug "    Adding $paths (part of $action)..."
 
-			[ -e "/lib/modules/$k/symvers.gz" -o -e "/lib/modules/$k/symvers.xz" ] || {
+			[ -e "/lib/modules/$k/symvers.gz" ] || {
-				debug "      \"/lib/modules/$k/symvers.[gx]z\"" \
+				debug "      \"/lib/modules/$k/symvers.gz\"" \
 				      "does not exist, skipping"
 				continue
 			}
 
 			for p in $(printf "%s" "$paths"); do
-				find_d "$DATA_DIR/$i" -path "$DATA_DIR/$i/$p" \
+				find "$DATA_DIR/$i" -path "$DATA_DIR/$i/$p" \
 					-printf "%P\n"
 			done | while read -r path; do
 				[ ! -e "$FW_DIR/$k/$path" ] || {
@@ -307,17 +288,3 @@ fi | while read -r i; do
 		esac
 	done
 done
-
-# Removing possible dangling symlinks in kernel-specific directories
-debug "Checking for dangling symlinks..."
-for k in $(echo "$kernel"); do
-	debug "  Processing kernel version \"$k\""
-	find_d "${FW_DIR}/${k}" \
-		-mindepth 1 -type l -printf '%p\n' \
-	| while read -r fname; do
-		[ -e "$fname" ] || {
-			debug "    Removing danging symlink \"$fname\""
-			$cmd rm -f $verbose_opt "$fname"
-		}
-	done
-done