X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FMemoryTest.c;h=fedb151a0c63bb3195a70af2e81d6fb7c0ccb3f9;hb=83daa931dc58e708ac446271a2883d6b73bd77ae;hp=5dbc6342f5689ae717ba37bd3804c9724a83f784;hpb=180a5a35cb49699bd249dee19e41cee34c856a58;p=mirror_edk2.git

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
index 5dbc6342f5..fedb151a0c 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
@@ -1,7 +1,7 @@
 /** @file
   Perform the platform memory test
 
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -230,11 +230,13 @@ BdsMemoryTest (
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL     Color;
   BOOLEAN                           IsFirstBoot;
   UINT32                            TempData;
+  UINTN                             StrTotalMemorySize;
 
   ReturnStatus = EFI_SUCCESS;
   ZeroMem (&Key, sizeof (EFI_INPUT_KEY));
 
-  Pos = AllocatePool (128);
+  StrTotalMemorySize = 128;
+  Pos = AllocateZeroPool (StrTotalMemorySize);
 
   if (Pos == NULL) {
     return ReturnStatus;
@@ -280,14 +282,17 @@ BdsMemoryTest (
     FreePool (Pos);
     return EFI_SUCCESS;
   }
+  
+  if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
+    TmpStr = GetStringById (STRING_TOKEN (STR_ESC_TO_SKIP_MEM_TEST));
 
-  TmpStr = GetStringById (STRING_TOKEN (STR_ESC_TO_SKIP_MEM_TEST));
-
-  if (TmpStr != NULL) {
-    PrintXY (10, 10, NULL, NULL, TmpStr);
-    FreePool (TmpStr);
+    if (TmpStr != NULL) {
+      PrintXY (10, 10, NULL, NULL, TmpStr);
+      FreePool (TmpStr);
+    }
+  } else {
+    DEBUG ((EFI_D_INFO, "Enter memory test.\n"));
   }
-
   do {
     Status = GenMemoryTest->PerformMemoryTest (
                               GenMemoryTest,
@@ -305,43 +310,30 @@ BdsMemoryTest (
 
       ASSERT (0);
     }
+    
+    if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
+      TempData = (UINT32) DivU64x32 (TotalMemorySize, 16);
+      TestPercent = (UINTN) DivU64x32 (
+                              DivU64x32 (MultU64x32 (TestedMemorySize, 100), 16),
+                              TempData
+                              );
+      if (TestPercent != PreviousValue) {
+        UnicodeValueToString (StrPercent, 0, TestPercent, 0);
+        TmpStr = GetStringById (STRING_TOKEN (STR_MEMORY_TEST_PERCENT));
+        if (TmpStr != NULL) {
+          //
+          // TmpStr size is 64, StrPercent is reserved to 16.
+          //
+          StrnCatS (
+            StrPercent,
+            sizeof (StrPercent) / sizeof (CHAR16), 
+            TmpStr,
+            sizeof (StrPercent) / sizeof (CHAR16) - StrLen (StrPercent) - 1
+            );
+          PrintXY (10, 10, NULL, NULL, StrPercent);
+          FreePool (TmpStr);
+        }
 
-    TempData = (UINT32) DivU64x32 (TotalMemorySize, 16);
-    TestPercent = (UINTN) DivU64x32 (
-                            DivU64x32 (MultU64x32 (TestedMemorySize, 100), 16),
-                            TempData
-                            );
-    if (TestPercent != PreviousValue) {
-      UnicodeValueToString (StrPercent, 0, TestPercent, 0);
-      TmpStr = GetStringById (STRING_TOKEN (STR_MEMORY_TEST_PERCENT));
-      if (TmpStr != NULL) {
-        //
-        // TmpStr size is 64, StrPercent is reserved to 16.
-        //
-        StrCat (StrPercent, TmpStr);
-        PrintXY (10, 10, NULL, NULL, StrPercent);
-        FreePool (TmpStr);
-      }
-
-      TmpStr = GetStringById (STRING_TOKEN (STR_PERFORM_MEM_TEST));
-      if (TmpStr != NULL) {
-        PlatformBdsShowProgress (
-          Foreground,
-          Background,
-          TmpStr,
-          Color,
-          TestPercent,
-          (UINTN) PreviousValue
-          );
-        FreePool (TmpStr);
-      }
-    }
-
-    PreviousValue = TestPercent;
-
-    KeyStatus     = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
-    if (!EFI_ERROR (KeyStatus) && (Key.ScanCode == SCAN_ESC)) {
-      if (!RequireSoftECCInit) {
         TmpStr = GetStringById (STRING_TOKEN (STR_PERFORM_MEM_TEST));
         if (TmpStr != NULL) {
           PlatformBdsShowProgress (
@@ -349,47 +341,85 @@ BdsMemoryTest (
             Background,
             TmpStr,
             Color,
-            100,
+            TestPercent,
             (UINTN) PreviousValue
             );
           FreePool (TmpStr);
         }
-
-        PrintXY (10, 10, NULL, NULL, L"100");
-        Status = GenMemoryTest->Finished (GenMemoryTest);
-        goto Done;
       }
 
-      TestAbort = TRUE;
+      PreviousValue = TestPercent;
+    } else {
+      DEBUG ((EFI_D_INFO, "Perform memory test (ESC to skip).\n"));
+    }
+
+    if (!PcdGetBool (PcdConInConnectOnDemand)) {
+      KeyStatus     = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
+      if (!EFI_ERROR (KeyStatus) && (Key.ScanCode == SCAN_ESC)) {
+        if (!RequireSoftECCInit) {
+          if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
+            TmpStr = GetStringById (STRING_TOKEN (STR_PERFORM_MEM_TEST));
+            if (TmpStr != NULL) {
+              PlatformBdsShowProgress (
+                Foreground,
+                Background,
+                TmpStr,
+                Color,
+                100,
+                (UINTN) PreviousValue
+                );
+              FreePool (TmpStr);
+            }
+
+            PrintXY (10, 10, NULL, NULL, L"100");
+          }
+          Status = GenMemoryTest->Finished (GenMemoryTest);
+          goto Done;
+        }
+
+        TestAbort = TRUE;
+      }
     }
   } while (Status != EFI_NOT_FOUND);
 
   Status = GenMemoryTest->Finished (GenMemoryTest);
 
 Done:
-  UnicodeValueToString (StrTotalMemory, COMMA_TYPE, TotalMemorySize, 0);
-  if (StrTotalMemory[0] == L',') {
-    StrTotalMemory++;
-  }
-
-  TmpStr = GetStringById (STRING_TOKEN (STR_MEM_TEST_COMPLETED));
-  if (TmpStr != NULL) {
-    StrCat (StrTotalMemory, TmpStr);
-    FreePool (TmpStr);
-  }
+  if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
+    UnicodeValueToString (StrTotalMemory, COMMA_TYPE, TotalMemorySize, 0);
+    if (StrTotalMemory[0] == L',') {
+      StrTotalMemory++;
+      StrTotalMemorySize -= sizeof (CHAR16);
+    }
 
-  PrintXY (10, 10, NULL, NULL, StrTotalMemory);
-  PlatformBdsShowProgress (
-    Foreground,
-    Background,
-    StrTotalMemory,
-    Color,
-    100,
-    (UINTN) PreviousValue
-    );
+    TmpStr = GetStringById (STRING_TOKEN (STR_MEM_TEST_COMPLETED));
+    if (TmpStr != NULL) {
+      StrnCatS (
+        StrTotalMemory,
+        StrTotalMemorySize / sizeof (CHAR16),
+        TmpStr,
+        StrTotalMemorySize / sizeof (CHAR16) - StrLen (StrTotalMemory) - 1
+        );
+      FreePool (TmpStr);
+    }
 
+    PrintXY (10, 10, NULL, NULL, StrTotalMemory);
+    PlatformBdsShowProgress (
+      Foreground,
+      Background,
+      StrTotalMemory,
+      Color,
+      100,
+      (UINTN) PreviousValue
+      );
+    
+  } else {
+    DEBUG ((EFI_D_INFO, "%d bytes of system memory tested OK\r\n", TotalMemorySize));
+  }
+  
   FreePool (Pos);
 
+
   //
   // Use a DynamicHii type pcd to save the boot status, which is used to
   // control configuration mode, such as FULL/MINIMAL/NO_CHANGES configuration.