Nuc bugfixes

configs/config.novacustom_nuc_box

@@ -2,11 +2,13 @@ CONFIG_LOCALVERSION="v0.9.0-rc3"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_NOVACUSTOM=y
 CONFIG_MAINBOARD_VENDOR="NovaCustom"
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_POST_IO is not set
 CONFIG_VBOOT=y
 CONFIG_VBOOT_SLOTS_RW_A=y
 CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/nuc_box/ifd.bin"
 CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/nuc_box/me.bin"
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x200000
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_NOVACUSTOM_NUC_BOX=y
 CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/novacustom/bootsplash.bmp"
@@ -15,7 +17,6 @@ CONFIG_FSP_FD_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/MeteorLakeFspBinPkg
 CONFIG_SOFTWARE_CONNECTION_MANAGER=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 CONFIG_HAVE_ME_BIN=y
-CONFIG_NO_GFX_INIT=y
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
 CONFIG_DRIVERS_EFI_FW_INFO=y
 CONFIG_DRIVERS_EFI_MAIN_FW_GUID="6f3f1f8c-f0a1-42d4-adee-14b476f9e066"
@@ -26,6 +27,8 @@ CONFIG_ADD_FSP_BINARIES=y
 CONFIG_FSP_FULL_FD=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
 CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y
+CONFIG_BOOTMEDIA_SMM_BWP=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
@@ -34,7 +37,6 @@ CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_EDK2_FTDI_USB_UART_SUPPORT=y
-CONFIG_EDK2_GOP_FILE="3rdparty/dasharo-blobs/novacustom/nuc_box/IntelGopDriver.efi"
 CONFIG_BUILD_IPXE=y
 CONFIG_IPXE_ADD_SCRIPT=y
 CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe"
@@ -47,6 +49,7 @@ CONFIG_EDK2_SETUP_PASSWORD=y
 CONFIG_EDK2_PERFORMANCE_MEASUREMENT_ENABLE=y
 CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y
 CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y
+CONFIG_EDK2_SHOW_WIFI_BT_OPTION=y
 CONFIG_EDK2_DASHARO_INTEL_ME_OPTIONS=y
 CONFIG_EDK2_DASHARO_USB_CONFIG=y
 CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y

src/arch/x86/smbios.c

@@ -240,7 +240,20 @@ int smbios_write_type7_cache_parameters(unsigned long *current,
 		const u8 level = info.level;
 		const size_t assoc = info.num_ways;
 		const size_t cache_share = info.num_cores_shared;
-		const size_t cache_size = info.size * get_number_of_caches(cache_share);
+
+		/*
+		 * In the case of unified L3 cache, the info_size is already the correct
+		 * total size. Multiplying by number of cores is unnecessary and might result
+		 * in the cache displaying as zero.
+		 */
+		size_t tmp_cache_size;
+		if (level < 3) {
+			tmp_cache_size = info.size * get_number_of_caches(cache_share);
+		}
+		else {
+			tmp_cache_size = info.size;
+		}
+		const size_t cache_size = tmp_cache_size;
 
 		if (!cache_type)
 			/* No more caches in the system */

src/mainboard/novacustom/nuc_box/Kconfig

@@ -46,6 +46,10 @@ config MAINBOARD_SMBIOS_PRODUCT_NAME
 config MAINBOARD_VERSION
 	default "nuc_box" if BOARD_NOVACUSTOM_NUC_BOX
 
+config MAINBOARD_FAMILY
+	string
+	default "Not Applicable" # Match Insyde firmware
+
 config CMOS_DEFAULT_FILE
 	default "src/mainboard/\$(MAINBOARDDIR)/cmos.default"
 

src/mainboard/novacustom/nuc_box/devicetree.cb

@@ -44,7 +44,7 @@ chip soc/intel/meteorlake
 			register "pmc_gpe0_dw1" = "PMC_GPP_E"
 			register "pmc_gpe0_dw2" = "PMC_GPP_H"
 		end
-		device ref p2sb on end
+		device ref p2sb hidden end
 		device ref hda on
 			register "pch_hda_sdi_enable[0]" = "1"
 			register "pch_hda_audio_link_hda_enable" = "1"
@@ -54,6 +54,7 @@ chip soc/intel/meteorlake
 		end
 		device ref smbus on end
 		device ref fast_spi on end
+		device ref ipu on end
 	end
 	chip drivers/crb
 		device mmio 0xfed40000 on end

src/mainboard/novacustom/nuc_box/ramstage.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <dasharo/options.h>
 #include <device/smbus_host.h>
 #include <mainboard/gpio.h>
 #include <soc/ramstage.h>
@@ -11,6 +12,14 @@ static void mainboard_init(void *chip_info)
 	do_smbus_write_byte(CONFIG_FIXED_SMBUS_IO_BASE, 0xBA >> 1, 0x0F, 0xAA);
 }
 
+void mainboard_update_soc_chip_config(struct soc_intel_meteorlake_config *config)
+{
+	if (get_sleep_type_option() == SLEEP_TYPE_OPTION_S3)
+		config->s0ix_enable = 0;
+	else
+		config->s0ix_enable = 1;
+}
+
 struct chip_operations mainboard_ops = {
 	.init = mainboard_init,
 };