]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Universal / MemoryTest / GenericMemoryTestDxe / LightMemoryTest.c
index 7fd383ab721ef54039527f53b71940584275dac0..8b993a78898da29653bd7dcac3b4255537ba954f 100644 (file)
 // protocol, so we do not need to dynamically allocate the PrivateData.\r
 //\r
 EFI_PHYSICAL_ADDRESS    mCurrentAddress;\r
-LIST_ENTRY          *mCurrentLink;\r
+LIST_ENTRY              *mCurrentLink;\r
 NONTESTED_MEMORY_RANGE  *mCurrentRange;\r
 UINT64                  mTestedSystemMemory;\r
 UINT64                  mNonTestedSystemMemory;\r
 \r
-UINT32                  GenericMemoryTestMonoPattern[GENERIC_CACHELINE_SIZE / 4] = {\r
+UINT32  GenericMemoryTestMonoPattern[GENERIC_CACHELINE_SIZE / 4] = {\r
   0x5a5a5a5a,\r
   0xa5a5a5a5,\r
   0x5a5a5a5a,\r
@@ -60,18 +60,20 @@ UINT32                  GenericMemoryTestMonoPattern[GENERIC_CACHELINE_SIZE / 4]
 INTN\r
 EFIAPI\r
 CompareMemWithoutCheckArgument (\r
-  IN      CONST VOID                *DestinationBuffer,\r
-  IN      CONST VOID                *SourceBuffer,\r
-  IN      UINTN                     Length\r
+  IN      CONST VOID  *DestinationBuffer,\r
+  IN      CONST VOID  *SourceBuffer,\r
+  IN      UINTN       Length\r
   )\r
 {\r
   ASSERT (Length > 0);\r
   while ((--Length != 0) &&\r
-         (*(INT8*)DestinationBuffer == *(INT8*)SourceBuffer)) {\r
-    DestinationBuffer = (INT8*)DestinationBuffer + 1;\r
-    SourceBuffer = (INT8*)SourceBuffer + 1;\r
+         (*(INT8 *)DestinationBuffer == *(INT8 *)SourceBuffer))\r
+  {\r
+    DestinationBuffer = (INT8 *)DestinationBuffer + 1;\r
+    SourceBuffer      = (INT8 *)SourceBuffer + 1;\r
   }\r
-  return (INTN)*(UINT8*)DestinationBuffer - (INTN)*(UINT8*)SourceBuffer;\r
+\r
+  return (INTN)*(UINT8 *)DestinationBuffer - (INTN)*(UINT8 *)SourceBuffer;\r
 }\r
 \r
 /**\r
@@ -89,9 +91,9 @@ ConstructBaseMemoryRange (
   IN  GENERIC_MEMORY_TEST_PRIVATE  *Private\r
   )\r
 {\r
-  UINTN                           NumberOfDescriptors;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR *MemorySpaceMap;\r
-  UINTN                           Index;\r
+  UINTN                            NumberOfDescriptors;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *MemorySpaceMap;\r
+  UINTN                            Index;\r
 \r
   //\r
   // Base memory will always below 4G\r
@@ -100,7 +102,8 @@ ConstructBaseMemoryRange (
 \r
   for (Index = 0; Index < NumberOfDescriptors; Index++) {\r
     if ((MemorySpaceMap[Index].GcdMemoryType == EfiGcdMemoryTypeSystemMemory) ||\r
-        (MemorySpaceMap[Index].GcdMemoryType == EfiGcdMemoryTypeMoreReliable)) {\r
+        (MemorySpaceMap[Index].GcdMemoryType == EfiGcdMemoryTypeMoreReliable))\r
+    {\r
       Private->BaseMemorySize += MemorySpaceMap[Index].Length;\r
     }\r
   }\r
@@ -119,7 +122,7 @@ DestroyLinkList (
   IN  GENERIC_MEMORY_TEST_PRIVATE  *Private\r
   )\r
 {\r
-  LIST_ENTRY          *Link;\r
+  LIST_ENTRY              *Link;\r
   NONTESTED_MEMORY_RANGE  *NontestedRange;\r
 \r
   Link = Private->NonTestedMemRanList.BackLink;\r
@@ -128,7 +131,7 @@ DestroyLinkList (
     RemoveEntryList (Link);\r
     NontestedRange = NONTESTED_MEMORY_RANGE_FROM_LINK (Link);\r
     gBS->FreePool (NontestedRange);\r
-    Link = Private->NonTestedMemRanList.BackLink;;\r
+    Link = Private->NonTestedMemRanList.BackLink;\r
   }\r
 }\r
 \r
@@ -144,12 +147,13 @@ DestroyLinkList (
 **/\r
 EFI_STATUS\r
 ConvertToTestedMemory (\r
-  IN UINT64           BaseAddress,\r
-  IN UINT64           Length,\r
-  IN UINT64           Capabilities\r
+  IN UINT64  BaseAddress,\r
+  IN UINT64  Length,\r
+  IN UINT64  Capabilities\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
+\r
   Status = gDS->RemoveMemorySpace (\r
                   BaseAddress,\r
                   Length\r
@@ -164,6 +168,7 @@ ConvertToTestedMemory (
                     (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED | EFI_MEMORY_RUNTIME)\r
                     );\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -181,7 +186,7 @@ UpdateMemoryMap (
   IN  GENERIC_MEMORY_TEST_PRIVATE  *Private\r
   )\r
 {\r
-  LIST_ENTRY          *Link;\r
+  LIST_ENTRY              *Link;\r
   NONTESTED_MEMORY_RANGE  *Range;\r
 \r
   Link = Private->NonTestedMemRanList.ForwardLink;\r
@@ -235,15 +240,16 @@ DirectRangeTest (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Add the tested compatible memory to system memory using GCD service\r
   //\r
   ConvertToTestedMemory (\r
-      StartAddress,\r
-      Length,\r
-      Capabilities &~\r
-      (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED | EFI_MEMORY_RUNTIME)\r
-      );\r
+    StartAddress,\r
+    Length,\r
+    Capabilities &~\r
+    (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED | EFI_MEMORY_RUNTIME)\r
+    );\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -263,11 +269,11 @@ ConstructNonTestedMemoryRange (
   IN  GENERIC_MEMORY_TEST_PRIVATE  *Private\r
   )\r
 {\r
-  NONTESTED_MEMORY_RANGE          *Range;\r
-  BOOLEAN                         NoFound;\r
-  UINTN                           NumberOfDescriptors;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR *MemorySpaceMap;\r
-  UINTN                           Index;\r
+  NONTESTED_MEMORY_RANGE           *Range;\r
+  BOOLEAN                          NoFound;\r
+  UINTN                            NumberOfDescriptors;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *MemorySpaceMap;\r
+  UINTN                            Index;\r
 \r
   //\r
   // Non tested memory range may be span 4G here\r
@@ -277,19 +283,20 @@ ConstructNonTestedMemoryRange (
   gDS->GetMemorySpaceMap (&NumberOfDescriptors, &MemorySpaceMap);\r
 \r
   for (Index = 0; Index < NumberOfDescriptors; Index++) {\r
-    if (MemorySpaceMap[Index].GcdMemoryType == EfiGcdMemoryTypeReserved &&\r
-        (MemorySpaceMap[Index].Capabilities & (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED)) ==\r
-          (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED)\r
-          ) {\r
+    if ((MemorySpaceMap[Index].GcdMemoryType == EfiGcdMemoryTypeReserved) &&\r
+        ((MemorySpaceMap[Index].Capabilities & (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED)) ==\r
+         (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED))\r
+        )\r
+    {\r
       NoFound = FALSE;\r
       //\r
       // Light version do not need to process >4G memory range\r
       //\r
       gBS->AllocatePool (\r
-            EfiBootServicesData,\r
-            sizeof (NONTESTED_MEMORY_RANGE),\r
-            (VOID **) &Range\r
-            );\r
+             EfiBootServicesData,\r
+             sizeof (NONTESTED_MEMORY_RANGE),\r
+             (VOID **)&Range\r
+             );\r
 \r
       Range->Signature    = EFI_NONTESTED_MEMORY_RANGE_SIGNATURE;\r
       Range->StartAddress = MemorySpaceMap[Index].BaseAddress;\r
@@ -339,9 +346,10 @@ WriteMemory (
   }\r
 \r
   while (Address < (Start + Size)) {\r
-    CopyMem ((VOID *) (UINTN) Address, Private->MonoPattern, Private->MonoTestSize);\r
+    CopyMem ((VOID *)(UINTN)Address, Private->MonoPattern, Private->MonoTestSize);\r
     Address += Private->CoverageSpan;\r
   }\r
+\r
   //\r
   // bug bug: we may need GCD service to make the code cache and data uncache,\r
   // if GCD do not support it or return fail, then just flush the whole cache.\r
@@ -396,10 +404,10 @@ VerifyMemory (
   //\r
   while (Address < (Start + Size)) {\r
     ErrorFound = CompareMemWithoutCheckArgument (\r
-                  (VOID *) (UINTN) (Address),\r
-                  Private->MonoPattern,\r
-                  Private->MonoTestSize\r
-                  );\r
+                   (VOID *)(UINTN)(Address),\r
+                   Private->MonoPattern,\r
+                   Private->MonoTestSize\r
+                   );\r
     if (ErrorFound != 0) {\r
       //\r
       // Report uncorrectable errors\r
@@ -409,23 +417,23 @@ VerifyMemory (
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      ExtendedErrorData->DataHeader.HeaderSize  = (UINT16) sizeof (EFI_STATUS_CODE_DATA);\r
-      ExtendedErrorData->DataHeader.Size        = (UINT16) (sizeof (EFI_MEMORY_EXTENDED_ERROR_DATA) - sizeof (EFI_STATUS_CODE_DATA));\r
-      ExtendedErrorData->Granularity            = EFI_MEMORY_ERROR_DEVICE;\r
-      ExtendedErrorData->Operation              = EFI_MEMORY_OPERATION_READ;\r
-      ExtendedErrorData->Syndrome               = 0x0;\r
-      ExtendedErrorData->Address                = Address;\r
-      ExtendedErrorData->Resolution             = 0x40;\r
+      ExtendedErrorData->DataHeader.HeaderSize = (UINT16)sizeof (EFI_STATUS_CODE_DATA);\r
+      ExtendedErrorData->DataHeader.Size       = (UINT16)(sizeof (EFI_MEMORY_EXTENDED_ERROR_DATA) - sizeof (EFI_STATUS_CODE_DATA));\r
+      ExtendedErrorData->Granularity           = EFI_MEMORY_ERROR_DEVICE;\r
+      ExtendedErrorData->Operation             = EFI_MEMORY_OPERATION_READ;\r
+      ExtendedErrorData->Syndrome              = 0x0;\r
+      ExtendedErrorData->Address               = Address;\r
+      ExtendedErrorData->Resolution            = 0x40;\r
 \r
       REPORT_STATUS_CODE_EX (\r
-          EFI_ERROR_CODE,\r
-          EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE,\r
-          0,\r
-          &gEfiGenericMemTestProtocolGuid,\r
-          NULL,\r
-          (UINT8 *) ExtendedErrorData + sizeof (EFI_STATUS_CODE_DATA),\r
-          ExtendedErrorData->DataHeader.Size\r
-          );\r
+        EFI_ERROR_CODE,\r
+        EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE,\r
+        0,\r
+        &gEfiGenericMemTestProtocolGuid,\r
+        NULL,\r
+        (UINT8 *)ExtendedErrorData + sizeof (EFI_STATUS_CODE_DATA),\r
+        ExtendedErrorData->DataHeader.Size\r
+        );\r
 \r
       return EFI_DEVICE_ERROR;\r
     }\r
@@ -450,14 +458,14 @@ VerifyMemory (
 EFI_STATUS\r
 EFIAPI\r
 InitializeMemoryTest (\r
-  IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
-  IN  EXTENDMEM_COVERAGE_LEVEL                 Level,\r
-  OUT BOOLEAN                                  *RequireSoftECCInit\r
+  IN EFI_GENERIC_MEMORY_TEST_PROTOCOL  *This,\r
+  IN  EXTENDMEM_COVERAGE_LEVEL         Level,\r
+  OUT BOOLEAN                          *RequireSoftECCInit\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  GENERIC_MEMORY_TEST_PRIVATE *Private;\r
-  EFI_CPU_ARCH_PROTOCOL       *Cpu;\r
+  EFI_STATUS                   Status;\r
+  GENERIC_MEMORY_TEST_PRIVATE  *Private;\r
+  EFI_CPU_ARCH_PROTOCOL        *Cpu;\r
 \r
   Private             = GENERIC_MEMORY_TEST_PRIVATE_FROM_THIS (This);\r
   *RequireSoftECCInit = FALSE;\r
@@ -487,31 +495,33 @@ InitializeMemoryTest (
   Status = gBS->LocateProtocol (\r
                   &gEfiCpuArchProtocolGuid,\r
                   NULL,\r
-                  (VOID **) &Cpu\r
+                  (VOID **)&Cpu\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
     Private->Cpu = Cpu;\r
   }\r
+\r
   //\r
   // Create the CoverageSpan of the memory test base on the coverage level\r
   //\r
   switch (Private->CoverLevel) {\r
-  case EXTENSIVE:\r
-    Private->CoverageSpan = GENERIC_CACHELINE_SIZE;\r
-    break;\r
+    case EXTENSIVE:\r
+      Private->CoverageSpan = GENERIC_CACHELINE_SIZE;\r
+      break;\r
 \r
-  case SPARSE:\r
-    Private->CoverageSpan = SPARSE_SPAN_SIZE;\r
-    break;\r
+    case SPARSE:\r
+      Private->CoverageSpan = SPARSE_SPAN_SIZE;\r
+      break;\r
 \r
-  //\r
-  // Even the BDS do not need to test any memory, but in some case it\r
-  // still need to init ECC memory.\r
-  //\r
-  default:\r
-    Private->CoverageSpan = QUICK_SPAN_SIZE;\r
-    break;\r
+    //\r
+    // Even the BDS do not need to test any memory, but in some case it\r
+    // still need to init ECC memory.\r
+    //\r
+    default:\r
+      Private->CoverageSpan = QUICK_SPAN_SIZE;\r
+      break;\r
   }\r
+\r
   //\r
   // This is the first time we construct the non-tested memory range, if no\r
   // extended memory found, we know the system have not any extended memory\r
@@ -521,6 +531,7 @@ InitializeMemoryTest (
   if (Status == EFI_NOT_FOUND) {\r
     return EFI_NO_MEDIA;\r
   }\r
+\r
   //\r
   // ready to perform the R/W/V memory test\r
   //\r
@@ -550,11 +561,11 @@ InitializeMemoryTest (
 EFI_STATUS\r
 EFIAPI\r
 GenPerformMemoryTest (\r
-  IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
-  OUT UINT64                                   *TestedMemorySize,\r
-  OUT UINT64                                   *TotalMemorySize,\r
-  OUT BOOLEAN                                  *ErrorOut,\r
-  IN BOOLEAN                                   TestAbort\r
+  IN EFI_GENERIC_MEMORY_TEST_PROTOCOL  *This,\r
+  OUT UINT64                           *TestedMemorySize,\r
+  OUT UINT64                           *TotalMemorySize,\r
+  OUT BOOLEAN                          *ErrorOut,\r
+  IN BOOLEAN                           TestAbort\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -578,31 +589,33 @@ GenPerformMemoryTest (
     } else {\r
       BlockBoundary = mCurrentRange->StartAddress + mCurrentRange->Length - mCurrentAddress;\r
     }\r
+\r
     //\r
     // If TestAbort is true, means user cancel the memory test\r
     //\r
-    if (!TestAbort && Private->CoverLevel != IGNORE) {\r
+    if (!TestAbort && (Private->CoverLevel != IGNORE)) {\r
       //\r
       // Report status code of every memory range\r
       //\r
-      RangeData                         = AllocateZeroPool (sizeof (EFI_MEMORY_RANGE_EXTENDED_DATA));\r
+      RangeData = AllocateZeroPool (sizeof (EFI_MEMORY_RANGE_EXTENDED_DATA));\r
       if (RangeData == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
-      RangeData->DataHeader.HeaderSize  = (UINT16) sizeof (EFI_STATUS_CODE_DATA);\r
-      RangeData->DataHeader.Size        = (UINT16) (sizeof (EFI_MEMORY_RANGE_EXTENDED_DATA) - sizeof (EFI_STATUS_CODE_DATA));\r
-      RangeData->Start                  = mCurrentAddress;\r
-      RangeData->Length                 = BlockBoundary;\r
+\r
+      RangeData->DataHeader.HeaderSize = (UINT16)sizeof (EFI_STATUS_CODE_DATA);\r
+      RangeData->DataHeader.Size       = (UINT16)(sizeof (EFI_MEMORY_RANGE_EXTENDED_DATA) - sizeof (EFI_STATUS_CODE_DATA));\r
+      RangeData->Start                 = mCurrentAddress;\r
+      RangeData->Length                = BlockBoundary;\r
 \r
       REPORT_STATUS_CODE_EX (\r
-          EFI_PROGRESS_CODE,\r
-          EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST,\r
-          0,\r
-          &gEfiGenericMemTestProtocolGuid,\r
-          NULL,\r
-          (UINT8 *) RangeData + sizeof (EFI_STATUS_CODE_DATA),\r
-          RangeData->DataHeader.Size\r
-          );\r
+        EFI_PROGRESS_CODE,\r
+        EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST,\r
+        0,\r
+        &gEfiGenericMemTestProtocolGuid,\r
+        NULL,\r
+        (UINT8 *)RangeData + sizeof (EFI_STATUS_CODE_DATA),\r
+        RangeData->DataHeader.Size\r
+        );\r
 \r
       //\r
       // The software memory test (R/W/V) perform here. It will detect the\r
@@ -622,7 +635,7 @@ GenPerformMemoryTest (
     }\r
 \r
     mTestedSystemMemory += BlockBoundary;\r
-    *TestedMemorySize = mTestedSystemMemory;\r
+    *TestedMemorySize    = mTestedSystemMemory;\r
 \r
     //\r
     // If the memory test restart after the platform driver disable dimms,\r
@@ -638,6 +651,7 @@ GenPerformMemoryTest (
 \r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Change to next non tested memory range\r
   //\r
@@ -654,7 +668,6 @@ GenPerformMemoryTest (
     *TotalMemorySize  = Private->BaseMemorySize + mNonTestedSystemMemory;\r
     return EFI_NOT_FOUND;\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -668,11 +681,11 @@ GenPerformMemoryTest (
 EFI_STATUS\r
 EFIAPI\r
 GenMemoryTestFinished (\r
-  IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This\r
+  IN EFI_GENERIC_MEMORY_TEST_PROTOCOL  *This\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  GENERIC_MEMORY_TEST_PRIVATE *Private;\r
+  EFI_STATUS                   Status;\r
+  GENERIC_MEMORY_TEST_PRIVATE  *Private;\r
 \r
   Private = GENERIC_MEMORY_TEST_PRIVATE_FROM_THIS (This);\r
 \r
@@ -712,16 +725,16 @@ GenMemoryTestFinished (
 EFI_STATUS\r
 EFIAPI\r
 GenCompatibleRangeTest (\r
-  IN EFI_GENERIC_MEMORY_TEST_PROTOCOL         *This,\r
-  IN EFI_PHYSICAL_ADDRESS                     StartAddress,\r
-  IN UINT64                                   Length\r
+  IN EFI_GENERIC_MEMORY_TEST_PROTOCOL  *This,\r
+  IN EFI_PHYSICAL_ADDRESS              StartAddress,\r
+  IN UINT64                            Length\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  GENERIC_MEMORY_TEST_PRIVATE     *Private;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;\r
-  EFI_PHYSICAL_ADDRESS            CurrentBase;\r
-  UINT64                          CurrentLength;\r
+  EFI_STATUS                       Status;\r
+  GENERIC_MEMORY_TEST_PRIVATE      *Private;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  Descriptor;\r
+  EFI_PHYSICAL_ADDRESS             CurrentBase;\r
+  UINT64                           CurrentLength;\r
 \r
   Private = GENERIC_MEMORY_TEST_PRIVATE_FROM_THIS (This);\r
 \r
@@ -731,6 +744,7 @@ GenCompatibleRangeTest (
   if (StartAddress + Length > 0x1000000) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   CurrentBase = StartAddress;\r
   do {\r
     //\r
@@ -745,14 +759,16 @@ GenCompatibleRangeTest (
       return Status;\r
     }\r
 \r
-    if (Descriptor.GcdMemoryType == EfiGcdMemoryTypeReserved &&\r
-        (Descriptor.Capabilities & (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED)) ==\r
-          (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED)\r
-          ) {\r
+    if ((Descriptor.GcdMemoryType == EfiGcdMemoryTypeReserved) &&\r
+        ((Descriptor.Capabilities & (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED)) ==\r
+         (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED))\r
+        )\r
+    {\r
       CurrentLength = Descriptor.BaseAddress + Descriptor.Length - CurrentBase;\r
       if (CurrentBase + CurrentLength > StartAddress + Length) {\r
         CurrentLength = StartAddress + Length - CurrentBase;\r
       }\r
+\r
       Status = DirectRangeTest (\r
                  Private,\r
                  CurrentBase,\r
@@ -763,8 +779,10 @@ GenCompatibleRangeTest (
         return Status;\r
       }\r
     }\r
+\r
     CurrentBase = Descriptor.BaseAddress + Descriptor.Length;\r
   } while (CurrentBase < StartAddress + Length);\r
+\r
   //\r
   // Here means the required range already be tested, so just return success.\r
   //\r
@@ -784,7 +802,7 @@ GenCompatibleRangeTest (
 **/\r
 EFI_STATUS\r
 PerformAddressDataLineTest (\r
-  IN  GENERIC_MEMORY_TEST_PRIVATE      *Private\r
+  IN  GENERIC_MEMORY_TEST_PRIVATE  *Private\r
   )\r
 {\r
   LIST_ENTRY              *ExtendedLink;\r
@@ -795,7 +813,7 @@ PerformAddressDataLineTest (
   //\r
   // Light version no data line test, only perform the address line test\r
   //\r
-  TestAddress = (EFI_PHYSICAL_ADDRESS) 0x1;\r
+  TestAddress = (EFI_PHYSICAL_ADDRESS)0x1;\r
   while (TestAddress < MAX_ADDRESS && TestAddress > 0) {\r
     //\r
     // only test if the address falls in the enabled range\r
@@ -806,7 +824,8 @@ PerformAddressDataLineTest (
       ExtendedRange = NONTESTED_MEMORY_RANGE_FROM_LINK (ExtendedLink);\r
       if ((TestAddress >= ExtendedRange->StartAddress) &&\r
           (TestAddress < (ExtendedRange->StartAddress + ExtendedRange->Length))\r
-          ) {\r
+          )\r
+      {\r
         InExtendedRange = TRUE;\r
       }\r
 \r
@@ -814,9 +833,9 @@ PerformAddressDataLineTest (
     }\r
 \r
     if (InExtendedRange) {\r
-      *(EFI_PHYSICAL_ADDRESS *) (UINTN) TestAddress = TestAddress;\r
+      *(EFI_PHYSICAL_ADDRESS *)(UINTN)TestAddress = TestAddress;\r
       Private->Cpu->FlushDataCache (Private->Cpu, TestAddress, 1, EfiCpuFlushTypeWriteBackInvalidate);\r
-      if (*(EFI_PHYSICAL_ADDRESS *) (UINTN) TestAddress != TestAddress) {\r
+      if (*(EFI_PHYSICAL_ADDRESS *)(UINTN)TestAddress != TestAddress) {\r
         return EFI_ACCESS_DENIED;\r
       }\r
     }\r
@@ -826,10 +845,11 @@ PerformAddressDataLineTest (
 \r
   return EFI_SUCCESS;\r
 }\r
+\r
 //\r
 // Driver entry here\r
 //\r
-GENERIC_MEMORY_TEST_PRIVATE mGenericMemoryTestPrivate = {\r
+GENERIC_MEMORY_TEST_PRIVATE  mGenericMemoryTestPrivate = {\r
   EFI_GENERIC_MEMORY_TEST_PRIVATE_SIGNATURE,\r
   NULL,\r
   NULL,\r
@@ -839,7 +859,7 @@ GENERIC_MEMORY_TEST_PRIVATE mGenericMemoryTestPrivate = {
     GenMemoryTestFinished,\r
     GenCompatibleRangeTest\r
   },\r
-  (EXTENDMEM_COVERAGE_LEVEL) 0,\r
+  (EXTENDMEM_COVERAGE_LEVEL)0,\r
   0,\r
   0,\r
   NULL,\r
@@ -867,8 +887,8 @@ GENERIC_MEMORY_TEST_PRIVATE mGenericMemoryTestPrivate = {
 EFI_STATUS\r
 EFIAPI\r
 GenericMemoryTestEntryPoint (\r
-  IN  EFI_HANDLE           ImageHandle,\r
-  IN  EFI_SYSTEM_TABLE     *SystemTable\r
+  IN  EFI_HANDLE        ImageHandle,\r
+  IN  EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS            Status;\r
@@ -879,8 +899,8 @@ GenericMemoryTestEntryPoint (
   //\r
   // Use the generic pattern to test compatible memory range\r
   //\r
-  mGenericMemoryTestPrivate.MonoPattern   = GenericMemoryTestMonoPattern;\r
-  mGenericMemoryTestPrivate.MonoTestSize  = GENERIC_CACHELINE_SIZE;\r
+  mGenericMemoryTestPrivate.MonoPattern  = GenericMemoryTestMonoPattern;\r
+  mGenericMemoryTestPrivate.MonoTestSize = GENERIC_CACHELINE_SIZE;\r
 \r
   //\r
   // Get the platform boot mode\r
@@ -899,19 +919,20 @@ GenericMemoryTestEntryPoint (
   // level and span size for compatible memory test using\r
   //\r
   switch (BootMode) {\r
-  case BOOT_WITH_FULL_CONFIGURATION:\r
-  case BOOT_WITH_DEFAULT_SETTINGS:\r
-    mGenericMemoryTestPrivate.CoverageSpan = SPARSE_SPAN_SIZE;\r
-    break;\r
-\r
-  case BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS:\r
-    mGenericMemoryTestPrivate.CoverageSpan = GENERIC_CACHELINE_SIZE;\r
-    break;\r
-\r
-  default:\r
-    mGenericMemoryTestPrivate.CoverageSpan = QUICK_SPAN_SIZE;\r
-    break;\r
+    case BOOT_WITH_FULL_CONFIGURATION:\r
+    case BOOT_WITH_DEFAULT_SETTINGS:\r
+      mGenericMemoryTestPrivate.CoverageSpan = SPARSE_SPAN_SIZE;\r
+      break;\r
+\r
+    case BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS:\r
+      mGenericMemoryTestPrivate.CoverageSpan = GENERIC_CACHELINE_SIZE;\r
+      break;\r
+\r
+    default:\r
+      mGenericMemoryTestPrivate.CoverageSpan = QUICK_SPAN_SIZE;\r
+      break;\r
   }\r
+\r
   //\r
   // Install the protocol\r
   //\r