From ae16301578d3f0e8db562b04af821ec9d885a7af Mon Sep 17 00:00:00 2001
From: Ken Pong <b-jpeng@microsoft.com>
Date: Wed, 11 Oct 2023 15:19:55 +0800
Subject: [PATCH] Update TestPoint ID for TestPointLibAppendErrorString()

---
 .../Test/Library/TestPointCheckLib/DxeCheckAcpi.c         | 4 ++--
 .../Test/Library/TestPointCheckLib/DxeCheckBootVariable.c | 4 ++--
 .../Library/TestPointCheckLib/DxeCheckConsoleVariable.c   | 2 +-
 .../Library/TestPointCheckLib/DxeCheckDmaProtection.c     | 2 +-
 .../Test/Library/TestPointCheckLib/DxeCheckEsrt.c         | 2 +-
 .../Test/Library/TestPointCheckLib/DxeCheckHsti.c         | 2 +-
 .../Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c  | 2 +-
 .../Library/TestPointCheckLib/DxeCheckMemoryAttribute.c   | 2 +-
 .../Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c    | 2 +-
 .../TestPointCheckLib/DxeCheckMemoryTypeInformation.c     | 2 +-
 .../Test/Library/TestPointCheckLib/DxeCheckPci.c          | 6 +++---
 .../Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c      | 4 ++--
 .../Test/Library/TestPointCheckLib/DxeCheckTcgMor.c       | 2 +-
 .../Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c    | 2 +-
 .../Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c    | 6 +++---
 .../Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c | 4 ++--
 .../TestPointCheckLib/MmCheckCommunicationBuffer.c        | 2 +-
 .../Library/TestPointCheckLib/MmCheckMemoryAttribute.c    | 2 +-
 .../Test/Library/TestPointCheckLib/MmCheckPaging.c        | 2 +-
 .../Test/Library/TestPointCheckLib/MmCheckSmrr.c          | 2 +-
 .../Library/TestPointCheckLib/PeiCheckDmaProtection.c     | 2 +-
 .../Test/Library/TestPointCheckLib/PeiCheckFvInfo.c       | 4 ++--
 .../Test/Library/TestPointCheckLib/PeiCheckMtrr.c         | 4 ++--
 .../Test/Library/TestPointCheckLib/PeiCheckPci.c          | 2 +-
 .../Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c      | 8 ++++----
 25 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
index 3d75e5012a..80255f7403 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
@@ -788,7 +788,7 @@ TestPointCheckAcpi (
     DEBUG ((DEBUG_ERROR, "No ACPI table\n"));
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE4_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_READY_TO_BOOT \
         TEST_POINT_BYTE4_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL_ERROR_STRING
@@ -833,7 +833,7 @@ TestPointCheckAcpiGcdResource (
     DEBUG ((DEBUG_ERROR, "ACPI table resource not in GCD\n"));
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE4_READY_TO_BOOT_GCD_RESOURCE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_READY_TO_BOOT \
         TEST_POINT_BYTE4_READY_TO_BOOT_GCD_RESOURCE_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
index 5437cf6aa7..033cd3cac5 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
@@ -142,7 +142,7 @@ TestPointCheckLoadOptionVariable (
         if (EFI_ERROR(Status)) {
           TestPointLibAppendErrorString (
             PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-            NULL,
+            TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
             TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_CODE \
               TEST_POINT_READY_TO_BOOT \
               TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_STRING
@@ -183,7 +183,7 @@ TestPointCheckPlatformRecoveryOptionVariable (
           ReturnStatus = Status;
           TestPointLibAppendErrorString (
             PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-            NULL,
+            TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
             TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_CODE \
               TEST_POINT_READY_TO_BOOT \
               TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
index ce76b33505..86a96f5dab 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
@@ -66,7 +66,7 @@ TestPointCheckConsoleVariable (
         Result = FALSE;
         TestPointLibAppendErrorString (
           PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-          NULL,
+          TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
           TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL_ERROR_CODE \
             TEST_POINT_READY_TO_BOOT \
             TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
index aba0985956..4279216fb1 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
@@ -84,7 +84,7 @@ TestPointVtdEngine (
   if (EFI_ERROR(Status)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE3_END_OF_DXE_DMA_PROTECTION_ENABLED_ERROR_CODE \
         TEST_POINT_READY_TO_BOOT \
         TEST_POINT_BYTE3_END_OF_DXE_DXE_DMA_PROTECTION_ENABLED_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
index d31a06b9ab..b6403b3891 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
@@ -104,7 +104,7 @@ TestPointCheckEsrt (
   } else {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE8_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_READY_TO_BOOT \
         TEST_POINT_BYTE8_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
index f2f3fa83a5..2a44f368b2 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
@@ -111,7 +111,7 @@ TestPointCheckHsti (
   if (!Result) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE8_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_READY_TO_BOOT \
         TEST_POINT_BYTE8_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
index 578c5cd0e7..5fd96b9d3f 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
@@ -78,7 +78,7 @@ TestPointCheckLoadedImage (
       DEBUG ((DEBUG_ERROR, "3rd Party Image found - Index (%d)\n", Index));
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
         TEST_POINT_BYTE3_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM_ERROR_CODE \
           TEST_POINT_END_OF_DXE \
           TEST_POINT_BYTE3_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
index 9e6242d31e..631294438c 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
@@ -321,7 +321,7 @@ TestPointCheckUefiMemAttribute (
   if (EFI_ERROR (Status)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_READY_TO_BOOT \
         TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
index b8ebac8fe3..f8f037ef4e 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
@@ -285,7 +285,7 @@ TestPointCheckUefiMemoryMap (
   if (!Result) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_READY_TO_BOOT \
         TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
index b22c8b750b..619805a3fd 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
@@ -208,7 +208,7 @@ TestPointCheckMemoryTypeInformation (
   if (EFI_ERROR (Status)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_CODE \
       TEST_POINT_READY_TO_BOOT \
       TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
index 73043a136b..ffaa907a97 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
@@ -382,7 +382,7 @@ TestPointCheckPciResource (
   if (EFI_ERROR(Status)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_RESOURCE_ALLOCATED_ERROR_CODE \
         TEST_POINT_PCI_ENUMERATION_DONE \
         TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_RESOURCE_ALLOCATED_ERROR_STRING
@@ -464,7 +464,7 @@ TestPointCheckPciBusMaster (
               DEBUG ((DEBUG_INFO, "PCI BME enabled (S%04x.B%02x.D%02x.F%x - %04x)\n", Segment, Bus, Device, Function, Command));
               TestPointLibAppendErrorString (
                 PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-                NULL,
+                TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
                 TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_BUS_MASTER_DISABLED_ERROR_CODE \
                   TEST_POINT_PCI_ENUMERATION_DONE \
                   TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_BUS_MASTER_DISABLED_ERROR_STRING
@@ -643,7 +643,7 @@ TestPointCheckPciSpeed (
     Status = EFI_DEVICE_ERROR;
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_PCIE_GEN_SPEED_ERROR_CODE \
       TEST_POINT_PCI_ENUMERATION_DONE \
       TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_PCIE_GEN_SPEED_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
index 5799cae646..fb37c4a9a3 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
@@ -81,7 +81,7 @@ CheckSmramDescriptor (
       DEBUG ((DEBUG_ERROR, "Smram is not adjacent\n"));
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
         TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_CODE \
           TEST_POINT_DXE_SMM_READY_TO_LOCK
           TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_STRING
@@ -94,7 +94,7 @@ CheckSmramDescriptor (
     DEBUG ((DEBUG_ERROR, "Smram is not aligned\n"));
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_CODE \
         TEST_POINT_DXE_SMM_READY_TO_LOCK
         TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
index 776f7bb09e..d89a6963f0 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
@@ -48,7 +48,7 @@ TestPointCheckTcgMor (
       ReturnStatus = Status;
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
         TEST_POINT_BYTE5_READY_TO_BOOT_TCG_MOR_ENABLED_ERROR_CODE \
           TEST_POINT_READY_TO_BOOT \
           TEST_POINT_BYTE5_READY_TO_BOOT_TCG_MOR_ENABLED_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
index 5ec32fd2e8..02e8971704 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
@@ -80,7 +80,7 @@ TestPointCheckTcgTrustedBoot (
   if (EFI_ERROR(Status)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE5_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED_ERROR_CODE \
         TEST_POINT_READY_TO_BOOT \
         TEST_POINT_BYTE5_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
index 2c96deafaf..807f24958d 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
@@ -60,7 +60,7 @@ TestPointCheckUefiSecureBoot (
       ReturnStatus = Status;
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
         TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \
           TEST_POINT_READY_TO_BOOT \
           TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING
@@ -80,7 +80,7 @@ TestPointCheckUefiSecureBoot (
       ReturnStatus = Status;
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
         TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \
           TEST_POINT_READY_TO_BOOT \
           TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING
@@ -92,7 +92,7 @@ TestPointCheckUefiSecureBoot (
         ReturnStatus = EFI_SECURITY_VIOLATION;
         TestPointLibAppendErrorString (
           PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-          NULL,
+          TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
           TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \
             TEST_POINT_READY_TO_BOOT \
             TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
index 10731d497a..fabfdff6c7 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
@@ -296,7 +296,7 @@ TestPointEndOfDxeDmaAcpiTableFunctional (
     DEBUG ((DEBUG_ERROR, "No DMAR table\n"));
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE3_END_OF_DXE_DMA_ACPI_TABLE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_END_OF_DXE \
         TEST_POINT_BYTE3_END_OF_DXE_DMA_ACPI_TABLE_FUNCTIONAL_ERROR_STRING
@@ -483,7 +483,7 @@ TestPointDxeSmmReadyToLockWsmtTableFunctional (
     DEBUG ((DEBUG_ERROR, "No WSMT table\n"));
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_DXE,
       TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_DXE_SMM_READY_TO_LOCK \
         TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckCommunicationBuffer.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckCommunicationBuffer.c
index ab977ba610..eb47880e92 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckCommunicationBuffer.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckCommunicationBuffer.c
@@ -107,7 +107,7 @@ TestPointCheckMmCommunicationBuffer (
   if (EFI_ERROR (ReturnStatus)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_SMM,
       TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER_ERROR_CODE \
         TEST_POINT_SMM_READY_TO_BOOT \
         TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckMemoryAttribute.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckMemoryAttribute.c
index 95ef42ad3a..b97c73f857 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckMemoryAttribute.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckMemoryAttribute.c
@@ -131,7 +131,7 @@ TestPointCheckMmMemAttribute (
   if (EFI_ERROR (Status)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_SMM,
       TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_SMM_READY_TO_LOCK \
         TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckPaging.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckPaging.c
index 1ecb93ac43..a548ce90d6 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckPaging.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckPaging.c
@@ -420,7 +420,7 @@ TestPointCheckMmPaging (
   if (EFI_ERROR (Status)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_SMM,
       TEST_POINT_BYTE6_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION_ERROR_CODE \
         TEST_POINT_SMM_READY_TO_BOOT \
         TEST_POINT_BYTE6_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckSmrr.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckSmrr.c
index b4e705a7ff..f5d648eb69 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckSmrr.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/MmCheckSmrr.c
@@ -124,7 +124,7 @@ TestPointCheckSmrr (
   if (!Result) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_SMM,
       TEST_POINT_BYTE6_SMM_END_OF_DXE_SMRR_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_SMM_END_OF_DXE \
         TEST_POINT_BYTE6_SMM_END_OF_DXE_SMRR_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDmaProtection.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDmaProtection.c
index 5a18235edd..10b854127e 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDmaProtection.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDmaProtection.c
@@ -96,7 +96,7 @@ TestPointVtdEngine (
   if (EFI_ERROR(Status)) {
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
       TEST_POINT_BYTE1_MEMORY_DISCOVERED_DMA_PROTECTION_ENABLED_ERROR_CODE \
         TEST_POINT_MEMORY_DISCOVERED \
         TEST_POINT_BYTE1_MEMORY_DISCOVERED_DMA_PROTECTION_ENABLED_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
index f8a651ee72..5838b63f6a 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
@@ -129,7 +129,7 @@ TestPointCheckFvInfo (
     if (EFI_ERROR(Status)) {
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
         TEST_POINT_BYTE1_MEMORY_DISCOVERED_FV_INFO_FUNCTIONAL_ERROR_CODE \
           TEST_POINT_MEMORY_DISCOVERED \
           TEST_POINT_BYTE1_MEMORY_DISCOVERED_FV_INFO_FUNCTIONAL_ERROR_STRING
@@ -152,7 +152,7 @@ TestPointCheckFvInfo (
     if (EFI_ERROR(Status)) {
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
         TEST_POINT_BYTE1_MEMORY_DISCOVERED_FV_INFO_FUNCTIONAL_ERROR_CODE \
           TEST_POINT_MEMORY_DISCOVERED \
           TEST_POINT_BYTE1_MEMORY_DISCOVERED_FV_INFO_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
index 536f5c2d83..2925246869 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
@@ -416,7 +416,7 @@ TestPointCheckMtrr (
     if (IsForDxe) {
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
         TEST_POINT_BYTE2_END_OF_PEI_MTRR_FUNCTIONAL_ERROR_CODE \
           TEST_POINT_END_OF_PEI \
           TEST_POINT_BYTE2_END_OF_PEI_MTRR_FUNCTIONAL_ERROR_STRING
@@ -424,7 +424,7 @@ TestPointCheckMtrr (
     } else {
       TestPointLibAppendErrorString (
         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-        NULL,
+        TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
         TEST_POINT_BYTE1_MEMORY_DISCOVERED_MTRR_FUNCTIONAL_ERROR_CODE \
           TEST_POINT_MEMORY_DISCOVERED \
           TEST_POINT_BYTE1_MEMORY_DISCOVERED_MTRR_FUNCTIONAL_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
index f806d06f98..3f368310f9 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
@@ -99,7 +99,7 @@ TestPointCheckPciBusMaster (
               DEBUG ((DEBUG_INFO, "PCI BME enabled (S%04x.B%02x.D%02x.F%x - %04x)\n", Segment, Bus, Device, Function, Command));
               TestPointLibAppendErrorString (
                 PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-                NULL,
+                TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
                 TEST_POINT_BYTE2_END_OF_PEI_PCI_BUS_MASTER_DISABLED_ERROR_CODE \
                   TEST_POINT_END_OF_PEI \
                   TEST_POINT_BYTE2_END_OF_PEI_PCI_BUS_MASTER_DISABLED_ERROR_STRING
diff --git a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
index 6fe08e22ed..da0d67bb6d 100644
--- a/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
+++ b/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
@@ -82,7 +82,7 @@ CheckSmramDescriptor (
         DEBUG ((DEBUG_ERROR, "Smram is not adjacent\n"));
         TestPointLibAppendErrorString (
           PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-          NULL,
+          TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
           TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \
             TEST_POINT_END_OF_PEI \
             TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING
@@ -96,7 +96,7 @@ CheckSmramDescriptor (
     DEBUG ((DEBUG_ERROR, "Smram is not aligned\n"));
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
       TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_MEMORY_DISCOVERED \
         TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING
@@ -154,7 +154,7 @@ TestPointCheckSmramHob (
               DEBUG ((DEBUG_ERROR, "SmramHob is not adjacent\n"));
               TestPointLibAppendErrorString (
                 PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-                NULL,
+                TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
                 TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \
                   TEST_POINT_END_OF_PEI \
                   TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING
@@ -173,7 +173,7 @@ TestPointCheckSmramHob (
     DEBUG ((DEBUG_ERROR, "SmramHob is not aligned\n"));
     TestPointLibAppendErrorString (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,
-      NULL,
+      TEST_POINT_IMPLEMENTATION_ID_PLATFORM_PEI,
       TEST_POINT_BYTE1_MEMORY_DISCOVERED_MEMORY_RESOURCE_FUNCTIONAL_ERROR_CODE \
         TEST_POINT_MEMORY_DISCOVERED \
         TEST_POINT_BYTE1_MEMORY_DISCOVERED_MEMORY_RESOURCE_FUNCTIONAL_ERROR_STRING