disable 3050micro nvme hotplug

see patch for rationale. this should prevent instability caused when the nvme randomly replugs under linux. sometimes e.g. nvme0n1 becomes nvme0n2 while the system is running. in my case, that caused my raid1 to become unsynced every few days. this issue was fixed on t480 by disabling pcie hotplug for its nvme device, so the same fix has been applied for dell optiplex 3050 micro. Signed-off-by: Leah Rowe <leah@libreboot.org>
fix t480 spd size (512, not 256)
2026-03-25 21:39:03 +02:00 · 2024-12-11 01:11:08 +00:00 · 2024-12-10 23:48:41 +00:00 · 2024-12-08 21:31:06 +00:00 · 2024-12-08 18:24:57 +00:00 · 2024-12-08 18:04:51 +00:00
7 changed files with 64 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /hash/
 /dump/
 /qrun*.sh
+*.tar.*
--- a/config/coreboot/next/patches/0010-dell-3050micro-disable-nvme-hotplug.patch
+++ b/config/coreboot/next/patches/0010-dell-3050micro-disable-nvme-hotplug.patch
@@ -0,0 +1,57 @@
+From adfeaeabcf98878814b463f14aba7871721d7606 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <info@minifree.org>
+Date: Wed, 11 Dec 2024 01:06:01 +0000
+Subject: [PATCH 1/1] dell/3050micro: disable nvme hotplug
+
+in my testing, when running my 3050micro for a few days,
+the nvme would sometimes randomly rename.
+
+e.g. nvme0n1 renamed to nvme0n2
+
+this might cause crashes in linux, if booting only from the
+nvme. in my case, i was booting from mdraid (sata+nvme) and
+every few days, the nvme would rename at least once, causing
+my RAID to become unsynced. since i'm using RAID1, this was
+OK and I could simply re-sync the array, but this is quite
+precarious indeed. if you're using raid0, that will potentially
+corrupt your RAID array indefinitely.
+
+this same issue manifested on the T480/T480 thinkpads, and
+S3 resume would break because of that, when booting from nvme,
+because the nvme would be "unplugged" and appear to linux as a
+new device (the one that you booted from).
+
+the fix there was to disable hotplugging on that pci-e slot
+for the nvme, so apply the same fix here for 3050 micro
+
+Signed-off-by: Leah Rowe <info@minifree.org>
+---
+ 3rdparty/vboot                                 | 2 +-
+ src/mainboard/dell/optiplex_3050/devicetree.cb | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/3rdparty/vboot b/3rdparty/vboot
+index f1f70f46dc..902fe8af96 160000
+--- a/3rdparty/vboot
+++ b/3rdparty/vboot
+@@ -1 +1 @@
+-Subproject commit f1f70f46dc5482bb7c654e53ed58d4001e386df2
+Subproject commit 902fe8af96ad662fac127cb8f51596491cf8272f
+diff --git a/src/mainboard/dell/optiplex_3050/devicetree.cb b/src/mainboard/dell/optiplex_3050/devicetree.cb
+index 039709aa4a..0678ed1765 100644
+--- a/src/mainboard/dell/optiplex_3050/devicetree.cb
+++ b/src/mainboard/dell/optiplex_3050/devicetree.cb
+@@ -45,7 +45,9 @@ chip soc/intel/skylake
+ 			register "PcieRpAdvancedErrorReporting[20]"     = "1"
+ 			register "PcieRpLtrEnable[20]"                  = "1"
+ 			register "PcieRpClkSrcNumber[20]"               = "3"
+-			register "PcieRpHotPlug[20]"                    = "1"
+# disable hotplug on nvme to prevent renaming e.g. nvme0n1 rename to nvme0n2,
+# which could cause crashes in linux if booting from nvme
+			register "PcieRpHotPlug[20]"                    = "0"
+ 		end
+ 
+ 		# Realtek LAN
+-- 
+2.39.5
+
--- a/config/coreboot/t480_fsp_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t480_fsp_16mb/config/libgfxinit_corebootfb
@@ -115,7 +115,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad"
 CONFIG_VGA_BIOS_ID="8086,0406"
 CONFIG_DIMM_MAX=2
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="LENOVO"
--- a/config/coreboot/t480_fsp_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t480_fsp_16mb/config/libgfxinit_txtmode
@@ -115,7 +115,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad"
 CONFIG_VGA_BIOS_ID="8086,0406"
 CONFIG_DIMM_MAX=2
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="LENOVO"
--- a/config/coreboot/t480s_fsp_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t480s_fsp_16mb/config/libgfxinit_corebootfb
@@ -115,7 +115,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad"
 CONFIG_VGA_BIOS_ID="8086,0406"
 CONFIG_DIMM_MAX=2
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="LENOVO"
--- a/config/coreboot/t480s_fsp_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t480s_fsp_16mb/config/libgfxinit_txtmode
@@ -115,7 +115,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad"
 CONFIG_VGA_BIOS_ID="8086,0406"
 CONFIG_DIMM_MAX=2
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="LENOVO"
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -214,7 +214,8 @@ add_uboot()
 	    ubootelf="$ubdir/u-boot-x86-with-spl.bin" # EFI-compatible

 	[ -f "$ubootelf" ] || $err "cb/$ubtarget: Can't find u-boot"
-	cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs; cprom
+	cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs
+	[ "$payload_seabios" = "y" ] || cprom; :
 }

 cprom()
Author	SHA1	Message	Date
Leah Rowe	3b6b283eab	disable 3050micro nvme hotplug see patch for rationale. this should prevent instability caused when the nvme randomly replugs under linux. sometimes e.g. nvme0n1 becomes nvme0n2 while the system is running. in my case, that caused my raid1 to become unsynced every few days. this issue was fixed on t480 by disabling pcie hotplug for its nvme device, so the same fix has been applied for dell optiplex 3050 micro. Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-11 01:11:08 +00:00
Leah Rowe	c202392189	fix t480 spd size (512, not 256) this was done with the following command: ./mk -u coreboot t480s_fsp_16mb t480_fsp_16mb it was set to 256 but should be 512. the SPD is what contains configuration data for raminit, which training code uses so that the timings will be correct. if the SPD size is wrong, the machine won't boot in practise, lbmk always runs "make oldconfig" on a coreboot config, before building it, so this was already being corrected automatically at build time. however, if that fact ever changes in the future, this wrong configuration would cause the machines not to boot. therefore, this can be considered a preventative or perhaps pre-emptive bug fix. this fix does not need to be applied to the `20241206` release, because of the behaviour described above. the final ROM images do have the spd size set correctly to 512, because of this design feature in lbmk. Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-10 23:48:41 +00:00
Leah Rowe	da527459b6	add tarballs and signatures to gitignore Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-08 21:31:06 +00:00
Leah Rowe	b910424b5d	fix another very stupid mistake the last revision disabled building arm64 images! Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-08 18:24:57 +00:00
Leah Rowe	e3b77b132e	fix the stupidest bug ever no context given, but every rom needs to be re-built. Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-08 18:04:51 +00:00