Quiet and fast boot

DasharoModulePkg/DasharoBootPolicies/BootPolicies.c

@@ -23,6 +23,7 @@ USB_STACK_POLICY_PROTOCOL mUsbStackPolicy;
 USB_MASS_STORAGE_POLICY_PROTOCOL mUsbMassStoragePolicy;
 PS2_CONTROLLER_POLICY_PROTOCOL mPs2ControllerPolicy;
 SERIAL_REDIRECTION_POLICY_PROTOCOL mSerialRedirectionPolicy;
+FAST_BOOT_POLICY_PROTOCOL mFastBootPolicy;
 
 /**
   Entry point for the Boot Policies Driver.
@@ -41,6 +42,7 @@ InitializeBootPolicies (
   EFI_STATUS  Status = EFI_SUCCESS;
   BOOLEAN *EfiVar;
   UINTN VarSize = sizeof(BOOLEAN);
+  BOOLEAN FUMEnabled;
 
   gBS = SystemTable->BootServices;
   gRT = SystemTable->RuntimeServices;
@@ -53,8 +55,10 @@ InitializeBootPolicies (
   mUsbMassStoragePolicy.UsbMassStorageEnabled	= TRUE;
   mPs2ControllerPolicy.Revision			= PS2_CONTROLLER_POLICY_PROTOCOL_REVISION_01;
   mPs2ControllerPolicy.Ps2ControllerEnabled	= TRUE;
-  mSerialRedirectionPolicy.Revision = PS2_CONTROLLER_POLICY_PROTOCOL_REVISION_01;
+  mSerialRedirectionPolicy.Revision = SERIAL_REDIRECTION_POLICY_PROTOCOL_REVISION_01;
   mSerialRedirectionPolicy.SerialRedirectionEnabled = FALSE;
+  mFastBootPolicy.Revision = FAST_BOOT_POLICY_PROTOCOL_REVISION_01;
+  mFastBootPolicy.FastBootEnabled = FALSE;
 
   Status = GetVariable2 (
              DASHARO_VAR_NETWORK_BOOT,
@@ -189,5 +193,44 @@ InitializeBootPolicies (
     DEBUG ((EFI_D_INFO, "Boot Policy: Enabling Serial Redirection\n"));
   }
 
+  VarSize = sizeof (FUMEnabled);
+
+  Status = GetVariable2 (
+      DASHARO_VAR_FIRMWARE_UPDATE_MODE,
+      &gDasharoSystemFeaturesGuid,
+      (VOID **) &EfiVar,
+      &VarSize
+      );
+
+  if (EFI_ERROR(Status) || VarSize != sizeof(FUMEnabled)) {
+    FUMEnabled = FALSE;
+  } else {
+    FUMEnabled = *EfiVar;
+  }
+
+  VarSize = sizeof(BOOLEAN);
+  Status = GetVariable2(
+                  DASHARO_VAR_FAST_BOOT,
+                  &gDasharoSystemFeaturesGuid,
+                  (VOID **) &EfiVar,
+                  &VarSize
+                  );
+  if (EFI_ERROR (Status))
+    mFastBootPolicy.FastBootEnabled = FALSE;
+  else if (!EFI_ERROR (Status) && (VarSize == sizeof(*EfiVar)))
+    mFastBootPolicy.FastBootEnabled = *EfiVar;
+
+  if (mFastBootPolicy.FastBootEnabled && !FUMEnabled) {
+    PcdSetBoolS(PcdConInConnectOnDemand, TRUE);
+
+    gBS->InstallMultipleProtocolInterfaces (
+      &ImageHandle,
+      &gDasharoFastBootPolicyGuid,
+      &mFastBootPolicy,
+      NULL
+      );
+    DEBUG ((EFI_D_INFO, "Boot Policy: Enabling Fast Boot\n"));
+  }
+
   return EFI_SUCCESS;
 }

DasharoModulePkg/DasharoBootPolicies/BootPolicies.h

@@ -26,11 +26,15 @@ Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
 #define DASHARO_SERIAL_REDIRECTION_POLICY_PROTOCOL_GUID \
   { 0x0cd9776f, 0xd803, 0x42b4, 0x95, 0xa4, 0xa8, 0x58, 0x46, 0x46, 0x23, 0xc9 }
 
+#define DASHARO_FAST_BOOT_POLICY_PROTOCOL_GUID \
+  { 0xb28a95e5, 0xb41f, 0x4ea1, 0xb2, 0x2a, 0xad, 0x4e, 0xdc, 0x3a, 0x77, 0x7c }
+
 #define NETWORK_BOOT_POLICY_PROTOCOL_REVISION_01	0x01
 #define USB_STACK_POLICY_PROTOCOL_REVISION_01		0x01
 #define USB_MASS_STORAGE_POLICY_PROTOCOL_REVISION_01	0x01
 #define PS2_CONTROLLER_POLICY_PROTOCOL_REVISION_01	0x01
 #define SERIAL_REDIRECTION_POLICY_PROTOCOL_REVISION_01	0x01
+#define FAST_BOOT_POLICY_PROTOCOL_REVISION_01	0x01
 
 typedef struct _NETWORK_BOOT_POLICY_PROTOCOL {
   UINT32           Revision;
@@ -57,6 +61,11 @@ typedef struct _SERIAL_REDIRECTION_POLICY_PROTOCOL {
   BOOLEAN          SerialRedirectionEnabled;
 } SERIAL_REDIRECTION_POLICY_PROTOCOL;
 
+typedef struct _FAST_BOOT_POLICY_PROTOCOL {
+  UINT32           Revision;
+  BOOLEAN          FastBootEnabled;
+} FAST_BOOT_POLICY_PROTOCOL;
+
 //
 // Extern the GUID for protocol users.
 //
@@ -65,5 +74,6 @@ extern EFI_GUID gDasharoUsbDriverPolicyGuid;
 extern EFI_GUID gDasharoUsbMassStoragePolicyGuid;
 extern EFI_GUID gDasharoPs2ControllerPolicyGuid;
 extern EFI_GUID gDasharoSerialRedirectionPolicyGuid;
+extern EFI_GUID gDasharoFastBootPolicyGuid;
 
 #endif

DasharoModulePkg/DasharoBootPolicies/DasharoBootPolicies.inf

@@ -25,6 +25,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   DasharoModulePkg/DasharoModulePkg.dec
 
 [LibraryClasses]
@@ -45,12 +46,15 @@
   gDasharoUsbMassStoragePolicyGuid     ### PROVIDES
   gDasharoPs2ControllerPolicyGuid      ### PROVIDES
   gDasharoSerialRedirectionPolicyGuid  ### PROVIDES
+  gDasharoFastBootPolicyGuid           ### PROVIDES
 
 [Pcd]
   gDasharoSystemFeaturesTokenSpaceGuid.PcdDefaultNetworkBootEnable
   gDasharoSystemFeaturesTokenSpaceGuid.PcdSerialRedirectionDefaultState
   gDasharoSystemFeaturesTokenSpaceGuid.PcdSerialRedirection2DefaultState
   gDasharoSystemFeaturesTokenSpaceGuid.PcdHave2ndUart
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection
 
 [Depex]
   gEfiVariableArchProtocolGuid

DasharoModulePkg/DasharoModulePkg.dec

@@ -37,6 +37,7 @@
   gDasharoUsbMassStoragePolicyGuid = { 0xd7d1a290, 0x651a, 0x4c90, { 0xbf, 0x09, 0x1b, 0x7c, 0x56, 0x7c, 0xd5, 0x9c }}
   gDasharoPs2ControllerPolicyGuid = { 0x4885b96d, 0xbdf1, 0x496d, { 0xbc, 0x3d, 0x3e, 0x79, 0x57, 0x74, 0xcd, 0x40 }}
   gDasharoSerialRedirectionPolicyGuid = { 0x0cd9776f, 0xd803, 0x42b4, { 0x95, 0xa4, 0xa8, 0x58, 0x46, 0x46, 0x23, 0xc9 }}
+  gDasharoFastBootPolicyGuid = { 0xb28a95e5, 0xb41f, 0x4ea1, { 0xb2, 0x2a, 0xad, 0x4e, 0xdc, 0x3a, 0x77, 0x7c }}
 
 [PcdsFixedAtBuild]
   gDasharoSystemFeaturesTokenSpaceGuid.PcdShowMenu|FALSE|BOOLEAN|0x00000001

DasharoModulePkg/Include/DasharoOptions.h

@@ -47,6 +47,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define DASHARO_VAR_SMBIOS_UUID  L"Type1UUID"
 #define DASHARO_VAR_SMBIOS_SN    L"Type2SN"
 
+#define DASHARO_VAR_QUIET_BOOT   L"QuietBoot"
+#define DASHARO_VAR_FAST_BOOT    L"FastBoot"
+
 //
 // Constants for some of the above EFI variables which typically have a value of
 // UINT8 type.

DasharoModulePkg/Library/DasharoVariablesLib/DasharoVariablesLib.c

@@ -70,6 +70,8 @@ STATIC CONST AUTO_VARIABLE mAutoCreatedVariables[] = {
   { DASHARO_VAR_SMALL_CORE_ACTIVE_COUNT, FixedPcdGetBool (PcdShowCpuMenu) && FixedPcdGetBool (PcdShowCpuCoreDisable) },
   { DASHARO_VAR_CORE_ACTIVE_COUNT, FixedPcdGetBool (PcdShowCpuMenu) && FixedPcdGetBool (PcdShowCpuCoreDisable) },
   { DASHARO_VAR_HYPER_THREADING, FixedPcdGetBool (PcdShowCpuMenu) && FixedPcdGetBool (PcdShowCpuHyperThreading) },
+  { DASHARO_VAR_QUIET_BOOT, TRUE },
+  { DASHARO_VAR_FAST_BOOT, TRUE },
 };
 
 /**
@@ -179,6 +181,14 @@ GetVariableInfo (
   } else if (StrCmp (VarName, DASHARO_VAR_HYPER_THREADING) == 0) {
     Data.Boolean = FixedPcdGetBool (PcdCpuHyperThreadingDefault);
     Size = sizeof (Data.Boolean);
+  } else if (StrCmp (VarName, DASHARO_VAR_QUIET_BOOT) == 0) {
+    Data.Boolean = FALSE;
+    Size = sizeof (Data.Boolean);
+    ExtraAttrs = EFI_VARIABLE_RUNTIME_ACCESS;
+  } else if (StrCmp (VarName, DASHARO_VAR_FAST_BOOT) == 0) {
+    Data.Boolean = FALSE;
+    Size = sizeof (Data.Boolean);
+    ExtraAttrs = EFI_VARIABLE_RUNTIME_ACCESS;
   } else {
     DEBUG ((EFI_D_ERROR, "%a(): Unknown variable: %s.\n", __FUNCTION__, VarName));
     ASSERT ((0 && "No default value set for a variable."));

DasharoPayloadPkg/DasharoPayloadPkg.dsc

@@ -586,7 +586,6 @@
   gDasharoPayloadPkgTokenSpaceGuid.PcdSkipPs2Detect|TRUE
 !endif
 
-
 ################################################################################
 #
 # Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
@@ -636,6 +635,9 @@
   gIntelSiliconPkgTokenSpaceGuid.PcdVTdPolicyPropertyMask|1
 !endif
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|FALSE
+
 [PcdsDynamicHii]
 !if $(TPM_ENABLE) == TRUE
   gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS

DasharoPayloadPkg/DasharoPayloadPkg.fdf

@@ -308,7 +308,7 @@ INF SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.inf
 # Typically will be done per platform needs by coreboot.
 #
   FILE DRIVER = DEB917C0-C56A-4860-A05B-BF2F22EBB717 {
-    SECTION DXE_DEPEX_EXP = {gDasharoNetworkBootPolicyGuid}
+    SECTION DXE_DEPEX_EXP = {gDasharoNetworkBootPolicyGuid AND NOT gDasharoFastBootPolicyGuid}
     SECTION PE32 = DasharoPayloadPkg/NetworkDrivers/LanRom.efi
   }
 !endif
@@ -390,7 +390,13 @@ INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf
 !endif
 !endif
 
-INF CrScreenshotDxe/CrScreenshotDxe.inf
+# A hacky way to add gDasharoFastBootPolicyGuid to the CrScreenshotDxe depex
+# without forking.
+FILE DRIVER = CAB058DF-E938-4F85-8978-1F7E6AABDB96 {
+  SECTION DXE_DEPEX_EXP = {gEfiGraphicsOutputProtocolGuid AND gEfiSimpleTextInputExProtocolGuid AND NOT gDasharoFastBootPolicyGuid}
+  SECTION PE32 = CrScreenshotDxe/CrScreenshotDxe.inf
+  SECTION UI = "CrScreenshotDxe"
+}
 
 !if $(CAPSULE_SUPPORT) == TRUE
 INF  MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
@@ -464,6 +470,14 @@ INF  MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
+[Rule.Common.UEFI_DRIVER.BINARY]
+  FILE DRIVER = $(NAMED_GUID) {
+    DXE_DEPEX DXE_DEPEX Optional      |.depex
+    PE32      PE32                    |.efi
+    UI        STRING="$(MODULE_NAME)" Optional
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+  }
+
 [Rule.Common.UEFI_APPLICATION]
   FILE APPLICATION = $(NAMED_GUID) {
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi