Merge branch 'master' into root-bridges-host-provided-fix-aperture-init

tianocore · Oct 9, 2024 · 45c667a · 45c667a
2 parents 9e172c0 + 7bac0a9
commit 45c667a
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 30 deletions.
diff --git a/BaseTools/Plugin/CodeQL/CodeQlAnalyzePlugin.py b/BaseTools/Plugin/CodeQL/CodeQlAnalyzePlugin.py
@@ -3,6 +3,7 @@
 # A build plugin that analyzes a CodeQL database.
 #
 # Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
 
@@ -78,6 +79,11 @@ def do_post_build(self, builder: UefiBuilder) -> int:
         # Packages are allowed to specify package-specific query specifiers
         # in the package CI YAML file that override the global query specifier.
         audit_only = False
+        global_audit_only = builder.env.GetValue("STUART_CODEQL_AUDIT_ONLY")
+        if global_audit_only:
+            if global_audit_only.strip().lower() == "true":
+                audit_only = True
+
         query_specifiers = None
         package_config_file = Path(os.path.join(
                                 self.package_path, self.package + ".ci.yaml"))
@@ -94,11 +100,6 @@ def do_post_build(self, builder: UefiBuilder) -> int:
                                       f"{str(package_config_file)}")
                         query_specifiers = plugin_data["QuerySpecifiers"]
 
-        global_audit_only = builder.env.GetValue("STUART_CODEQL_AUDIT_ONLY")
-        if global_audit_only:
-            if global_audit_only.strip().lower() == "true":
-                audit_only = True
-
         if audit_only:
             logging.info(f"CodeQL Analyze plugin is in audit only mode for "
                          f"{self.package} ({self.target}).")

diff --git a/BaseTools/Scripts/SetupGit.py b/BaseTools/Scripts/SetupGit.py
@@ -150,7 +150,7 @@ def write_config_value(repo, section, option, data):
                         action='store_true',
                         required=False)
     PARSER.add_argument('-n', '--name', type=str, metavar='repo',
-                        choices=['edk2', 'edk2-platforms', 'edk2-non-osi'],
+                        choices=['edk2', 'edk2-platforms', 'edk2-non-osi', 'edk2-test'],
                         help='set the repo name to configure for, if not '
                              'detected automatically',
                         required=False)

diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c
@@ -774,7 +774,7 @@ AmlSetPkgLength (
   // Write to the Buffer.
   *Buffer       = LeadByte;
   CurrentOffset = 1;
-  while (CurrentOffset < (Offset + 1)) {
+  while (CurrentOffset < (Offset + (UINT8)1)) {
     CurrentShift              = (UINT8)((CurrentOffset - 1) * 8);
     ComputedLength            = Length & (UINT32)(0x00000FF0 << CurrentShift);
     ComputedLength            = (ComputedLength) >> (4 + CurrentShift);

diff --git a/EmulatorPkg/Win/Host/WinGopInput.c b/EmulatorPkg/Win/Host/WinGopInput.c
@@ -404,6 +404,10 @@ WinNtWndRegisterKeyNotify (
 
   Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);
 
+  if (Private == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
   Private->MakeRegisterdKeyCallback    = MakeCallBack;
   Private->BreakRegisterdKeyCallback   = BreakCallBack;
   Private->RegisterdKeyCallbackContext = Context;

diff --git a/EmulatorPkg/Win/Host/WinGopScreen.c b/EmulatorPkg/Win/Host/WinGopScreen.c
@@ -808,6 +808,7 @@ WinNtGraphicsWindowOpen (
 
   GopPrivateCreateQ (Private, &Private->QueueForRead);
 
+  Private->Signature                          = GRAPHICS_PRIVATE_DATA_SIGNATURE;
   Private->GraphicsWindowIo.Size              = WinNtWndSize;
   Private->GraphicsWindowIo.CheckKey          = WinNtWndCheckKey;
   Private->GraphicsWindowIo.GetKey            = WinNtWndGetKey;

diff --git a/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c b/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c
@@ -228,7 +228,7 @@ EvaluateDependency (
 {
   EFI_STATUS     Status;
   UINT8          *Iterator;
-  UINT8          Index;
+  UINTN          Index;
   DEPEX_ELEMENT  Element1;
   DEPEX_ELEMENT  Element2;
   GUID           ImageTypeId;

diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
@@ -593,8 +593,12 @@ UnitTestDebugAssert (
   If MDEPKG_NDEBUG is defined or the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit
   of PcdDebugProperyMask is clear, then this macro computes the offset, in bytes,
   of the field specified by Field from the beginning of the data structure specified
-  by TYPE.  This offset is subtracted from Record, and is used to return a pointer
-  to a data structure of the type specified by TYPE.
+  by TYPE.  This offset is subtracted from Record, and is used to compute a pointer
+  to a data structure of the type specified by TYPE.  The Signature field of the
+  data structure specified by TYPE is compared to TestSignature.  If the signatures
+  match, then a pointer to the pointer to a data structure of the type specified by
+  TYPE is returned.  If the signatures do not match, then NULL is returned to
+  signify that the passed in data structure is invalid.
 
   If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit
   of PcdDebugProperyMask is set, then this macro computes the offset, in bytes,
@@ -628,9 +632,13 @@ UnitTestDebugAssert (
 #define CR(Record, TYPE, Field, TestSignature)                                              \
     (DebugAssertEnabled () && (BASE_CR (Record, TYPE, Field)->Signature != TestSignature)) ?  \
     (TYPE *) (_ASSERT (CR has Bad Signature), Record) :                                       \
+    (BASE_CR (Record, TYPE, Field)->Signature != TestSignature) ?                             \
+    NULL :                                                                                    \
     BASE_CR (Record, TYPE, Field)
 #else
 #define CR(Record, TYPE, Field, TestSignature)                                              \
+    (BASE_CR (Record, TYPE, Field)->Signature != TestSignature) ?                           \
+    NULL :                                                                                  \
     BASE_CR (Record, TYPE, Field)
 #endif
 

diff --git a/UefiPayloadPkg/PayloadLoaderPeim/FitPayloadLoaderPeim.c b/UefiPayloadPkg/PayloadLoaderPeim/FitPayloadLoaderPeim.c
@@ -35,6 +35,43 @@ EFI_PEI_PPI_DESCRIPTOR  mEndOfPeiSignalPpi = {
   NULL
 };
 
+#if (FixedPcdGetBool (PcdHandOffFdtEnable) == 0)
+
+/**
+  Notify ReadyToPayLoad signal.
+  @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.
+  @param[in] NotifyDescriptor  Address of the notification descriptor data structure.
+  @param[in] Ppi               Address of the PPI that was installed.
+  @retval EFI_SUCCESS          Hobs data is discovered.
+  @return Others               No Hobs data is discovered.
+**/
+EFI_STATUS
+EFIAPI
+EndOfPeiPpiNotifyCallback (
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDescriptor,
+  IN VOID                       *Ppi
+  )
+{
+  EFI_STATUS  Status;
+
+  //
+  // Ready to Payload phase signal
+  //
+  Status = PeiServicesInstallPpi (&gReadyToPayloadSignalPpi);
+
+  return Status;
+}
+
+EFI_PEI_NOTIFY_DESCRIPTOR  mEndOfPeiNotifyList[] = {
+  {
+    (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
+    &gEfiEndOfPeiSignalPpiGuid,
+    EndOfPeiPpiNotifyCallback
+  }
+};
+#endif
+
 /**
   The wrapper function of PeiLoadImageLoadImage().
   @param This            - Pointer to EFI_PEI_LOAD_FILE_PPI.
@@ -144,13 +181,14 @@ PeiLoadFileLoadPayload (
   *ImageSizeArg    = Context.PayloadSize;
   *EntryPoint      = Context.PayloadEntryPoint;
 
+ #if (FixedPcdGetBool (PcdHandOffFdtEnable))
+
   Status = PeiServicesInstallPpi (&mEndOfPeiSignalPpi);
   ASSERT_EFI_ERROR (Status);
 
   Status = PeiServicesInstallPpi (&gReadyToPayloadSignalPpi);
   ASSERT_EFI_ERROR (Status);
 
- #if (FixedPcdGetBool (PcdHandOffFdtEnable))
   Hob = GetFirstGuidHob (&gUniversalPayloadDeviceTreeGuid);
   if (Hob != NULL) {
     Fdt =  (UNIVERSAL_PAYLOAD_DEVICE_TREE *)GET_GUID_HOB_DATA (Hob);
@@ -178,6 +216,9 @@ PeiLoadFileLoadPayload (
     NULL,
     TopOfStack
     );
+ #else
+  Status = PeiServicesNotifyPpi (&mEndOfPeiNotifyList[0]);
+  ASSERT_EFI_ERROR (Status);
  #endif
 
   return EFI_SUCCESS;

diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c b/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c
@@ -33,7 +33,7 @@ AddUnitTestFailure (
   UnitTest->FailureType = FailureType;
   AsciiStrCpyS (
     &UnitTest->FailureMessage[0],
-    UNIT_TEST_TESTFAILUREMSG_LENGTH,
+    UNIT_TEST_MAX_STRING_LENGTH,
     FailureMessage
     );
 
@@ -50,7 +50,7 @@ UnitTestLogFailure (
   )
 {
   UNIT_TEST_FRAMEWORK_HANDLE  FrameworkHandle;
-  CHAR8                       LogString[UNIT_TEST_TESTFAILUREMSG_LENGTH];
+  CHAR8                       LogString[UNIT_TEST_MAX_STRING_LENGTH];
   VA_LIST                     Marker;
 
   //

diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c b/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c
@@ -15,8 +15,7 @@
 #include <Library/PrintLib.h>
 #include <Library/PcdLib.h>
 
-#define UNIT_TEST_MAX_SINGLE_LOG_STRING_LENGTH  (512)
-#define UNIT_TEST_MAX_LOG_BUFFER                SIZE_16KB
+#define UNIT_TEST_MAX_LOG_BUFFER  SIZE_16KB
 
 struct _UNIT_TEST_LOG_PREFIX_STRING {
   UNIT_TEST_STATUS    LogLevel;
@@ -85,7 +84,7 @@ AddStringToUnitTestLog (
              UnitTest->Log,
              UNIT_TEST_MAX_LOG_BUFFER / sizeof (CHAR8),
              String,
-             UNIT_TEST_MAX_SINGLE_LOG_STRING_LENGTH
+             UNIT_TEST_MAX_STRING_LENGTH
              );
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "Failed to add unit test log string.  Status = %r\n", Status));
@@ -160,8 +159,8 @@ UnitTestLog (
   )
 {
   UNIT_TEST_FRAMEWORK_HANDLE  FrameworkHandle;
-  CHAR8                       NewFormatString[UNIT_TEST_MAX_SINGLE_LOG_STRING_LENGTH];
-  CHAR8                       LogString[UNIT_TEST_MAX_SINGLE_LOG_STRING_LENGTH];
+  CHAR8                       NewFormatString[UNIT_TEST_MAX_STRING_LENGTH];
+  CHAR8                       LogString[UNIT_TEST_MAX_STRING_LENGTH];
   CONST CHAR8                 *LogTypePrefix;
   VA_LIST                     Marker;
 

diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c b/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c
@@ -571,9 +571,9 @@ UpdateTestFromSave (
     Test->FailureType = MatchingTest->FailureType;
     AsciiStrnCpyS (
       &Test->FailureMessage[0],
-      UNIT_TEST_TESTFAILUREMSG_LENGTH,
+      UNIT_TEST_MAX_STRING_LENGTH,
       &MatchingTest->FailureMessage[0],
-      UNIT_TEST_TESTFAILUREMSG_LENGTH
+      UNIT_TEST_MAX_STRING_LENGTH
       );
 
     //
@@ -748,7 +748,7 @@ SerializeState (
       //
       TestSaveData->Result      = UnitTest->Result;
       TestSaveData->FailureType = UnitTest->FailureType;
-      AsciiStrnCpyS (&TestSaveData->FailureMessage[0], UNIT_TEST_TESTFAILUREMSG_LENGTH, &UnitTest->FailureMessage[0], UNIT_TEST_TESTFAILUREMSG_LENGTH);
+      AsciiStrnCpyS (&TestSaveData->FailureMessage[0], UNIT_TEST_MAX_STRING_LENGTH, &UnitTest->FailureMessage[0], UNIT_TEST_MAX_STRING_LENGTH);
 
       //
       // If there is a log, save the log.

diff --git a/UnitTestFrameworkPkg/PrivateInclude/UnitTestFrameworkTypes.h b/UnitTestFrameworkPkg/PrivateInclude/UnitTestFrameworkTypes.h
@@ -15,7 +15,7 @@
 ///
 /// The maximum length of a string stored in the unit test framework
 ///
-#define UNIT_TEST_MAX_STRING_LENGTH  (120)
+#define UNIT_TEST_MAX_STRING_LENGTH  (512)
 
 ///
 /// The size of a firngerprint used to save/resume execution of a unit test
@@ -24,12 +24,6 @@
 ///
 #define UNIT_TEST_FINGERPRINT_SIZE  (sizeof (UINT32))
 
-///
-/// The maximum length of a test failure message stored in the unit test
-/// framework
-///
-#define UNIT_TEST_TESTFAILUREMSG_LENGTH  (120)
-
 ///
 /// FAILURE_TYPE used to record the type of assert that was triggered by a unit
 /// test.
@@ -54,7 +48,7 @@ typedef struct {
   CHAR8                     *Name; // can't have spaces and should be short
   CHAR8                     *Log;
   FAILURE_TYPE              FailureType;
-  CHAR8                     FailureMessage[UNIT_TEST_TESTFAILUREMSG_LENGTH];
+  CHAR8                     FailureMessage[UNIT_TEST_MAX_STRING_LENGTH];
   UINT8                     Fingerprint[UNIT_TEST_FINGERPRINT_SIZE];
   UNIT_TEST_STATUS          Result;
   UNIT_TEST_FUNCTION        RunTest;
@@ -117,7 +111,7 @@ typedef struct {
 typedef struct {
   UINT32              Size;                                       // Size of the UNIT_TEST_SAVE_TEST including Log[]
   UINT8               Fingerprint[UNIT_TEST_FINGERPRINT_SIZE];    // Fingerprint of the test itself.
-  CHAR8               FailureMessage[UNIT_TEST_TESTFAILUREMSG_LENGTH];
+  CHAR8               FailureMessage[UNIT_TEST_MAX_STRING_LENGTH];
   FAILURE_TYPE        FailureType;
   UNIT_TEST_STATUS    Result;
   CHAR8               Log[];