Merged PR 6142: Correct Pei Graphics Init

## Description The PEI Graphics module requires a pre-allocated Info buffer. - [No ] Breaking change? - Will this change break pre-existing builds or functionality without action being taken? ## How This Was Tested Tested on Zeus and ZeusFasr ## Integration Instructions N/A Correct Pei Graphics Init
makubacki · Oct 12, 2022 · d5fd11e · d5fd11e
1 parent b4a05eb
commit d5fd11e
Show file tree

Hide file tree

Showing 15 changed files with 1,397 additions and 1,395 deletions.
diff --git a/DfciPkg/DfciPkg.dec b/DfciPkg/DfciPkg.dec
diff --git a/MfciPkg/MfciPkg.ci.yaml b/MfciPkg/MfciPkg.ci.yaml
@@ -1,94 +1,94 @@
-## @file
-# CI configuration for MfciPkg
-#
-# Copyright (c) Microsoft Corporation
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-{
-    ## options defined ci/Plugin/CompilerPlugin
-    "CompilerPlugin": {
-        "DscPath": "MfciPkg.dsc"
-    },
-
-    ## options defined ci/Plugin/CharEncodingCheck
-    "CharEncodingCheck": {
-        "IgnoreFiles": []
-    },
-
-    ## options defined ci/Plugin/DependencyCheck
-    "DependencyCheck": {
-        "AcceptableDependencies": [
-            "MdePkg/MdePkg.dec",
-            "MdeModulePkg/MdeModulePkg.dec",
-            "MfciPkg/MfciPkg.dec",
-            "MsCorePkg/MsCorePkg.dec",
-            "CryptoPkg/CryptoPkg.dec",
-            "SecurityPkg/SecurityPkg.dec",
-            "MsWheaPkg/MsWheaPkg.dec",
-            "PcBdsPkg/PcBdsPkg.dec"
-        ],
-        "AcceptableDependencies-HOST_APPLICATION":[ # for host based unit tests
-            "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
-        ],
-        "IgnoreInf": []
-    },
-
-    ## options defined ci/Plugin/DscCompleteCheck
-    "DscCompleteCheck": {
-        "IgnoreInf": [],
-        "DscPath": "MfciPkg.dsc"
-    },
-
-    ## options defined ci/Plugin/HostUnitTestCompilerPlugin
-    "HostUnitTestCompilerPlugin": {
-        "DscPath": "UnitTests/MfciPkgHostTest.dsc"
-    },
-
-    ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
-    "HostUnitTestDscCompleteCheck": {
-        "IgnoreInf": [],
-        "DscPath": "UnitTests/MfciPkgHostTest.dsc"
-    },
-
-    ## options defined ci/Plugin/GuidCheck
-    "GuidCheck": {
-        "IgnoreGuidName": [],
-        "IgnoreGuidValue": [],
-        "IgnoreFoldersAndFiles": [],
-        "IgnoreDuplicates": []
-    },
-
-    ## options defined ci/Plugin/LibraryClassCheck
-    "LibraryClassCheck": {
-        "IgnoreLibraryClass": [],
-        "IgnoreHeaderFile": []
-    },
-
-    ## options defined ci/Plugin/SpellCheck
-    "SpellCheck": {
-        "IgnoreStandardPaths": [     # Standard Plugin defined paths that should be ignore
-        ],
-        "IgnoreFiles": [             # use gitignore syntax to ignore errors in matching files
-        ],
-        "ExtendWords": [           # words to extend to the dictionary for this package
-            "basecore",
-            "certutil",
-            "commandline",
-            "detatched",
-            "mfci's",
-            "mfcipkg",
-            "pkg's",
-            "reprovisioned",
-            "cmocka",
-            "Contoso",
-            "SANITYCHECK",
-            "SECUREBOOT",
-            "SERIALNUMBER",
-            "VALIDATEBLOB",
-            "malformatted",
-            "nonced",
-            "eku's"
-        ],
-        "AdditionalIncludePaths": [] # Additional paths to spell check relative to package root (wildcards supported)
-    }
-}
+## @file
+# CI configuration for MfciPkg
+#
+# Copyright (c) Microsoft Corporation
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+{
+    ## options defined ci/Plugin/CompilerPlugin
+    "CompilerPlugin": {
+        "DscPath": "MfciPkg.dsc"
+    },
+
+    ## options defined ci/Plugin/CharEncodingCheck
+    "CharEncodingCheck": {
+        "IgnoreFiles": []
+    },
+
+    ## options defined ci/Plugin/DependencyCheck
+    "DependencyCheck": {
+        "AcceptableDependencies": [
+            "MdePkg/MdePkg.dec",
+            "MdeModulePkg/MdeModulePkg.dec",
+            "MfciPkg/MfciPkg.dec",
+            "MsCorePkg/MsCorePkg.dec",
+            "CryptoPkg/CryptoPkg.dec",
+            "SecurityPkg/SecurityPkg.dec",
+            "MsWheaPkg/MsWheaPkg.dec",
+            "PcBdsPkg/PcBdsPkg.dec"
+        ],
+        "AcceptableDependencies-HOST_APPLICATION":[ # for host based unit tests
+            "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
+        ],
+        "IgnoreInf": []
+    },
+
+    ## options defined ci/Plugin/DscCompleteCheck
+    "DscCompleteCheck": {
+        "IgnoreInf": [],
+        "DscPath": "MfciPkg.dsc"
+    },
+
+    ## options defined ci/Plugin/HostUnitTestCompilerPlugin
+    "HostUnitTestCompilerPlugin": {
+        "DscPath": "UnitTests/MfciPkgHostTest.dsc"
+    },
+
+    ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
+    "HostUnitTestDscCompleteCheck": {
+        "IgnoreInf": [],
+        "DscPath": "UnitTests/MfciPkgHostTest.dsc"
+    },
+
+    ## options defined ci/Plugin/GuidCheck
+    "GuidCheck": {
+        "IgnoreGuidName": [],
+        "IgnoreGuidValue": [],
+        "IgnoreFoldersAndFiles": [],
+        "IgnoreDuplicates": []
+    },
+
+    ## options defined ci/Plugin/LibraryClassCheck
+    "LibraryClassCheck": {
+        "IgnoreLibraryClass": [],
+        "IgnoreHeaderFile": []
+    },
+
+    ## options defined ci/Plugin/SpellCheck
+    "SpellCheck": {
+        "IgnoreStandardPaths": [     # Standard Plugin defined paths that should be ignore
+        ],
+        "IgnoreFiles": [             # use gitignore syntax to ignore errors in matching files
+        ],
+        "ExtendWords": [           # words to extend to the dictionary for this package
+            "basecore",
+            "certutil",
+            "commandline",
+            "detatched",
+            "mfci's",
+            "mfcipkg",
+            "pkg's",
+            "reprovisioned",
+            "cmocka",
+            "Contoso",
+            "SANITYCHECK",
+            "SECUREBOOT",
+            "SERIALNUMBER",
+            "VALIDATEBLOB",
+            "malformatted",
+            "nonced",
+            "eku's"
+        ],
+        "AdditionalIncludePaths": [] # Additional paths to spell check relative to package root (wildcards supported)
+    }
+}
diff --git a/MfciPkg/MfciPkg.dec b/MfciPkg/MfciPkg.dec
@@ -1,72 +1,72 @@
-## @file
-# Package declaration file for the Manufacturer Firmware Configuration
-# Interface (MFCI) Package
-#
-# Copyright (c) Microsoft Corporation
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-
-
-[Defines]
-  DEC_SPECIFICATION     = 0x00010017
-  PACKAGE_NAME          = MfciPkg
-  PACKAGE_VERSION       = 0.1
-  PACKAGE_GUID          = BFAA8619-C893-4492-8760-D834BEC058F7
-
-[Guids.Common]
-  gMfciHobGuid =            { 0x653065a3, 0xadc5, 0x49fe, { 0x97, 0x4c, 0x14, 0x48, 0x58, 0x02, 0x37, 0x3b } }
-  gMfciVendorGuid =         { 0xeba1a9d2, 0xbf4d, 0x4736, { 0xb6, 0x80, 0xb3, 0x6a, 0xfb, 0x4d, 0xd6, 0x5b } }
-
-  #  Include/Guid/MfciPkgTokenSpace.h
-  #  {9dea6cff-1d8d-449f-b1f7-5a8b8f9ca268}
-  gMfciPkgTokenSpaceGuid = { 0x9dea6cff, 0x1d8d, 0x449f, { 0xb1, 0xf7, 0x5a, 0x8b, 0x8f, 0x9c, 0xa2, 0x68 } }
-
-  # Guid to use for gRT->ResetSystem() to indicate the type of reset that is being performed.
-  # {65de7e43-f6de-439a-b61b-bf15b6288848}
-  gMfciPolicyChangeResetGuid = { 0x65de7e43, 0xf6de, 0x439a, { 0xb6, 0x1b, 0xbf, 0x15, 0xb6, 0x28, 0x88, 0x48 } }
-
-[Includes]
-  Include
-
-[Includes.Common.Private]
-  Private
-
-[Protocols]
-  gMfciProtocolGuid =       { 0xa902e87e, 0xcafa, 0x49c0, { 0x9c, 0xfe, 0x8d, 0xa9, 0x73, 0xc, 0x94, 0xc } }
-
-[Protocols.Common.Private]
-  gMfciPolicyChangeNotifyProtocolGuid = { 0xe3c1a8e2, 0x600d, 0x43b6, { 0x81, 0x4f, 0xa7, 0xea, 0x0, 0x66, 0xef, 0x61 } }
-
-[Ppis]
-  gMfciPpiGuid =            { 0xddd86789, 0x85c, 0x4c3d, { 0x8a, 0xb6, 0x96, 0x74, 0x30, 0xce, 0xd8, 0x2e } }
-
-[LibraryClasses]
-  ##  @libraryclass  Library used to publish the MFCI UEFI targeting variables
-  ##
-  MfciDeviceIdSupportLib|Include/Library/MfciDeviceIdSupportLib.h
-  MfciRetrieveTargetPolicyLib|Include/Library/MfciRetrieveTargetPolicyLib.h
-
-[LibraryClasses.Common.Private]
-  MfciPolicyParsingLib|Private/Library/MfciPolicyParsingLib.h
-  MfciPolicyParsingLib|Private/Library/MfciPolicyParsingLib/MfciPolicyParsingLibInternal.h
-  MfciRetrievePolicyLib|Private/Library/MfciRetrievePolicyLib.h
-
-[PcdsFixedAtBuild]
-  ## One or more PKCS7 certificates used to verify the MFCI Policy
-  #  blob.  Encoded using the Variable-Length Opaque Data format of RFC
-  #  4506 External Data Representation Standard (XDR).  The default value is
-  #  empty with 0 certificates.
-  # @Prompt One or more XDR encoded PKCS7 certificates used to verify MFCI Policy
-  gMfciPkgTokenSpaceGuid.PcdMfciPkcs7CertBufferXdr|{0x0}|VOID*|0x40000042
-
-  # The trusted EKU required on the leaf certificate of the signer, a NULL-terminated CHAR8 string
-  gMfciPkgTokenSpaceGuid.PcdMfciPkcs7RequiredLeafEKU|"0"|VOID*|0x40000043
-
-  # Pcd indicating the system capabilities value, if the platform elects to use PCD as source
-  # of truth. The capabilities will be translated into MFCI_POLICY_TYPE and consumed by MFCI
-  # framework as system target policy.
-  #
-  gMfciPkgTokenSpaceGuid.SystemCapabilities|0x0|UINT64|0x40000044
-
-[PcdsFeatureFlag]
-  gMfciPkgTokenSpaceGuid.PcdEnforceWindowsPcr11PrivacyPolicy|TRUE|BOOLEAN|0x40000084
+## @file
+# Package declaration file for the Manufacturer Firmware Configuration
+# Interface (MFCI) Package
+#
+# Copyright (c) Microsoft Corporation
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+
+
+[Defines]
+  DEC_SPECIFICATION     = 0x00010017
+  PACKAGE_NAME          = MfciPkg
+  PACKAGE_VERSION       = 0.1
+  PACKAGE_GUID          = BFAA8619-C893-4492-8760-D834BEC058F7
+
+[Guids.Common]
+  gMfciHobGuid =            { 0x653065a3, 0xadc5, 0x49fe, { 0x97, 0x4c, 0x14, 0x48, 0x58, 0x02, 0x37, 0x3b } }
+  gMfciVendorGuid =         { 0xeba1a9d2, 0xbf4d, 0x4736, { 0xb6, 0x80, 0xb3, 0x6a, 0xfb, 0x4d, 0xd6, 0x5b } }
+
+  #  Include/Guid/MfciPkgTokenSpace.h
+  #  {9dea6cff-1d8d-449f-b1f7-5a8b8f9ca268}
+  gMfciPkgTokenSpaceGuid = { 0x9dea6cff, 0x1d8d, 0x449f, { 0xb1, 0xf7, 0x5a, 0x8b, 0x8f, 0x9c, 0xa2, 0x68 } }
+
+  # Guid to use for gRT->ResetSystem() to indicate the type of reset that is being performed.
+  # {65de7e43-f6de-439a-b61b-bf15b6288848}
+  gMfciPolicyChangeResetGuid = { 0x65de7e43, 0xf6de, 0x439a, { 0xb6, 0x1b, 0xbf, 0x15, 0xb6, 0x28, 0x88, 0x48 } }
+
+[Includes]
+  Include
+
+[Includes.Common.Private]
+  Private
+
+[Protocols]
+  gMfciProtocolGuid =       { 0xa902e87e, 0xcafa, 0x49c0, { 0x9c, 0xfe, 0x8d, 0xa9, 0x73, 0xc, 0x94, 0xc } }
+
+[Protocols.Common.Private]
+  gMfciPolicyChangeNotifyProtocolGuid = { 0xe3c1a8e2, 0x600d, 0x43b6, { 0x81, 0x4f, 0xa7, 0xea, 0x0, 0x66, 0xef, 0x61 } }
+
+[Ppis]
+  gMfciPpiGuid =            { 0xddd86789, 0x85c, 0x4c3d, { 0x8a, 0xb6, 0x96, 0x74, 0x30, 0xce, 0xd8, 0x2e } }
+
+[LibraryClasses]
+  ##  @libraryclass  Library used to publish the MFCI UEFI targeting variables
+  ##
+  MfciDeviceIdSupportLib|Include/Library/MfciDeviceIdSupportLib.h
+  MfciRetrieveTargetPolicyLib|Include/Library/MfciRetrieveTargetPolicyLib.h
+
+[LibraryClasses.Common.Private]
+  MfciPolicyParsingLib|Private/Library/MfciPolicyParsingLib.h
+  MfciPolicyParsingLib|Private/Library/MfciPolicyParsingLib/MfciPolicyParsingLibInternal.h
+  MfciRetrievePolicyLib|Private/Library/MfciRetrievePolicyLib.h
+
+[PcdsFixedAtBuild]
+  ## One or more PKCS7 certificates used to verify the MFCI Policy
+  #  blob.  Encoded using the Variable-Length Opaque Data format of RFC
+  #  4506 External Data Representation Standard (XDR).  The default value is
+  #  empty with 0 certificates.
+  # @Prompt One or more XDR encoded PKCS7 certificates used to verify MFCI Policy
+  gMfciPkgTokenSpaceGuid.PcdMfciPkcs7CertBufferXdr|{0x0}|VOID*|0x40000042
+
+  # The trusted EKU required on the leaf certificate of the signer, a NULL-terminated CHAR8 string
+  gMfciPkgTokenSpaceGuid.PcdMfciPkcs7RequiredLeafEKU|"0"|VOID*|0x40000043
+
+  # Pcd indicating the system capabilities value, if the platform elects to use PCD as source
+  # of truth. The capabilities will be translated into MFCI_POLICY_TYPE and consumed by MFCI
+  # framework as system target policy.
+  #
+  gMfciPkgTokenSpaceGuid.SystemCapabilities|0x0|UINT64|0x40000044
+
+[PcdsFeatureFlag]
+  gMfciPkgTokenSpaceGuid.PcdEnforceWindowsPcr11PrivacyPolicy|TRUE|BOOLEAN|0x40000084