From e83ebee39d92ffd3c8e98458688a44b24eae08fe Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Sun, 13 Aug 2023 02:48:09 +0700
Subject: [PATCH] properly revert amd-ucode updates

since they break boot on my laptop
---
 pkgs/default.nix                   | 16 +++++++++
 pkgs/revert-amd-ucode-update.patch | 52 ++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/revert-amd-ucode-update.patch

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c810745..37577f8 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -13,6 +13,22 @@ let
 in
 
 {
+  linux-firmware = pkgs.stdenvNoCC.mkDerivation {
+    inherit (pkgs.linux-firmware) pname version src meta;
+    dontFixup = true;
+    passthru = { inherit (pkgs.linux-firmware) version; };
+    installFlags = [ "DESTDIR=$(out)" ];
+
+    # revert microcode updates which break boot for me
+    patches = [ ./revert-amd-ucode-update.patch ];
+    postPatch = ''
+      cp ${pkgs.fetchurl {
+        url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/amd-ucode/microcode_amd_fam17h.bin?id=b250b32ab1d044953af2dc5e790819a7703b7ee6";
+        hash = "sha256-HnKjEb2di7BiKB09JYUjIUuZNCVgXlwRSbjijnuYBcM=";
+      }} amd-ucode/microcode_amd_fam17h.bin
+    '';
+  };
+
   inherit (nix-gaming) faf-client osu-lazer-bin;
   inherit nixForNixPlugins;
   nix-plugins = pkgs.nix-plugins.overrideAttrs (old: {
diff --git a/pkgs/revert-amd-ucode-update.patch b/pkgs/revert-amd-ucode-update.patch
new file mode 100644
index 0000000..be8dfcb
--- /dev/null
+++ b/pkgs/revert-amd-ucode-update.patch
@@ -0,0 +1,52 @@
+diff --git a/WHENCE b/WHENCE
+index dcb86fa..b92e529 100644
+--- a/WHENCE
++++ b/WHENCE
+@@ -3909,7 +3909,7 @@ Raw: amd-ucode/microcode_amd_fam16h.bin
+ Version: 2014-10-28
+ File: amd-ucode/microcode_amd_fam17h.bin
+ Raw: amd-ucode/microcode_amd_fam17h.bin
+-Version: 2023-07-19
++Version: 2023-04-13
+ File: amd-ucode/microcode_amd_fam19h.bin
+ Raw: amd-ucode/microcode_amd_fam19h.bin
+ Version: 2023-07-18
+diff --git a/amd-ucode/README b/amd-ucode/README
+index 1d39da3..4308fe2 100644
+--- a/amd-ucode/README
++++ b/amd-ucode/README
+@@ -32,9 +32,8 @@ Microcode patches in microcode_amd_fam16h.bin:
+ 
+ Microcode patches in microcode_amd_fam17h.bin:
+   Family=0x17 Model=0x08 Stepping=0x02: Patch=0x0800820d Length=3200 bytes
+-  Family=0x17 Model=0x31 Stepping=0x00: Patch=0x0830107a Length=3200 bytes
+-  Family=0x17 Model=0xa0 Stepping=0x00: Patch=0x08a00008 Length=3200 bytes
+   Family=0x17 Model=0x01 Stepping=0x02: Patch=0x0800126e Length=3200 bytes
++  Family=0x17 Model=0x31 Stepping=0x00: Patch=0x08301072 Length=3200 bytes
+ 
+ Microcode patches in microcode_amd_fam19h.bin:
+   Family=0x19 Model=0x01 Stepping=0x01: Patch=0x0a0011d1 Length=5568 bytes
+diff --git a/amd-ucode/microcode_amd_fam17h.bin.asc b/amd-ucode/microcode_amd_fam17h.bin.asc
+index 34a4024..27da52c 100644
+--- a/amd-ucode/microcode_amd_fam17h.bin.asc
++++ b/amd-ucode/microcode_amd_fam17h.bin.asc
+@@ -1,11 +1,11 @@
+ -----BEGIN PGP SIGNATURE-----
+ 
+-iQEzBAABCgAdFiEE/HxsUF2vzBRxg1fK5L5TOfMornMFAmS4Mm4ACgkQ5L5TOfMo
+-rnN35wgAkllCunxE6J5hQyLMx5o4WTHZkbNvXmu6nV1Y3vjiL1oeaK+pmx8BlkPt
+-fGZJCe/068kqmp3N4EtOZLxXn55t3jNBYectPr0RmFqpjMsEJEcfXfuXROA4N9Ti
+-Zd/o6X21eHEsm0kK0q4YfppfgTd5Ze7k1jTkUuuU6/yh6uRk1MiFreEzkPO3Aayh
+-iEWlYx33vq3HccTPgdY3D64Zr8gmgKG+8mdEvqb1jK4SVZ1/9vy4OKIIpUZB/eqx
+-46h9Ejwn9pktnYkHi/A/zCREEcIQ10HXFF5bjxJTFQkM5S46/QEO7uuvnpMb+6Yy
+-4V1/QIWMG6ixqCRx9GqbBK7GHdYODw==
+-=+IsI
++iQEzBAABCgAdFiEE/HxsUF2vzBRxg1fK5L5TOfMornMFAmQeEvgACgkQ5L5TOfMo
++rnPOpAf/dYhPqq/ktg1muI/khV4EhDiguX6OXib3fmfSZdvPIAI0cRI77M3Lvf0b
++nlV8D67e5HOQ5foJbix5tunz0sZjqr2QU8U9dNk/ut0KC7UiCRc8VH40aSi/OQBG
++Y8c7tb6IJ+N+jyJ6Ii6koUuRO2Lk2MckcrWLRuLRV4bB+osyJrGjc/X54Z6UJ/Ma
++VDg13Yxy5WvC7sMmlmnY42JLeLBKDVUvg0zDvJ4aOLLxRE2l3eiAKE+TV122LmxN
++ca5WA/ESYQ9BjxHYIrpTd9nQaWa/TIZ+rOmJGLMtnQ1gGlW97zQuJR7zh+8vdLzC
++iwVlS1cu7kcV7KYDytTkWJ+2gwb3uQ==
++=lP2S
+ -----END PGP SIGNATURE-----