FmpDevicePkg/FmpDxe: Improve all DEBUG() messages

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1525

Update all DEBUG() messages to include the name of the
FMP device from PcdFmpDeviceImageIdName.

Based on content from the following commit, but expanded
to cover all DEBUG() messages.

https://github.com/microsoft/mu_tiano_plus/commit/a2c7da88d3a73dbe9b6b75952d6866179c905f28#diff-025d4889f6d3a482b49638a25e432d6d

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Eric Jin <eric.jin@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/FmpDevicePkg/FmpDxe/DetectTestKey.c b/FmpDevicePkg/FmpDxe/DetectTestKey.c
index e697a0848970f34e1a3163fd3df555aaafb121ad..0e10d5ee17f0d0c147d7755f9ba7a9706d05bfdb 100644 (file)
--- a/FmpDevicePkg/FmpDxe/DetectTestKey.c
+++ b/FmpDevicePkg/FmpDxe/DetectTestKey.c
@@ -1,19 +1,13 @@
 /** @file\r
   Detects if PcdFmpDevicePkcs7CertBufferXdr contains a test key.\r
 \r
-  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
-#include <PiDxe.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/BaseCryptLib.h>\r
+#include "FmpDxe.h"\r
 \r
 /**\r
   Check to see if any of the keys in PcdFmpDevicePkcs7CertBufferXdr matches\r
@@ -39,7 +33,7 @@ DetectTestKey (
   UINTN    TestKeyDigestSize;\r
 \r
   //\r
-  // If PcdFmpDeviceTestKeySha256Digest is not exacty SHA256_DIGEST_SIZE bytes,\r
+  // If PcdFmpDeviceTestKeySha256Digest is not exactly SHA256_DIGEST_SIZE bytes,\r
   // then skip the test key detection.\r
   //\r
   TestKeyDigestSize = PcdGetSize (PcdFmpDeviceTestKeySha256Digest);\r
@@ -143,9 +137,9 @@ DetectTestKey (
   // set PcdTestKeyUsed to TRUE.\r
   //\r
   if (TestKeyUsed) {\r
-    DEBUG ((DEBUG_INFO, "FmpDxe: Test key detected in PcdFmpDevicePkcs7CertBufferXdr.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): Test key detected in PcdFmpDevicePkcs7CertBufferXdr.\n", mImageIdName));\r
     PcdSetBoolS (PcdTestKeyUsed, TRUE);\r
   } else {\r
-    DEBUG ((DEBUG_INFO, "FmpDxe: No test key detected in PcdFmpDevicePkcs7CertBufferXdr.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): No test key detected in PcdFmpDevicePkcs7CertBufferXdr.\n", mImageIdName));\r
   }\r
 }\r

diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c b/FmpDevicePkg/FmpDxe/FmpDxe.c
index 17c3378fa2bded286f621bff1eee6410d8d1ef48..3cda86f6c46cca73b49b9d4e4f605437f94749a3 100644 (file)
--- a/FmpDevicePkg/FmpDxe/FmpDxe.c
+++ b/FmpDevicePkg/FmpDxe/FmpDxe.c
@@ -164,12 +164,12 @@ GetImageTypeIdGuid (
   Status = FmpDeviceGetImageTypeIdGuidPtr (&FmpDeviceLibGuid);\r
   if (EFI_ERROR (Status)) {\r
     if (Status != EFI_UNSUPPORTED) {\r
-      DEBUG ((DEBUG_ERROR, "FmpDxe: FmpDeviceLib GetImageTypeIdGuidPtr() returned invalid error %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): FmpDeviceLib GetImageTypeIdGuidPtr() returned invalid error %r\n", mImageIdName, Status));\r
     }\r
     return &gEfiCallerIdGuid;\r
   }\r
   if (FmpDeviceLibGuid == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: FmpDeviceLib GetImageTypeIdGuidPtr() returned invalid GUID\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): FmpDeviceLib GetImageTypeIdGuidPtr() returned invalid GUID\n", mImageIdName));\r
     return &gEfiCallerIdGuid;\r
   }\r
   return FmpDeviceLibGuid;\r
@@ -302,7 +302,7 @@ PopulateDescriptor (
     //\r
     // Unexpected error.   Use default version.\r
     //\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: GetVersion() from FmpDeviceLib (%s) returned %r\n", GetImageTypeNameString(), Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): GetVersion() from FmpDeviceLib (%s) returned %r\n", mImageIdName, GetImageTypeNameString(), Status));\r
     Private->Descriptor.Version = DEFAULT_VERSION;\r
   }\r
 \r
@@ -320,13 +320,13 @@ PopulateDescriptor (
   //\r
   Status = FmpDeviceGetVersionString (&Private->Descriptor.VersionName);\r
   if (Status == EFI_UNSUPPORTED) {\r
-    DEBUG ((DEBUG_INFO, "FmpDxe: GetVersionString() unsupported in FmpDeviceLib.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): GetVersionString() unsupported in FmpDeviceLib.\n", mImageIdName));\r
     Private->Descriptor.VersionName = AllocateCopyPool (\r
                                         sizeof (VERSION_STRING_NOT_SUPPORTED),\r
                                         VERSION_STRING_NOT_SUPPORTED\r
                                         );\r
   } else if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_INFO, "FmpDxe: GetVersionString() not available in FmpDeviceLib.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): GetVersionString() not available in FmpDeviceLib.\n", mImageIdName));\r
     Private->Descriptor.VersionName = AllocateCopyPool (\r
                                         sizeof (VERSION_STRING_NOT_AVAILABLE),\r
                                         VERSION_STRING_NOT_AVAILABLE\r
@@ -437,7 +437,7 @@ GetTheImageInfo (
   // Check for valid pointer\r
   //\r
   if (ImageInfoSize == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: GetImageInfo() - ImageInfoSize is NULL.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): GetImageInfo() - ImageInfoSize is NULL.\n", mImageIdName));\r
     Status = EFI_INVALID_PARAMETER;\r
     goto cleanup;\r
   }\r
@@ -448,7 +448,7 @@ GetTheImageInfo (
   //\r
   if (*ImageInfoSize < (sizeof (EFI_FIRMWARE_IMAGE_DESCRIPTOR))) {\r
     *ImageInfoSize = sizeof (EFI_FIRMWARE_IMAGE_DESCRIPTOR);\r
-    DEBUG ((DEBUG_VERBOSE, "FmpDxe: GetImageInfo() - ImageInfoSize is to small.\n"));\r
+    DEBUG ((DEBUG_VERBOSE, "FmpDxe(%s): GetImageInfo() - ImageInfoSize is to small.\n", mImageIdName));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto cleanup;\r
   }\r
@@ -458,7 +458,7 @@ GetTheImageInfo (
   //\r
   if ( (ImageInfo == NULL) || (DescriptorVersion == NULL) || (DescriptorCount == NULL) || (DescriptorSize == NULL)\r
        || (PackageVersion == NULL)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: GetImageInfo() - Pointer Parameter is NULL.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): GetImageInfo() - Pointer Parameter is NULL.\n", mImageIdName));\r
     Status = EFI_INVALID_PARAMETER;\r
     goto cleanup;\r
   }\r
@@ -543,13 +543,13 @@ GetTheImage (
   // Check to make sure index is 1 (only 1 image for this device)\r
   //\r
   if (ImageIndex != 1) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: GetImage() - Image Index Invalid.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): GetImage() - Image Index Invalid.\n", mImageIdName));\r
     Status = EFI_INVALID_PARAMETER;\r
     goto cleanup;\r
   }\r
 \r
   if (ImageSize == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: GetImage() - ImageSize Pointer Parameter is NULL.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): GetImage() - ImageSize Pointer Parameter is NULL.\n", mImageIdName));\r
     Status = EFI_INVALID_PARAMETER;\r
     goto cleanup;\r
   }\r
@@ -563,13 +563,13 @@ GetTheImage (
   }\r
   if (*ImageSize < Size) {\r
     *ImageSize = Size;\r
-    DEBUG ((DEBUG_VERBOSE, "FmpDxe: GetImage() - ImageSize is to small.\n"));\r
+    DEBUG ((DEBUG_VERBOSE, "FmpDxe(%s): GetImage() - ImageSize is to small.\n", mImageIdName));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto cleanup;\r
   }\r
 \r
   if (Image == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: GetImage() - Image Pointer Parameter is NULL.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): GetImage() - Image Pointer Parameter is NULL.\n", mImageIdName));\r
     Status = EFI_INVALID_PARAMETER;\r
     goto cleanup;\r
   }\r
@@ -717,7 +717,7 @@ CheckTheImage (
   PopulateDescriptor (Private);\r
 \r
   if (ImageUpdatable == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: CheckImage() - ImageUpdatable Pointer Parameter is NULL.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckImage() - ImageUpdatable Pointer Parameter is NULL.\n", mImageIdName));\r
     Status = EFI_INVALID_PARAMETER;\r
     goto cleanup;\r
   }\r
@@ -728,7 +728,7 @@ CheckTheImage (
   *ImageUpdatable = IMAGE_UPDATABLE_VALID;\r
 \r
   if (Image == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: CheckImage() - Image Pointer Parameter is NULL.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckImage() - Image Pointer Parameter is NULL.\n", mImageIdName));\r
     //\r
     // not sure if this is needed\r
     //\r
@@ -740,7 +740,7 @@ CheckTheImage (
   PublicKeyDataXdrEnd = PublicKeyDataXdr + PcdGetSize (PcdFmpDevicePkcs7CertBufferXdr);\r
 \r
   if (PublicKeyDataXdr == NULL || (PublicKeyDataXdr == PublicKeyDataXdrEnd)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: Invalid certificate, skipping it.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Invalid certificate, skipping it.\n", mImageIdName));\r
     Status = EFI_ABORTED;\r
   } else {\r
     //\r
@@ -750,7 +750,8 @@ CheckTheImage (
       Index++;\r
       DEBUG (\r
         (DEBUG_INFO,\r
-        "FmpDxe: Certificate #%d [%p..%p].\n",\r
+        "FmpDxe(%s): Certificate #%d [%p..%p].\n",\r
+        mImageIdName,\r
         Index,\r
         PublicKeyDataXdr,\r
         PublicKeyDataXdrEnd\r
@@ -761,7 +762,7 @@ CheckTheImage (
         //\r
         // Key data extends beyond end of PCD\r
         //\r
-        DEBUG ((DEBUG_ERROR, "FmpDxe: Certificate size extends beyond end of PCD, skipping it.\n"));\r
+        DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Certificate size extends beyond end of PCD, skipping it.\n", mImageIdName));\r
         Status = EFI_ABORTED;\r
         break;\r
       }\r
@@ -777,7 +778,7 @@ CheckTheImage (
         //\r
         // Key data extends beyond end of PCD\r
         //\r
-        DEBUG ((DEBUG_ERROR, "FmpDxe: Certificate extends beyond end of PCD, skipping it.\n"));\r
+        DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Certificate extends beyond end of PCD, skipping it.\n", mImageIdName));\r
         Status = EFI_ABORTED;\r
         break;\r
       }\r
@@ -797,7 +798,7 @@ CheckTheImage (
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: CheckTheImage() - Authentication Failed %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckTheImage() - Authentication Failed %r.\n", mImageIdName, Status));\r
     goto cleanup;\r
   }\r
 \r
@@ -805,7 +806,7 @@ CheckTheImage (
   // Check to make sure index is 1\r
   //\r
   if (ImageIndex != 1) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: CheckImage() - Image Index Invalid.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckImage() - Image Index Invalid.\n", mImageIdName));\r
     *ImageUpdatable = IMAGE_UPDATABLE_INVALID_TYPE;\r
     Status = EFI_SUCCESS;\r
     goto cleanup;\r
@@ -817,13 +818,13 @@ CheckTheImage (
   //\r
   FmpPayloadHeader = GetFmpHeader ( (EFI_FIRMWARE_IMAGE_AUTHENTICATION *)Image, ImageSize, &FmpPayloadSize );\r
   if (FmpPayloadHeader == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: CheckTheImage() - GetFmpHeader failed.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckTheImage() - GetFmpHeader failed.\n", mImageIdName));\r
     Status = EFI_ABORTED;\r
     goto cleanup;\r
   }\r
   Status = GetFmpPayloadHeaderVersion (FmpPayloadHeader, FmpPayloadSize, &Version);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: CheckTheImage() - GetFmpPayloadHeaderVersion failed %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckTheImage() - GetFmpPayloadHeaderVersion failed %r.\n", mImageIdName, Status));\r
     *ImageUpdatable = IMAGE_UPDATABLE_INVALID;\r
     Status = EFI_SUCCESS;\r
     goto cleanup;\r
@@ -835,8 +836,8 @@ CheckTheImage (
   if (Version < Private->Descriptor.LowestSupportedImageVersion) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "FmpDxe: CheckTheImage() - Version Lower than lowest supported version. 0x%08X < 0x%08X\n",\r
-      Version, Private->Descriptor.LowestSupportedImageVersion)\r
+      "FmpDxe(%s): CheckTheImage() - Version Lower than lowest supported version. 0x%08X < 0x%08X\n",\r
+      mImageIdName, Version, Private->Descriptor.LowestSupportedImageVersion)\r
       );\r
     *ImageUpdatable = IMAGE_UPDATABLE_INVALID_OLD;\r
     Status = EFI_SUCCESS;\r
@@ -860,7 +861,7 @@ CheckTheImage (
   //\r
   AllHeaderSize = GetAllHeaderSize ( (EFI_FIRMWARE_IMAGE_AUTHENTICATION *)Image, FmpHeaderSize );\r
   if (AllHeaderSize == 0) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: CheckTheImage() - GetAllHeaderSize failed.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckTheImage() - GetAllHeaderSize failed.\n", mImageIdName));\r
     Status = EFI_ABORTED;\r
     goto cleanup;\r
   }\r
@@ -871,7 +872,7 @@ CheckTheImage (
   //\r
   Status = FmpDeviceCheckImage ((((UINT8 *)Image) + AllHeaderSize), RawSize, ImageUpdatable);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: CheckTheImage() - FmpDeviceLib CheckImage failed. Status = %r\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckTheImage() - FmpDeviceLib CheckImage failed. Status = %r\n", mImageIdName, Status));\r
   }\r
 \r
 cleanup:\r
@@ -980,7 +981,7 @@ SetTheImage (
   // it should be blocked by hardware too but we can catch here even faster\r
   //\r
   if (Private->FmpDeviceLocked) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - Device is already locked.  Can't update.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - Device is already locked.  Can't update.\n", mImageIdName));\r
     Status = EFI_UNSUPPORTED;\r
     goto cleanup;\r
   }\r
@@ -990,7 +991,7 @@ SetTheImage (
   //\r
   Status = CheckTheImage (This, ImageIndex, Image, ImageSize, &Updateable);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - Check The Image failed with %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - Check The Image failed with %r.\n", mImageIdName, Status));\r
     if (Status == EFI_SECURITY_VIOLATION) {\r
       LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_AUTH_ERROR;\r
     }\r
@@ -1003,7 +1004,7 @@ SetTheImage (
   //\r
   FmpHeader = GetFmpHeader ( (EFI_FIRMWARE_IMAGE_AUTHENTICATION *)Image, ImageSize, &FmpPayloadSize );\r
   if (FmpHeader == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - GetFmpHeader failed.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - GetFmpHeader failed.\n", mImageIdName));\r
     Status = EFI_ABORTED;\r
     goto cleanup;\r
   }\r
@@ -1019,15 +1020,15 @@ SetTheImage (
   if (Updateable != IMAGE_UPDATABLE_VALID) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "FmpDxed: SetTheImage() - Check The Image returned that the Image was not valid for update.  Updatable value = 0x%X.\n",\r
-      Updateable)\r
+      "FmpDxe(%s): SetTheImage() - Check The Image returned that the Image was not valid for update.  Updatable value = 0x%X.\n",\r
+      mImageIdName, Updateable)\r
       );\r
     Status = EFI_ABORTED;\r
     goto cleanup;\r
   }\r
 \r
   if (Progress == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - Invalid progress callback\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - Invalid progress callback\n", mImageIdName));\r
     Status = EFI_INVALID_PARAMETER;\r
     goto cleanup;\r
   }\r
@@ -1039,7 +1040,7 @@ SetTheImage (
   //\r
   Status = Progress (1);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - Progress Callback failed with Status %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - Progress Callback failed with Status %r.\n", mImageIdName, Status));\r
   }\r
 \r
   //\r
@@ -1047,14 +1048,14 @@ SetTheImage (
   //\r
   Status = CheckSystemPower (&BooleanValue);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - CheckSystemPower - API call failed %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - CheckSystemPower - API call failed %r.\n", mImageIdName, Status));\r
     goto cleanup;\r
   }\r
   if (!BooleanValue) {\r
     Status = EFI_ABORTED;\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "FmpDxe: SetTheImage() - CheckSystemPower - returned False.  Update not allowed due to System Power.\n")\r
+      "FmpDxe(%s): SetTheImage() - CheckSystemPower - returned False.  Update not allowed due to System Power.\n", mImageIdName)\r
       );\r
     LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_PWR_EVT_BATT;\r
     goto cleanup;\r
@@ -1067,14 +1068,14 @@ SetTheImage (
   //\r
   Status = CheckSystemThermal (&BooleanValue);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - CheckSystemThermal - API call failed %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - CheckSystemThermal - API call failed %r.\n", mImageIdName, Status));\r
     goto cleanup;\r
   }\r
   if (!BooleanValue) {\r
     Status = EFI_ABORTED;\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "FmpDxe: SetTheImage() - CheckSystemThermal - returned False.  Update not allowed due to System Thermal.\n")\r
+      "FmpDxe(%s): SetTheImage() - CheckSystemThermal - returned False.  Update not allowed due to System Thermal.\n", mImageIdName)\r
       );\r
     goto cleanup;\r
   }\r
@@ -1086,14 +1087,14 @@ SetTheImage (
   //\r
   Status = CheckSystemEnvironment (&BooleanValue);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - CheckSystemEnvironment - API call failed %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - CheckSystemEnvironment - API call failed %r.\n", mImageIdName, Status));\r
     goto cleanup;\r
   }\r
   if (!BooleanValue) {\r
     Status = EFI_ABORTED;\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "FmpDxe: SetTheImage() - CheckSystemEnvironment - returned False.  Update not allowed due to System Environment.\n")\r
+      "FmpDxe(%s): SetTheImage() - CheckSystemEnvironment - returned False.  Update not allowed due to System Environment.\n", mImageIdName)\r
       );\r
     goto cleanup;\r
   }\r
@@ -1111,13 +1112,13 @@ SetTheImage (
   //\r
   Status = GetFmpPayloadHeaderSize (FmpHeader, FmpPayloadSize, &FmpHeaderSize);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - GetFmpPayloadHeaderSize failed %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - GetFmpPayloadHeaderSize failed %r.\n", mImageIdName, Status));\r
     goto cleanup;\r
   }\r
 \r
   AllHeaderSize = GetAllHeaderSize ( (EFI_FIRMWARE_IMAGE_AUTHENTICATION *)Image, FmpHeaderSize );\r
   if (AllHeaderSize == 0) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() - GetAllHeaderSize failed.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() - GetAllHeaderSize failed.\n", mImageIdName));\r
     Status = EFI_ABORTED;\r
     goto cleanup;\r
   }\r
@@ -1139,7 +1140,7 @@ SetTheImage (
              AbortReason\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: SetTheImage() SetImage from FmpDeviceLib failed. Status =  %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): SetTheImage() SetImage from FmpDeviceLib failed. Status =  %r.\n", mImageIdName, Status));\r
     goto cleanup;\r
   }\r
 \r
@@ -1307,9 +1308,9 @@ FmpDxeLockEventNotify (
     Status = FmpDeviceLock();\r
     if (EFI_ERROR (Status)) {\r
       if (Status != EFI_UNSUPPORTED) {\r
-        DEBUG ((DEBUG_ERROR, "FmpDxe: FmpDeviceLock() returned error.  Status = %r\n", Status));\r
+        DEBUG ((DEBUG_ERROR, "FmpDxe(%s): FmpDeviceLock() returned error.  Status = %r\n", mImageIdName, Status));\r
       } else {\r
-        DEBUG ((DEBUG_WARN, "FmpDxe: FmpDeviceLock() returned error.  Status = %r\n", Status));\r
+        DEBUG ((DEBUG_WARN, "FmpDxe(%s): FmpDeviceLock() returned error.  Status = %r\n", mImageIdName, Status));\r
       }\r
     }\r
     Private->FmpDeviceLocked = TRUE;\r
@@ -1336,8 +1337,6 @@ InstallFmpInstance (
   EFI_FIRMWARE_MANAGEMENT_PROTOCOL  *Fmp;\r
   FIRMWARE_MANAGEMENT_PRIVATE_DATA  *Private;\r
 \r
-  DEBUG ((DEBUG_ERROR, "InstallFmpInstance: Entry\n"));\r
-\r
   //\r
   // Only allow a single FMP Protocol instance to be installed\r
   //\r
@@ -1361,7 +1360,7 @@ InstallFmpInstance (
               &mFirmwareManagementPrivateDataTemplate\r
               );\r
   if (Private == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: Failed to allocate memory for private structure.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to allocate memory for private structure.\n", mImageIdName));\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto cleanup;\r
   }\r
@@ -1369,10 +1368,7 @@ InstallFmpInstance (
   //\r
   // Initialize private context data structure\r
   //\r
-  DEBUG ((DEBUG_ERROR, "InstallFmpInstance: Initialize private context data structure\n"));\r
-\r
   Private->Handle = Handle;\r
-\r
   Private->FmpDeviceContext = NULL;\r
   Status = FmpDeviceSetContext (Private->Handle, &Private->FmpDeviceContext);\r
   if (Status == EFI_UNSUPPORTED) {\r
@@ -1386,17 +1382,15 @@ InstallFmpInstance (
   //\r
   PopulateDescriptor (Private);\r
 \r
-  DEBUG ((DEBUG_ERROR, "InstallFmpInstance: Lock events\n"));\r
-\r
   if (IsLockFmpDeviceAtLockEventGuidRequired ()) {\r
     //\r
-    // Lock all UEFI Variables used by this module.\r
+    // Register all UEFI Variables used by this module to be locked.\r
     //\r
     Status = LockAllFmpVariables (Private);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "FmpDxe: Failed to lock variables.  Status = %r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to register variables to lock.  Status = %r.\n", mImageIdName, Status));\r
     } else {\r
-      DEBUG ((DEBUG_INFO, "FmpDxe: All variables locked\n"));\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): All variables registered to lock\n", mImageIdName));\r
     }\r
 \r
     //\r
@@ -1411,32 +1405,27 @@ InstallFmpInstance (
                     &Private->FmpDeviceLockEvent\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "FmpDxe: Failed to register notification.  Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to register notification.  Status = %r\n", mImageIdName, Status));\r
     }\r
     ASSERT_EFI_ERROR (Status);\r
   } else {\r
-    DEBUG ((DEBUG_VERBOSE, "FmpDxe: Not registering notification to call FmpDeviceLock() because mfg mode\n"));\r
+    DEBUG ((DEBUG_VERBOSE, "FmpDxe(%s): Not registering notification to call FmpDeviceLock() because mfg mode\n", mImageIdName));\r
   }\r
 \r
   //\r
   // Install FMP Protocol and FMP Progress Protocol\r
   //\r
-  DEBUG ((DEBUG_ERROR, "InstallFmpInstance: Install FMP Protocol and FMP Progress Protocol\n"));\r
-\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Private->Handle,\r
                   &gEfiFirmwareManagementProtocolGuid, &Private->Fmp,\r
                   &gEdkiiFirmwareManagementProgressProtocolGuid, &mFmpProgress,\r
                   NULL\r
                   );\r
-\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: Protocol install error. Status = %r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Protocol install error. Status = %r.\n", mImageIdName, Status));\r
     goto cleanup;\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "FmpDxe: Protocols Installed!\n"));\r
-\r
 cleanup:\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -1501,6 +1490,7 @@ UninstallFmpInstance (
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Protocol open error. Status = %r.\n", mImageIdName, Status));\r
     return Status;\r
   }\r
 \r
@@ -1518,6 +1508,7 @@ UninstallFmpInstance (
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Protocol uninstall error. Status = %r.\n", mImageIdName, Status));\r
     return Status;\r
   }\r
 \r
@@ -1604,11 +1595,11 @@ FmpDxeEntryPoint (
     //\r
     // PcdFmpDeviceImageIdName must be set to a non-empty Unicode string\r
     //\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: FmpDeviceLib PcdFmpDeviceImageIdName is an empty string.\n"));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe: PcdFmpDeviceImageIdName is an empty string.\n"));\r
     ASSERT (FALSE);\r
+    return EFI_UNSUPPORTED;\r
   }\r
 \r
-\r
   //\r
   // Detects if PcdFmpDevicePkcs7CertBufferXdr contains a test key.\r
   //\r
@@ -1629,7 +1620,7 @@ FmpDxeEntryPoint (
   if (PcdGetSize (PcdFmpDeviceLockEventGuid) == sizeof (EFI_GUID)) {\r
     mLockGuid = (EFI_GUID *)PcdGetPtr (PcdFmpDeviceLockEventGuid);\r
   }\r
-  DEBUG ((DEBUG_INFO, "FmpDxe: Lock GUID: %g\n", mLockGuid));\r
+  DEBUG ((DEBUG_INFO, "FmpDxe(%s): Lock GUID: %g\n", mImageIdName, mLockGuid));\r
 \r
   //\r
   // Register with library the install function so if the library uses\r
@@ -1640,24 +1631,25 @@ FmpDxeEntryPoint (
   Status = RegisterFmpInstaller (InstallFmpInstance);\r
   if (Status == EFI_UNSUPPORTED) {\r
     mFmpSingleInstance = TRUE;\r
-    DEBUG ((DEBUG_INFO, "FmpDxe: FmpDeviceLib registration returned EFI_UNSUPPORTED.  Installing single FMP instance.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): FmpDeviceLib registration returned EFI_UNSUPPORTED.  Installing single FMP instance.\n", mImageIdName));\r
     Status = RegisterFmpUninstaller (UninstallFmpInstance);\r
     if (Status == EFI_UNSUPPORTED) {\r
       Status = InstallFmpInstance (ImageHandle);\r
     } else {\r
-      DEBUG ((DEBUG_ERROR, "FmpDxe: FmpDeviceLib RegisterFmpInstaller and RegisterFmpUninstaller do not match.\n"));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): FmpDeviceLib RegisterFmpInstaller and RegisterFmpUninstaller do not match.\n", mImageIdName));\r
       Status = EFI_UNSUPPORTED;\r
     }\r
   } else if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: FmpDeviceLib registration returned %r.  No FMP installed.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): FmpDeviceLib registration returned %r.  No FMP installed.\n", mImageIdName, Status));\r
   } else {\r
     DEBUG ((\r
       DEBUG_INFO,\r
-      "FmpDxe: FmpDeviceLib registration returned EFI_SUCCESS.  Expect FMP to be installed during the BDS/Device connection phase.\n"\r
+      "FmpDxe(%s): FmpDeviceLib registration returned EFI_SUCCESS.  Expect FMP to be installed during the BDS/Device connection phase.\n",\r
+      mImageIdName\r
       ));\r
     Status = RegisterFmpUninstaller (UninstallFmpInstance);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "FmpDxe: FmpDeviceLib RegisterFmpInstaller and RegisterFmpUninstaller do not match.\n"));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): FmpDeviceLib RegisterFmpInstaller and RegisterFmpUninstaller do not match.\n", mImageIdName));\r
     }\r
   }\r
 \r

diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.h b/FmpDevicePkg/FmpDxe/FmpDxe.h
index 06514c67c8590446aa32580d4a82e6f45d475859..28bfa41580b8febf6dfe33e5cb7e9d70d87cb6ce 100644 (file)
--- a/FmpDevicePkg/FmpDxe/FmpDxe.h
+++ b/FmpDevicePkg/FmpDxe/FmpDxe.h
@@ -17,6 +17,8 @@
 #include <Library/DebugLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/BaseCryptLib.h>\r
+#include <Library/PcdLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
@@ -71,6 +73,11 @@ typedef struct {
 #define FIRMWARE_MANAGEMENT_PRIVATE_DATA_FROM_THIS(a) \\r
   CR (a, FIRMWARE_MANAGEMENT_PRIVATE_DATA, Fmp, FIRMWARE_MANAGEMENT_PRIVATE_DATA_SIGNATURE)\r
 \r
+///\r
+/// Null-terminated Unicode string retrieved from PcdFmpDeviceImageIdName.\r
+///\r
+extern CHAR16  *mImageIdName;\r
+\r
 /**\r
   Check to see if any of the keys in PcdFmpDevicePkcs7CertBufferXdr matches\r
   the test key.  PcdFmpDeviceTestKeySha256Digest contains the SHA256 hash of\r

diff --git a/FmpDevicePkg/FmpDxe/VariableSupport.c b/FmpDevicePkg/FmpDxe/VariableSupport.c
index d06d6b36c7755a2ad0565ab99b8dc45ba72ef76f..6c1ecf7df99086b133d3d61c44dfd00abfeccdc4 100644 (file)
--- a/FmpDevicePkg/FmpDxe/VariableSupport.c
+++ b/FmpDevicePkg/FmpDxe/VariableSupport.c
@@ -75,9 +75,9 @@ DeleteFmpVariable (
   if (Valid) {\r
     Status = gRT->SetVariable (VariableName, &gEfiCallerIdGuid, 0, 0, NULL);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "Failed to delete FMP Variable %s.  Status = %r\n", VariableName, Status));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to delete variable %s.  Status = %r\n", mImageIdName, VariableName, Status));\r
     } else {\r
-      DEBUG ((DEBUG_INFO, "Deleted FMP Variable %s\n", VariableName));\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Deleted variable %s\n", mImageIdName, VariableName));\r
     }\r
   }\r
 }\r
@@ -112,12 +112,12 @@ GetFmpControllerState (
              &Size\r
              );\r
   if (EFI_ERROR (Status) || FmpControllerState == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "Failed to get the FMP Controller State.  Status = %r\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to get the controller state.  Status = %r\n", mImageIdName, Status));\r
   } else {\r
     if (Size == sizeof (*FmpControllerState)) {\r
       return FmpControllerState;\r
     }\r
-    DEBUG ((DEBUG_ERROR, "Getting FMP Controller State returned a size different than expected. Size = 0x%x\n", Size));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Getting controller state returned a size different than expected. Size = 0x%x\n", mImageIdName, Size));\r
   }\r
   if (FmpControllerState != NULL) {\r
     FreePool (FmpControllerState);\r
@@ -151,7 +151,7 @@ GenerateFmpVariableName (
 \r
   VariableName = CatSPrint (NULL, BaseVariableName);\r
   if (VariableName == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "Failed to generate FMP variable name %s.\n", BaseVariableName));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName));\r
     return VariableName;\r
   }\r
   if (HardwareInstance == 0) {\r
@@ -159,7 +159,7 @@ GenerateFmpVariableName (
   }\r
   VariableName = CatSPrint (VariableName, L"%016lx", HardwareInstance);\r
   if (VariableName == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "Failed to generate FMP variable name %s.\n", BaseVariableName));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName));\r
   }\r
   return VariableName;\r
 }\r
@@ -234,11 +234,11 @@ GenerateFmpVariableNames (
                                     VARNAME_FMPSTATE\r
                                     );\r
 \r
-  DEBUG ((DEBUG_INFO, "FmpDxe Variable %g %s\n", &gEfiCallerIdGuid, Private->VersionVariableName));\r
-  DEBUG ((DEBUG_INFO, "FmpDxe Variable %g %s\n", &gEfiCallerIdGuid, Private->LsvVariableName));\r
-  DEBUG ((DEBUG_INFO, "FmpDxe Variable %g %s\n", &gEfiCallerIdGuid, Private->LastAttemptStatusVariableName));\r
-  DEBUG ((DEBUG_INFO, "FmpDxe Variable %g %s\n", &gEfiCallerIdGuid, Private->LastAttemptVersionVariableName));\r
-  DEBUG ((DEBUG_INFO, "FmpDxe Variable %g %s\n", &gEfiCallerIdGuid, Private->FmpStateVariableName));\r
+  DEBUG ((DEBUG_INFO, "FmpDxe(%s): Variable %g %s\n", mImageIdName, &gEfiCallerIdGuid, Private->VersionVariableName));\r
+  DEBUG ((DEBUG_INFO, "FmpDxe(%s): Variable %g %s\n", mImageIdName, &gEfiCallerIdGuid, Private->LsvVariableName));\r
+  DEBUG ((DEBUG_INFO, "FmpDxe(%s): Variable %g %s\n", mImageIdName, &gEfiCallerIdGuid, Private->LastAttemptStatusVariableName));\r
+  DEBUG ((DEBUG_INFO, "FmpDxe(%s): Variable %g %s\n", mImageIdName, &gEfiCallerIdGuid, Private->LastAttemptVersionVariableName));\r
+  DEBUG ((DEBUG_INFO, "FmpDxe(%s): Variable %g %s\n", mImageIdName, &gEfiCallerIdGuid, Private->FmpStateVariableName));\r
 \r
   Buffer = GetFmpControllerState (Private);\r
   if (Buffer != NULL) {\r
@@ -258,7 +258,7 @@ GenerateFmpVariableNames (
   // FMP Controller State was either not found or is wrong size.\r
   // Create a new FMP Controller State variable with the correct size.\r
   //\r
-  DEBUG ((DEBUG_INFO, "Create FMP Controller State\n"));\r
+  DEBUG ((DEBUG_INFO, "FmpDxe(%s): Create controller state\n", mImageIdName));\r
   GetFmpVariable (\r
     Private->VersionVariableName,\r
     &FmpControllerState.VersionValid,\r
@@ -292,7 +292,7 @@ GenerateFmpVariableNames (
     // delete the individual variables.  They can be used again on next boot\r
     // to create the FMP Controller State.\r
     //\r
-    DEBUG ((DEBUG_ERROR, "Failed to create FMP Controller State.  Status = %r\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to create controller state.  Status = %r\n", mImageIdName, Status));\r
   } else {\r
     DeleteFmpVariable (Private->VersionVariableName);\r
     DeleteFmpVariable (Private->LsvVariableName);\r
@@ -327,7 +327,8 @@ GetVersionFromVariable (
   if (FmpControllerState != NULL) {\r
     if (FmpControllerState->VersionValid) {\r
       Value = FmpControllerState->Version;\r
-      DEBUG ((DEBUG_INFO, "Get FMP Variable %g %s Version %08x\n",\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Get variable %g %s Version %08x\n",\r
+        mImageIdName,\r
         &gEfiCallerIdGuid,\r
         Private->FmpStateVariableName,\r
         Value\r
@@ -365,7 +366,8 @@ GetLowestSupportedVersionFromVariable (
   if (FmpControllerState != NULL) {\r
     if (FmpControllerState->LsvValid) {\r
       Value = FmpControllerState->Lsv;\r
-      DEBUG ((DEBUG_INFO, "Get FMP Variable %g %s LowestSupportedVersion %08x\n",\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Get variable %g %s LowestSupportedVersion %08x\n",\r
+        mImageIdName,\r
         &gEfiCallerIdGuid,\r
         Private->FmpStateVariableName,\r
         Value\r
@@ -402,7 +404,8 @@ GetLastAttemptStatusFromVariable (
   if (FmpControllerState != NULL) {\r
     if (FmpControllerState->LastAttemptStatusValid) {\r
       Value = FmpControllerState->LastAttemptStatus;\r
-      DEBUG ((DEBUG_INFO, "Get FMP Variable %g %s LastAttemptStatus %08x\n",\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Get variable %g %s LastAttemptStatus %08x\n",\r
+        mImageIdName,\r
         &gEfiCallerIdGuid,\r
         Private->FmpStateVariableName,\r
         Value\r
@@ -439,7 +442,8 @@ GetLastAttemptVersionFromVariable (
   if (FmpControllerState != NULL) {\r
     if (FmpControllerState->LastAttemptVersionValid) {\r
       Value = FmpControllerState->LastAttemptVersion;\r
-      DEBUG ((DEBUG_INFO, "Get FMP Variable %g %s LastAttemptVersion %08x\n",\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Get variable %g %s LastAttemptVersion %08x\n",\r
+        mImageIdName,\r
         &gEfiCallerIdGuid,\r
         Private->FmpStateVariableName,\r
         Value\r
@@ -486,7 +490,7 @@ SetVersionInVariable (
     Update = TRUE;\r
   }\r
   if (!Update) {\r
-    DEBUG ((DEBUG_INFO, "No need to update FMP Controller State.  Same value as before.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): No need to update controller state.  Same value as before.\n", mImageIdName));\r
   } else {\r
     FmpControllerState->VersionValid = TRUE;\r
     FmpControllerState->Version      = Version;\r
@@ -498,9 +502,10 @@ SetVersionInVariable (
                     FmpControllerState\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "Failed to update FMP Controller State.  Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to update controller state.  Status = %r\n", mImageIdName, Status));\r
     } else {\r
-      DEBUG ((DEBUG_INFO, "Set FMP Variable %g %s Version %08x\n",\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Set variable %g %s Version %08x\n",\r
+        mImageIdName,\r
         &gEfiCallerIdGuid,\r
         Private->FmpStateVariableName,\r
         Version\r
@@ -548,7 +553,7 @@ SetLowestSupportedVersionInVariable (
     Update = TRUE;\r
   }\r
   if (!Update) {\r
-    DEBUG ((DEBUG_INFO, "No need to update FMP Controller State.  Same value as before.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): No need to update controller state.  Same value as before.\n", mImageIdName));\r
   } else {\r
     FmpControllerState->LsvValid = TRUE;\r
     FmpControllerState->Lsv      = LowestSupportedVersion;\r
@@ -560,9 +565,10 @@ SetLowestSupportedVersionInVariable (
                     FmpControllerState\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "Failed to update FMP Controller State.  Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to update controller state.  Status = %r\n", mImageIdName, Status));\r
     } else {\r
-      DEBUG ((DEBUG_INFO, "Set FMP Variable %g %s LowestSupportedVersion %08x\n",\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Set variable %g %s LowestSupportedVersion %08x\n",\r
+        mImageIdName,\r
         &gEfiCallerIdGuid,\r
         Private->FmpStateVariableName,\r
         LowestSupportedVersion\r
@@ -610,7 +616,7 @@ SetLastAttemptStatusInVariable (
     Update = TRUE;\r
   }\r
   if (!Update) {\r
-    DEBUG ((DEBUG_INFO, "No need to update FMP Controller State.  Same value as before.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): No need to update controller state.  Same value as before.\n", mImageIdName));\r
   } else {\r
     FmpControllerState->LastAttemptStatusValid = TRUE;\r
     FmpControllerState->LastAttemptStatus      = LastAttemptStatus;\r
@@ -622,9 +628,10 @@ SetLastAttemptStatusInVariable (
                     FmpControllerState\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "Failed to update FMP Controller State.  Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to update controller state.  Status = %r\n", mImageIdName, Status));\r
     } else {\r
-      DEBUG ((DEBUG_INFO, "Set FMP Variable %g %s LastAttemptStatus %08x\n",\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Set variable %g %s LastAttemptStatus %08x\n",\r
+        mImageIdName,\r
         &gEfiCallerIdGuid,\r
         Private->FmpStateVariableName,\r
         LastAttemptStatus\r
@@ -672,7 +679,7 @@ SetLastAttemptVersionInVariable (
     Update = TRUE;\r
   }\r
   if (!Update) {\r
-    DEBUG ((DEBUG_INFO, "No need to update FMP Controller State.  Same value as before.\n"));\r
+    DEBUG ((DEBUG_INFO, "FmpDxe(%s): No need to update controller state.  Same value as before.\n", mImageIdName));\r
   } else {\r
     FmpControllerState->LastAttemptVersionValid = TRUE;\r
     FmpControllerState->LastAttemptVersion      = LastAttemptVersion;\r
@@ -684,9 +691,10 @@ SetLastAttemptVersionInVariable (
                     FmpControllerState\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "Failed to update FMP Controller State.  Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to update controller state.  Status = %r\n", mImageIdName, Status));\r
     } else {\r
-      DEBUG ((DEBUG_INFO, "Set FMP Variable %g %s LastAttemptVersion %08x\n",\r
+      DEBUG ((DEBUG_INFO, "FmpDxe(%s): Set variable %g %s LastAttemptVersion %08x\n",\r
+        mImageIdName,\r
         &gEfiCallerIdGuid,\r
         Private->FmpStateVariableName,\r
         LastAttemptVersion\r
@@ -728,7 +736,8 @@ LockFmpVariable (
     return PreviousStatus;\r
   }\r
 \r
-  DEBUG ((DEBUG_ERROR, "FmpDxe: Failed to lock variable %g %s.  Status = %r\n",\r
+  DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to lock variable %g %s.  Status = %r\n",\r
+    mImageIdName,\r
     &gEfiCallerIdGuid,\r
     VariableName,\r
     Status\r
@@ -765,7 +774,7 @@ LockAllFmpVariables (
                   (VOID **)&VariableLock\r
                   );\r
   if (EFI_ERROR (Status) || VariableLock == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "FmpDxe: Failed to locate Variable Lock Protocol (%r).\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to locate Variable Lock Protocol (%r).\n", mImageIdName, Status));\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r