Added support to disable DGPU in EDK2

Author: XutaxKamay

configs/config.novacustom_nv4x_dgpu_tgl

@@ -0,0 +1,72 @@
+CONFIG_LOCALVERSION="v2.0.0-rc3"
+CONFIG_OPTION_BACKEND_NONE=y
+CONFIG_VENDOR_NOVACUSTOM=y
+CONFIG_FMDFILE="src/mainboard/clevo/tgl-u/vboot-rwa.fmd"
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_VBOOT=y
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/nv4x_tgl/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/nv4x_tgl/me.bin"
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_BOARD_NOVACUSTOM_NV4X_TGLU=y
+CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/novacustom/bootsplash.bmp"
+CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
+CONFIG_INTEL_TME=y
+CONFIG_ENABLE_EARLY_DMA_PROTECTION=y
+CONFIG_EC_SYSTEM76_EC_UPDATE=y
+CONFIG_HAVE_ME_BIN=y
+CONFIG_NO_GFX_INIT=y
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
+CONFIG_PCIEXP_HOTPLUG_IO=0x2000
+CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
+CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
+CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y
+CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y
+CONFIG_BOOTMEDIA_SMM_BWP=y
+# CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX is not set
+# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
+CONFIG_PAYLOAD_EDK2=y
+CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
+CONFIG_EDK2_TAG_OR_REV="cd38081e8b3ea43f52c0d25daae90c3eb3b8074d"
+CONFIG_EDK2_USE_EDK2_PLATFORMS=y
+CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
+CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
+CONFIG_EDK2_CBMEM_LOGGING=y
+CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
+CONFIG_EDK2_SERIAL_SUPPORT=y
+CONFIG_EDK2_GOP_FILE="3rdparty/dasharo-blobs/novacustom/nv4x_tgl/IntelGopDriver.efi"
+CONFIG_EDK2_USE_LAPTOP_LID_LIB=y
+CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D VARIABLE_SUPPORT=SMMSTORE --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdS3SupportExperimental=TRUE"
+CONFIG_BUILD_IPXE=y
+CONFIG_IPXE_NO_PROMPT=y
+CONFIG_IPXE_ADD_SCRIPT=y
+CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe"
+CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789"
+CONFIG_EDK2_SYSTEM76_EC_LOGGING=y
+CONFIG_EDK2_SKIP_PS2_DETECT=y
+CONFIG_EDK2_ENABLE_IPXE=y
+# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set
+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_CAMERA_OPTION=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
+CONFIG_EDK2_DASHARO_POWER_CONFIG=y
+CONFIG_EDK2_SLEEP_TYPE_OPTION=y
+CONFIG_EDK2_FAN_CURVE_OPTION=y
+CONFIG_EDK2_BATTERY_CONFIG_OPTION=y
+CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_OPTION=y
+CONFIG_EDK2_USB_PORT_POWER_OPTION=y
+CONFIG_EDK2_DGPU_POWER_OPTION=y
+CONFIG_EDK2_BOOT_MENU_KEY=0x0011
+CONFIG_EDK2_SETUP_MENU_KEY=0x000C
+CONFIG_EDK2_ENABLE_BATTERY_CHECK=y
+CONFIG_EDK2_PRINT_SOL_STRINGS=y
+CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y

payloads/external/Makefile.mk

@@ -281,7 +281,8 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) $(IPXE_EFI)
 		CONFIG_DRIVERS_EFI_MAIN_FW_GUID=$(CONFIG_DRIVERS_EFI_MAIN_FW_GUID) \
 		CONFIG_EDK2_ENABLE_FAST_BOOT_FEATURE=$(CONFIG_EDK2_ENABLE_FAST_BOOT_FEATURE) \
 		CONFIG_EDK2_ENABLE_QUIET_BOOT_FEATURE=$(CONFIG_EDK2_ENABLE_QUIET_BOOT_FEATURE) \
-		CONFIG_EDK2_USB_PORT_POWER_OPTION=$(CONFIG_EDK2_USB_PORT_POWER_OPTION)
+		CONFIG_EDK2_USB_PORT_POWER_OPTION=$(CONFIG_EDK2_USB_PORT_POWER_OPTION) \
+		CONFIG_EDK2_DGPU_POWER_OPTION=$(CONFIG_EDK2_DGPU_POWER_OPTION)
 
 
 $(obj)/ShimmedUniversalPayload.elf: $(DOTCONFIG)

payloads/external/edk2/Kconfig.dasharo

@@ -193,6 +193,14 @@ config EDK2_USB_PORT_POWER_OPTION
 	  Shows the USB Port Power option in EDK2 power configuration submenu in
 	  Dasharo System Features menu.
 
+config EDK2_DGPU_POWER_OPTION
+	bool "Show DGPU power option in Dasharo Power Configuration Menu"
+	default n
+	depends on EDK2_DASHARO_POWER_CONFIG
+	help
+	  Shows the DGPU power option in EDK2 power configuration submenu in
+	  Dasharo System Features menu.
+
 config EDK2_DASHARO_PCI_CONFIG
 	bool "Enable EDK2 Dasharo PCI/PCIe Configuration Menu"
 	default n

payloads/external/edk2/Makefile

@@ -279,6 +279,10 @@ ifeq ($(CONFIG_EDK2_USB_PORT_POWER_OPTION),y)
 BUILD_STR += --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdPowerMenuShowUsbPowerOption=TRUE
 endif
 
+ifeq ($(CONFIG_EDK2_DGPU_POWER_OPTION),y)
+BUILD_STR += --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdPowerMenuShowDGPUPowerOption=TRUE
+endif
+
 endif # CONFIG_EDK2_DASHARO_POWER_CONFIG
 # DASHARO_PCI_CONFIG            = FALSE
 ifeq ($(CONFIG_EDK2_DASHARO_PCI_CONFIG),y)

src/mainboard/clevo/tgl-u/variants/nv40mz/ramstage.c

@@ -42,7 +42,7 @@ static void dgpu_power_enable(int onoff) {
 }
 
 static void mainboard_pre_device(void *unused) {
-	dgpu_power_enable(1);
+	dgpu_power_enable(dasharo_is_dgpu_enabled());
 }
 
 BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_ENTRY, mainboard_pre_device, NULL);

src/vendorcode/dasharo/include/dasharo/options.h

@@ -300,4 +300,14 @@ bool get_hyper_threading_option(void);
  */
 uint8_t get_cpu_throttling_offset(uint8_t tcc_offset);
 
+/*
+ * Disable DGPU for power savings.
+ *
+ *
+ * Result:
+ *  - true  - DGPU enabled
+ *  - false - DGPU disabled
+ */
+ bool dasharo_is_dgpu_enabled(void);
+
 #endif /* DASHARO_OPTIONS_H */

src/vendorcode/dasharo/options.c

@@ -281,6 +281,18 @@ uint8_t cse_get_me_disable_mode(void)
 
 	return var;
 }
+
+bool dasharo_is_dgpu_enabled(void)
+{
+	bool var = true;
+
+	if (CONFIG(DRIVERS_EFI_VARIABLE_STORE)) {
+		read_bool_var("DGPUEnabled", &var);
+	}
+
+	return var;
+}
+
 #else
 uint8_t cse_get_me_disable_mode(void)
 {