consolidate haswell iommu patches

Signed-off-by: Leah Rowe <leah@libreboot.org>

config/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch

@@ -1,4 +1,4 @@
-From 11f759cb05a4d9f4656982a8afea40d7dadfb93e Mon Sep 17 00:00:00 2001
+From b6cbef6dc28cfe5c376310391a7bc0869ea5ffdb Mon Sep 17 00:00:00 2001
 From: Vitali64 <5405891-vitali64yt@users.noreply.gitlab.com>
 Date: Wed, 27 Oct 2021 13:36:01 +0200
 Subject: [PATCH 01/51] add c3 and clockgen to apple/macbook21

config/coreboot/default/patches/0002-Revert-mb-lenovo-t430-Merge-into-t430-into-t530.patch

@@ -1,4 +1,4 @@
-From 3c5b15f0aa0ba2c9e7d4db6f893e13978c045032 Mon Sep 17 00:00:00 2001
+From 09cde063eed6777948ee3a2ad7ba5db71531f37e Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Thu, 23 Apr 2026 20:00:33 +0100
 Subject: [PATCH 02/51] Revert "mb/lenovo/t430: Merge into t430 into t530"

config/coreboot/default/patches/0003-lenovo-t400-Enable-all-SATA-ports.patch

@@ -1,4 +1,4 @@
-From 33b89af06765839c0f9a6e599789c520e794a22a Mon Sep 17 00:00:00 2001
+From c1fd80b55e3ab8f651c2ad6e6eec6cdcb3922f9b Mon Sep 17 00:00:00 2001
 From: persmule <persmule@gmail.com>
 Date: Sun, 31 Oct 2021 23:33:26 +0000
 Subject: [PATCH 03/51] lenovo/t400: Enable all SATA ports

config/coreboot/default/patches/0004-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch

@@ -1,4 +1,4 @@
-From 6bf8a87bdea4b7d5876e20f734821e6496b51cb9 Mon Sep 17 00:00:00 2001
+From bf1bb17d48b43ca468bca0b2d31315450f8cf8c6 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Mon, 3 Jan 2022 19:06:22 +0000
 Subject: [PATCH 04/51] lenovo/x230: set me_state=Disabled in cmos.default

config/coreboot/default/patches/0005-set-me_state-Disabled-on-all-cmos.default-files.patch

@@ -1,4 +1,4 @@
-From 05f20d18bf572ebe80875d506dd686efd3eb7e4e Mon Sep 17 00:00:00 2001
+From c0b5b390507c1a46af3224bd61f5c971e99607a2 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Wed, 2 Mar 2022 21:50:01 +0000
 Subject: [PATCH 05/51] set me_state=Disabled on all cmos.default files!

config/coreboot/default/patches/0006-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch

@@ -1,4 +1,4 @@
-From 68e1738c5a46181b1fd1fcd44fe314da297b95d0 Mon Sep 17 00:00:00 2001
+From 75892a195d53054ceee67e23c487c4103f559332 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Sun, 19 Feb 2023 18:21:43 +0000
 Subject: [PATCH 06/51] util/ifdtool: add --nuke flag (all 0xFF on region)

config/coreboot/default/patches/0007-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch

@@ -1,4 +1,4 @@
-From 6c626f71a4ec9f887d1b82da071011423a3fd24e Mon Sep 17 00:00:00 2001
+From e4682c184ded28dc9daf7ae6cae9d121f3803bef Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Sat, 6 May 2023 15:53:41 -0600
 Subject: [PATCH 07/51] mb/dell/e6400: Enable 01.0 device in devicetree for

config/coreboot/default/patches/0008-Remove-warning-for-coreboot-images-built-without-a-p.patch

@@ -1,4 +1,4 @@
-From bd349e86429cd0e83bbd6251ec507f3273b80854 Mon Sep 17 00:00:00 2001
+From 83a4706b4948797ff57f314c9518f256aea08e79 Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Fri, 12 May 2023 19:55:15 -0600
 Subject: [PATCH 08/51] Remove warning for coreboot images built without a

config/coreboot/default/patches/0009-HACK-Disable-coreboot-related-BL31-features.patch

@@ -1,4 +1,4 @@
-From bd98f54b50b66d291641f88ec3169b9518855862 Mon Sep 17 00:00:00 2001
+From 9dbbefa5297329f316adeb95c2a78267be146509 Mon Sep 17 00:00:00 2001
 From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
 Date: Thu, 22 Jun 2023 16:44:27 +0300
 Subject: [PATCH 09/51] HACK: Disable coreboot related BL31 features

config/coreboot/default/patches/0010-dell-e6430-use-ME-Soft-Temporary-Disable.patch

@@ -1,4 +1,4 @@
-From ae01730cad059bb3707b6d938a082dee9494bde5 Mon Sep 17 00:00:00 2001
+From 6b112300df5d4538cf19e3f914f0a44628733204 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sun, 5 Nov 2023 11:41:41 +0000
 Subject: [PATCH 10/51] dell/e6430: use ME Soft Temporary Disable

config/coreboot/default/patches/0011-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch

@@ -1,4 +1,4 @@
-From ae7d23355be8efbbe3a1216d8e28c30a07e2e0ef Mon Sep 17 00:00:00 2001
+From 42e64e41ec9ce997f6615b7a67655715a67651b4 Mon Sep 17 00:00:00 2001
 From: Riku Viitanen <riku.viitanen@protonmail.com>
 Date: Sat, 23 Dec 2023 19:02:10 +0200
 Subject: [PATCH 11/51] mb/hp: Add Compaq Elite 8300 CMT port

config/coreboot/default/patches/0012-nb-intel-haswell-make-IOMMU-a-runtime-option.patch

@@ -1,4 +1,4 @@
-From 0d418d44f61dda7670cfe02226150c2e5d3d6308 Mon Sep 17 00:00:00 2001
+From 601661d628ff7b8ffee8c1ed13307caa23d489ce Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Sat, 2 Mar 2024 22:51:09 +0000
 Subject: [PATCH 12/51] nb/intel/haswell: make IOMMU a runtime option
@@ -19,7 +19,7 @@ performed, and the IOMMU will be left disabled. This option
 has been added to all current Haswell boards, though it is
 recommended to leave the IOMMU turned on in most setups.
 
-Signed-off-by: Leah Rowe <info@minifree.org>
+Signed-off-by: Leah Rowe <leah@libreboot.org>
 ---
  src/mainboard/asrock/b85m_pro4/cmos.default    |  1 +
  src/mainboard/asrock/b85m_pro4/cmos.layout     |  3 +++
@@ -34,8 +34,8 @@ Signed-off-by: Leah Rowe <info@minifree.org>
  src/mainboard/lenovo/haswell/cmos.layout       |  3 +++
  src/mainboard/supermicro/x10slm-f/cmos.default |  1 +
  src/mainboard/supermicro/x10slm-f/cmos.layout  |  6 ++++++
- src/northbridge/intel/haswell/early_init.c     | 6 ++++++
+ src/northbridge/intel/haswell/early_init.c     | 15 ++++++++++-----
- 14 files changed, 49 insertions(+)
+ 14 files changed, 53 insertions(+), 5 deletions(-)
 
 diff --git a/src/mainboard/asrock/b85m_pro4/cmos.default b/src/mainboard/asrock/b85m_pro4/cmos.default
 index 01bf20ad16..dfc8b80fb0 100644
@@ -265,7 +265,7 @@ index 38ba87aa45..24d39e97ee 100644
  checksums
  
 diff --git a/src/northbridge/intel/haswell/early_init.c b/src/northbridge/intel/haswell/early_init.c
-index 6a5ce53a40..5f07fa0b17 100644
+index 6a5ce53a40..e0007f72ee 100644
 --- a/src/northbridge/intel/haswell/early_init.c
 +++ b/src/northbridge/intel/haswell/early_init.c
 @@ -6,6 +6,7 @@
@@ -276,18 +276,30 @@ index 6a5ce53a40..5f07fa0b17 100644
  
  #include "haswell.h"
  
-@@ -80,6 +81,11 @@ static void haswell_setup_misc(void)
+@@ -80,14 +81,18 @@ static void haswell_setup_misc(void)
  static void northbridge_setup_iommu(void)
  {
  	const u32 capid0_a = pci_read_config32(HOST_BRIDGE, CAPID0_A);
 +	u8 enable_iommu = get_uint_option("iommu", 1);
-+
-+	if (!enable_iommu)
-+		return;
 +
  	if (capid0_a & VTD_DISABLE)
  		return;
  
+-	/* Setup BARs: zeroize top 32 bits; set enable bit */
+-	mchbar_write32(GFXVTBAR + 4, GFXVT_BASE_ADDRESS >> 32);
+-	mchbar_write32(GFXVTBAR + 0, GFXVT_BASE_ADDRESS | 1);
+-	mchbar_write32(VTVC0BAR + 4, VTVC0_BASE_ADDRESS >> 32);
+-	mchbar_write32(VTVC0BAR + 0, VTVC0_BASE_ADDRESS | 1);
++	if (enable_iommu) {
++		/* Setup BARs: zeroize top 32 bits; set enable bit */
++		mchbar_write32(GFXVTBAR + 4, GFXVT_BASE_ADDRESS >> 32);
++		mchbar_write32(GFXVTBAR + 0, GFXVT_BASE_ADDRESS | 1);
++		mchbar_write32(VTVC0BAR + 4, VTVC0_BASE_ADDRESS >> 32);
++		mchbar_write32(VTVC0BAR + 0, VTVC0_BASE_ADDRESS | 1);
++	}
+ 
+ 	if (cpu_is_haswell()) {
+ 		/*
 -- 
 2.47.3
 

config/coreboot/default/patches/0013-dell-optiplex_9020-Disable-IOMMU-by-default.patch

@@ -1,4 +1,4 @@
-From 2bd978a08ffee969bbf61af8f145b9e6b050d321 Mon Sep 17 00:00:00 2001
+From 1586b045a75b9cf8cd68a44739beefa501e6cbd3 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Sat, 2 Mar 2024 23:00:09 +0000
 Subject: [PATCH 13/51] dell/optiplex_9020: Disable IOMMU by default

config/coreboot/default/patches/0014-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch

@@ -1,4 +1,4 @@
-From 1179f45055fffb383fffe806e313a315de7c4205 Mon Sep 17 00:00:00 2001
+From 64e0140fec07d7062b147419781e200509c63053 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Sat, 6 Apr 2024 01:22:47 +0100
 Subject: [PATCH 14/51] nb/haswell: Fully disable iGPU when dGPU is used

config/coreboot/default/patches/0015-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch

@@ -1,4 +1,4 @@
-From 59b741bf1b74a2c4e108755fbfd1580894c7d783 Mon Sep 17 00:00:00 2001
+From f19a3eb6eee94881ac1c6c6fe28c1f523a12dcda Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Fri, 3 May 2024 11:03:32 -0600
 Subject: [PATCH 15/51] ec/dell/mec5035: Add S3 suspend SMI handler

config/coreboot/default/patches/0016-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch

@@ -1,54 +0,0 @@
-From 3c1416797f2deafbd6b56774d890706aaea3614f Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Sat, 4 May 2024 02:00:53 +0100
-Subject: [PATCH 16/51] nb/haswell: lock policy regs when disabling IOMMU
-
-Angel Pons told me I should do it. See comments here:
-https://review.coreboot.org/c/coreboot/+/81016
-
-I see no harm in complying with the request. I'll merge
-this into the main patch at a later date and try to
-get this upstreamed.
-
-Just a reminder: on Optiplex 9020 variants, Xorg locks up
-under Linux when tested with a graphics card; disabling
-IOMMU works around the issue. Intel graphics work just fine
-with IOMMU turned on. Libreboot disables IOMMU by default,
-on the 9020, so that users can install graphics cards easily.
-
-Signed-off-by: Leah Rowe <info@minifree.org>
----
- src/northbridge/intel/haswell/early_init.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/src/northbridge/intel/haswell/early_init.c b/src/northbridge/intel/haswell/early_init.c
-index 5f07fa0b17..30660e3903 100644
---- a/src/northbridge/intel/haswell/early_init.c
-+++ b/src/northbridge/intel/haswell/early_init.c
-@@ -86,15 +86,17 @@ static void northbridge_setup_iommu(void)
- 	if (!enable_iommu)
- 		return;
- 
-+	if (enable_iommu) {
-+		/* Setup BARs: zeroize top 32 bits; set enable bit */
-+		mchbar_write32(GFXVTBAR + 4, GFXVT_BASE_ADDRESS >> 32);
-+		mchbar_write32(GFXVTBAR + 0, GFXVT_BASE_ADDRESS | 1);
-+		mchbar_write32(VTVC0BAR + 4, VTVC0_BASE_ADDRESS >> 32);
-+		mchbar_write32(VTVC0BAR + 0, VTVC0_BASE_ADDRESS | 1);
-+	}
-+
- 	if (capid0_a & VTD_DISABLE)
- 		return;
- 
--	/* Setup BARs: zeroize top 32 bits; set enable bit */
--	mchbar_write32(GFXVTBAR + 4, GFXVT_BASE_ADDRESS >> 32);
--	mchbar_write32(GFXVTBAR + 0, GFXVT_BASE_ADDRESS | 1);
--	mchbar_write32(VTVC0BAR + 4, VTVC0_BASE_ADDRESS >> 32);
--	mchbar_write32(VTVC0BAR + 0, VTVC0_BASE_ADDRESS | 1);
--
- 	if (cpu_is_haswell()) {
- 		/*
- 		 * Intel Document 492662 (Haswell System Agent BIOS Spec), Rev 1.6.0
--- 
-2.47.3
-

config/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch

@@ -1,7 +1,7 @@
-From 4347eae3a819dff7b6715630208d4be74b8245e4 Mon Sep 17 00:00:00 2001
+From c99ef7e409f450dbc66d2de930160f29a0c0d68e Mon Sep 17 00:00:00 2001
 From: Angel Pons <th3fanbus@gmail.com>
 Date: Mon, 10 May 2021 22:40:59 +0200
-Subject: [PATCH 17/51] nb/intel/gm45: Make DDR2 raminit work
+Subject: [PATCH 16/51] nb/intel/gm45: Make DDR2 raminit work
 
 List of changes:
  - Update some timing and ODT values

config/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch

@@ -1,7 +1,7 @@
-From 8effb91216e331655ab64bc0aa114a3b38baec9c Mon Sep 17 00:00:00 2001
+From fcfd8484d5b7a50c170a7f5cc8a973c890e48afc Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Tue, 6 Aug 2024 00:50:24 +0100
-Subject: [PATCH 18/51] nb/gm45: Fix Angel's DDR2 RCOMP fix on DDR3 boards
+Subject: [PATCH 17/51] nb/gm45: Fix Angel's DDR2 RCOMP fix on DDR3 boards
 
 We add this patch:
 

config/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch

@@ -1,7 +1,7 @@
-From c7b85347f892432b31000c67efccc02c84d9394a Mon Sep 17 00:00:00 2001
+From 499885b662b703c472309f64c123d99e65ebe9d2 Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Mon, 20 May 2024 10:24:16 -0600
-Subject: [PATCH 19/51] mb/dell/e6400: Use 100 MHz reference clock for display
+Subject: [PATCH 18/51] mb/dell/e6400: Use 100 MHz reference clock for display
 
 The E6400 uses a 100 MHz reference clock for spread spectrum support on
 LVDS, whereas libgfxinit previously assumed a 96 MHz input clock. For

config/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch

@@ -1,7 +1,7 @@
-From 6d1cbaedc747afe4acd8b13240c56232ba870639 Mon Sep 17 00:00:00 2001
+From db3148d6762fb16ca79d9bfb3df51210e04a580e Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Mon, 12 Aug 2024 02:15:24 +0100
-Subject: [PATCH 20/51] nb/x4x: define INTEL_GMA_DPLL_REF_FREQ
+Subject: [PATCH 19/51] nb/x4x: define INTEL_GMA_DPLL_REF_FREQ
 
 set it to 96MHz. fixes the following build error when
 building for x4x boards e.g. gigabyte ga-g41m-es2l:

config/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch

@@ -1,7 +1,7 @@
-From bd1594c9025dbd84cdce4aac02152b809b67b108 Mon Sep 17 00:00:00 2001
+From da070b56c01b5ffe35d8dfdac2e7681be5392fc2 Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Thu, 26 Sep 2024 19:51:25 -0600
-Subject: [PATCH 21/51] mb/dell/gm45_latitudes: Add E4300 variant
+Subject: [PATCH 20/51] mb/dell/gm45_latitudes: Add E4300 variant
 
 Change-Id: I0f2059501b11be103187e3ce1a7c04ab85ae63d2
 Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>

config/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch

@@ -1,7 +1,7 @@
-From 7fda207316f80a5bdffe428309df32a278d13c93 Mon Sep 17 00:00:00 2001
+From 78cf7a8186ad389f6402da9e55f94830f368fcea Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Fri, 3 May 2024 16:31:12 -0600
-Subject: [PATCH 22/51] mb/dell: Add S3 SMI handler for Dell Latitudes
+Subject: [PATCH 21/51] mb/dell: Add S3 SMI handler for Dell Latitudes
 
 Integrate the previously added mec5035_smi_sleep() function into
 mainboard code to fix S3 suspend on the SNB/IVB Latitudes and the E7240.

config/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch

@@ -1,7 +1,7 @@
-From 8f5399ac24599f6d0f1912d46f253a91d67536cf Mon Sep 17 00:00:00 2001
+From 7f131cd791eb2dcf68f0e1e9049cc5b4c301232b Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Tue, 31 Dec 2024 14:42:24 +0000
-Subject: [PATCH 23/51] Disable compression on refcode insertion
+Subject: [PATCH 22/51] Disable compression on refcode insertion
 
 Compression is not reliably reproducible. In an lbmk release
 context, this means we cannot rely on vendorfile insertion.

config/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch

@@ -1,7 +1,7 @@
-From 1e3e9ea40f4b43b9ffbb390222d8c4a4a67dd332 Mon Sep 17 00:00:00 2001
+From 0ef9596d987ae2f9d5d63f7961b60e7d05529d1b Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Mon, 21 Apr 2025 02:58:47 +0100
-Subject: [PATCH 24/51] nb/intel/*: Disable stack overflow debug options
+Subject: [PATCH 23/51] nb/intel/*: Disable stack overflow debug options
 
 Signed-off-by: Leah Rowe <leah@libreboot.org>
 ---

config/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch

@@ -1,7 +1,7 @@
-From d83715448c0f7467ddf94e5c0a53560c5ff3b86b Mon Sep 17 00:00:00 2001
+From 57f57075c69ce6e1caf9d0daf991b1f373d7f04b Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Mon, 30 Sep 2024 20:44:38 -0400
-Subject: [PATCH 25/51] mb/dell: Add Optiplex 780 MT (x4x/ICH10)
+Subject: [PATCH 24/51] mb/dell: Add Optiplex 780 MT (x4x/ICH10)
 
 Change-Id: Idb45737ce95bfd26e978323c650de7d308b5079c
 Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>

config/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch

@@ -1,7 +1,7 @@
-From 3a5fa257c1b74c6e9e3556147114fc7691dc9e49 Mon Sep 17 00:00:00 2001
+From e1ed4a9739d2cfc691d71c165d984ef171a2ea76 Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Wed, 30 Oct 2024 20:55:25 -0600
-Subject: [PATCH 26/51] mb/dell/optiplex_780: Add USFF variant
+Subject: [PATCH 25/51] mb/dell/optiplex_780: Add USFF variant
 
 Change-Id: I3aa21c743749f4a11a2501f4c121316bd2f1a103
 Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>

config/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch

@@ -1,7 +1,7 @@
-From 5573eeadf45023d49f09606c6219004e20ba4b3c Mon Sep 17 00:00:00 2001
+From 55a33798ec9aadd38222f736d4c1b77f9902f3f4 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Mon, 6 Jan 2025 01:53:53 +0000
-Subject: [PATCH 27/51] src/intel/x4x: Disable stack overflow debug
+Subject: [PATCH 26/51] src/intel/x4x: Disable stack overflow debug
 
 Signed-off-by: Leah Rowe <leah@libreboot.org>
 ---

config/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch

@@ -1,7 +1,7 @@
-From 2973ad1738fb6c1ebd2a92d008e1cbd39c74abb2 Mon Sep 17 00:00:00 2001
+From 56a581aeadb4efafc62efaba742b06b25852ccf8 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Tue, 22 Apr 2025 10:21:59 +0100
-Subject: [PATCH 28/51] hp/8300cmt: remove xhci_overcurrent_mapping
+Subject: [PATCH 27/51] hp/8300cmt: remove xhci_overcurrent_mapping
 
 No longer needed, as per the following commit:
 

config/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch

@@ -1,7 +1,7 @@
-From ff57e763d1f966584ac9b68fa1a1f204626a577b Mon Sep 17 00:00:00 2001
+From 4470d8fb6760173090c43e6a82a8865f5917dd9b Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Wed, 11 Dec 2024 01:06:01 +0000
-Subject: [PATCH 29/51] dell/3050micro: disable nvme hotplug
+Subject: [PATCH 28/51] dell/3050micro: disable nvme hotplug
 
 in my testing, when running my 3050micro for a few days,
 the nvme would sometimes randomly rename.

config/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch

@@ -1,7 +1,7 @@
-From 7c4df892425e076b1d2768f9b99362f58e7872dc Mon Sep 17 00:00:00 2001
+From f6b82e0483d7f9e47f465bb4884b199cfd9fe04b Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Mon, 6 Jan 2025 01:36:23 +0000
-Subject: [PATCH 30/51] src/intel/skylake: Disable stack overflow debug options
+Subject: [PATCH 29/51] src/intel/skylake: Disable stack overflow debug options
 
 The option was appearing in T480/3050micro configs of lbmk,
 after updating on the coreboot/next uprev for 20241206 rev8:

config/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch

@@ -1,7 +1,7 @@
-From 564634f7f83f4118e44972c91e391125a7aa6e27 Mon Sep 17 00:00:00 2001
+From 025eae54ed31b728866db1279a7cd86d7280dc58 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Thu, 26 Dec 2024 19:45:20 +0000
-Subject: [PATCH 31/51] soc/intel/skylake: Don't compress FSP-S
+Subject: [PATCH 30/51] soc/intel/skylake: Don't compress FSP-S
 
 Build systems like lbmk need to reproducibly insert
 certain vendor files on release images.

config/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch

@@ -1,7 +1,7 @@
-From 9e50b19e8d892819bebbebafe25c175f5a8faece Mon Sep 17 00:00:00 2001
+From ca198ab68579cee7297c3675b440c0fd78ed7511 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <info@minifree.org>
 Date: Wed, 18 Dec 2024 02:06:18 +0000
-Subject: [PATCH 32/51] lenovo: Add Kconfig option CONFIG_LENOVO_TBFW_BIN
+Subject: [PATCH 31/51] lenovo: Add Kconfig option CONFIG_LENOVO_TBFW_BIN
 
 This is used by lbmk to know where a tb.bin file goes,
 when extracting and padding TBT.bin from Lenovo ThunderBolt

config/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch

@@ -1,7 +1,7 @@
-From eb332dd2c30c54a78cd0ce573c3358df458ad8c5 Mon Sep 17 00:00:00 2001
+From cb3b76b4805886d5afc5846d351a292639b91bc6 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Mon, 21 Apr 2025 05:14:45 +0100
-Subject: [PATCH 33/51] Conditional TBFW setting for kabylake thinkpads
+Subject: [PATCH 32/51] Conditional TBFW setting for kabylake thinkpads
 
 Otherwise, other boards will define it, which
 might trigger the vendor download script, and

config/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch

@@ -1,7 +1,7 @@
-From 97c167555bec5e8a69b90379c3350766fc5b1107 Mon Sep 17 00:00:00 2001
+From bb04b8f8db08f06100f801ddeb076f165c3d503a Mon Sep 17 00:00:00 2001
 From: Riku Viitanen <riku.viitanen@protonmail.com>
 Date: Sat, 27 Sep 2025 23:30:46 +0300
-Subject: [PATCH 34/51] soc/intel/alderlake: Disable
+Subject: [PATCH 33/51] soc/intel/alderlake: Disable
  MRC_CACHE_USING_MRC_VERSION
 
 There's some issue with building against the FSP headers in src/vendorcode.

config/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch

@@ -1,7 +1,7 @@
-From fd552921d0a34b8ac2f9c21f8c1abf47f2f0c160 Mon Sep 17 00:00:00 2001
+From de90c8706495b73e24e362dd7c80f211581a2ad6 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sun, 28 Sep 2025 03:17:50 +0100
-Subject: [PATCH 35/51] Subject: [PATCH 1/1] Add a -p option (skip FPTR checks)
+Subject: [PATCH 34/51] Subject: [PATCH 1/1] Add a -p option (skip FPTR checks)
 
 if you pass -k (keep fptr modules), don't use -r, don't
 use -t, you can essentially just use me_cleaner to

config/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch

@@ -1,7 +1,7 @@
-From f91e6c35aa0ff7111e65a89a4828b773d038a69c Mon Sep 17 00:00:00 2001
+From 9887eeeb89b29ca8483c9742733fd78ccd7e171b Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sat, 4 Oct 2025 21:57:43 +0100
-Subject: [PATCH 36/51] soc/intel/alderlake: Don't compress FSP-S
+Subject: [PATCH 35/51] soc/intel/alderlake: Don't compress FSP-S
 
 Build systems like lbmk need to reproducibly insert
 certain vendor files on release images.

config/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch

@@ -1,7 +1,7 @@
-From ab4937af6e193b057a8b0212f0667e57eb7ba7d7 Mon Sep 17 00:00:00 2001
+From 1f62cd582614cb3739475dd4439e132b931c5619 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sat, 4 Oct 2025 22:20:11 +0100
-Subject: [PATCH 37/51] alderlake: don't require full fsp repo for fd path
+Subject: [PATCH 36/51] alderlake: don't require full fsp repo for fd path
 
 Signed-off-by: Leah Rowe <leah@libreboot.org>
 ---

config/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch

@@ -1,7 +1,7 @@
-From dec241cc53669870365e103a22d21a9a3111abcc Mon Sep 17 00:00:00 2001
+From 0af11ee58ae38a385431253b1f5f0e9dbce98d3d Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Mon, 6 Oct 2025 04:47:06 +0100
-Subject: [PATCH 38/51] soc/alderlake: disable stack overflow debug option
+Subject: [PATCH 37/51] soc/alderlake: disable stack overflow debug option
 
 same as on other boards. based on this commit:
 

config/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch

@@ -1,7 +1,7 @@
-From fa7d21faf931756d8adb84071bc503a0fe8e64c3 Mon Sep 17 00:00:00 2001
+From f1369485a721aa4ed239f6a8c0b0ad1b82884c7b Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Sun, 11 May 2025 15:41:22 -0600
-Subject: [PATCH 39/51] ec/dell/mec5035: Add command to disable EC-initiated
+Subject: [PATCH 38/51] ec/dell/mec5035: Add command to disable EC-initiated
  thermal shutdown
 
 If command 0xBF isn't sent, the EC shuts down the system without warning

config/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch

@@ -1,7 +1,7 @@
-From 0397a0966953d47210a5ae1f7f0cd71a9a10dc68 Mon Sep 17 00:00:00 2001
+From 3e63073e195446ea3adef0e21f5369e7ef27494a Mon Sep 17 00:00:00 2001
 From: Nicholas Chin <nic.c3.14@gmail.com>
 Date: Sun, 11 May 2025 16:28:23 -0600
-Subject: [PATCH 40/51] mb/dell/snb_ivb_latitude: Disable EC initiated shutdown
+Subject: [PATCH 39/51] mb/dell/snb_ivb_latitude: Disable EC initiated shutdown
  at 87 degrees
 
 If command 0xBF isn't sent, the EC will shut down the system without

config/coreboot/default/patches/0040-fix-ifdtool-build.patch

@@ -1,7 +1,7 @@
-From 42fb6f08310a35587643bdfd75bcdca5318f1022 Mon Sep 17 00:00:00 2001
+From f05e8514654cddb5041fa65a90ab5260ec55d1e5 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sat, 20 Dec 2025 20:12:48 +0100
-Subject: [PATCH 41/51] fix ifdtool build
+Subject: [PATCH 40/51] fix ifdtool build
 
 not my mistake. someone messed up.
 

config/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch

@@ -1,7 +1,7 @@
-From 5bcd048c8ded00a7c12e863a1a9a76c9bba1606a Mon Sep 17 00:00:00 2001
+From 76a1f9c12fedcd595b540168efdd9a8439be3bcd Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sat, 20 Dec 2025 22:36:18 +0100
-Subject: [PATCH 42/51] tests/Makefile.mk: use 3rdparty/cmocka by default
+Subject: [PATCH 41/51] tests/Makefile.mk: use 3rdparty/cmocka by default
 
 (tests)
 

config/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch

@@ -1,7 +1,7 @@
-From ac1c23e215f791c46094377f2f4c7a398e63cc80 Mon Sep 17 00:00:00 2001
+From 942ef84be2203c6a784e5dd80a0e1caeb1d8c98c Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Tue, 23 Dec 2025 18:41:27 +0100
-Subject: [PATCH 43/51] mb/dell/optiplex_780: use legacy HDA verb table
+Subject: [PATCH 42/51] mb/dell/optiplex_780: use legacy HDA verb table
 
 See:
 

config/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch

@@ -1,7 +1,7 @@
-From 8802ad95c158e09e89c4bc0c14755d17b5f532bd Mon Sep 17 00:00:00 2001
+From eb141cc6c1372b754fc1cbe9f1dad9aade066e70 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Tue, 23 Dec 2025 18:46:45 +0100
-Subject: [PATCH 44/51] hp8300cmt: use legacy verb table
+Subject: [PATCH 43/51] hp8300cmt: use legacy verb table
 
 same as for the 780 optiplex patch
 

config/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch

@@ -1,7 +1,7 @@
-From ea848531d1a4ddd9952b8b8d3570770e5ac128cd Mon Sep 17 00:00:00 2001
+From 58f8869dbd58fb9bbb205b5b3bc37cc4ae58dd5b Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Tue, 6 Jan 2026 21:42:21 +0000
-Subject: [PATCH 45/51] topton x2e n150: use old fsp
+Subject: [PATCH 44/51] topton x2e n150: use old fsp
 
 i added the old fsp back, so that we didn't have to
 mess around with vendor files in lbmk, because coreboot

config/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch

@@ -1,7 +1,7 @@
-From 276e29864adfaaa1234d1263a8bf751f7dfd357d Mon Sep 17 00:00:00 2001
+From c4a5a3f5d01e8947c168cf5cf22755cba3cdf2fa Mon Sep 17 00:00:00 2001
 From: Ron Nazarov <ron@noisytoot.org>
 Date: Sat, 14 Feb 2026 20:13:01 +0000
-Subject: [PATCH 46/51] mb/supermicro/x11-lga1151-series: Disable ME HECI in
+Subject: [PATCH 45/51] mb/supermicro/x11-lga1151-series: Disable ME HECI in
  devicetree
 
 Since we always use me_cleaner, this speeds up boot time by preventing

config/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch

@@ -1,7 +1,7 @@
-From 37f24d5775dd9d29e91e42d6de952d8d791cf7c5 Mon Sep 17 00:00:00 2001
+From 763c811b82b631ab85e64e150ec70df76b57fd91 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Fri, 20 Feb 2026 01:23:32 +0000
-Subject: [PATCH 47/51] util/ifdtool: option to allow region override
+Subject: [PATCH 46/51] util/ifdtool: option to allow region override
 
 Signed-off-by: Leah Rowe <leah@libreboot.org>
 ---

config/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch

@@ -1,7 +1,7 @@
-From fb4bc4ed6e1fca747e54a34127ca927cb70318ad Mon Sep 17 00:00:00 2001
+From 3e12bbbac3b15803de4053f8983dc908029832ac Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Fri, 20 Feb 2026 19:31:19 +0000
-Subject: [PATCH 48/51] me_cleaner: don't modify if -k is used
+Subject: [PATCH 47/51] me_cleaner: don't modify if -k is used
 
 don't remove *anything*. in libreboot, we only
 ever use -k when we werely want to extract the

config/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch

@@ -1,7 +1,7 @@
-From 3535480a7ec3fbf789ff734570d8213f21ee7be1 Mon Sep 17 00:00:00 2001
+From 6f301fe881df4ed8759bf5b16d59d530798fee30 Mon Sep 17 00:00:00 2001
 From: Kat Inskip <kat@inskip.me>
 Date: Tue, 17 Feb 2026 16:18:15 -0800
-Subject: [PATCH 49/51] mb/lenovo/sklkbl: Add Lenovo Thinkpad X270 as a variant
+Subject: [PATCH 48/51] mb/lenovo/sklkbl: Add Lenovo Thinkpad X270 as a variant
 
 This machine is somewhat dissimilar from the X280 in the PCIe allocations in the overridetree. It also lacks soldered RAM, having a single SODIMM slot.
 

config/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch

@@ -1,7 +1,7 @@
-From 15cfc08cea1e4a091a2dd729bf88fa2a10ef0a3d Mon Sep 17 00:00:00 2001
+From 4557102ed2f7e1355cc3a331c6452884458b7a5e Mon Sep 17 00:00:00 2001
 From: Kat Inskip <kat@inskip.me>
 Date: Sat, 21 Feb 2026 19:48:17 +0000
-Subject: [PATCH 50/51] mb/lenovo/x270: Provide correct vbt and hda_verb
+Subject: [PATCH 49/51] mb/lenovo/x270: Provide correct vbt and hda_verb
 
 ---
  .../sklkbl_thinkpad/variants/x270/data.vbt    | Bin 6144 -> 4449 bytes

config/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port-upstream-compat.patch

@@ -1,7 +1,7 @@
-From 24cb7949962e910c22ccb3e388699709591f2834 Mon Sep 17 00:00:00 2001
+From 9c21961d34b4c8c410f657f478de82025124dcab Mon Sep 17 00:00:00 2001
 From: Todd Baker <todd_baker@student.uml.edu>
 Date: Thu, 12 Mar 2026 13:12:04 -0400
-Subject: [PATCH 51/51] mb/dell: Add OptiPlex 3040 Micro port
+Subject: [PATCH 50/51] mb/dell: Add OptiPlex 3040 Micro port
  (upstream-compatible)
 
 Based on the OptiPlex 3050 Micro (same Skylake H110 PCH-H platform).

config/coreboot/default/patches/0051-disable-Werror-in-the-coreboot-build-system.patch

@@ -1,7 +1,7 @@
-From 841b591f7294c95de5de4cb97e15398c8c5020a0 Mon Sep 17 00:00:00 2001
+From 31f8f8de88963b1329aeac1b5c09de53165e7ce8 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Thu, 23 Apr 2026 20:27:35 +0100
-Subject: [PATCH 1/1] disable -Werror in the coreboot build system
+Subject: [PATCH 51/51] disable -Werror in the coreboot build system
 
 we don't want it in libreboot, a coreboot distro.