Re: [PATCH v1 3/5] MdeModulePkg: Fix imbalanced debug macros

["Wu, Hao A" <hao.a.wu@intel.com>]

For changes in:
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c

Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu

> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Wednesday, August 3, 2022 2:04 AM
> To: devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Jiang, Guomin
> <guomin.jiang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Wang, Jian J
> <jian.j.wang@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Ni, Ray
> <ray.ni@intel.com>
> Subject: [PATCH v1 3/5] MdeModulePkg: Fix imbalanced debug macros
> 
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> Updates debug macros in the package that have an imbalanced number of
> print specifiers to arguments. These changes try to preserve what was likely
> intended by the author. In cases information was missing due to the bug, the
> specifier may be removed since it was not previously accurately printing the
> expected value.
> 
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
>  MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> | 2 +-
>  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
> | 8 ++++----
>  MdeModulePkg/Core/Dxe/Image/Image.c                                                      | 2 +-
> 
> MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateP
> rogressLibGraphics.c | 2 +-
>  4 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> index 53b63ab52b93..dd45167a009e 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> @@ -64,7 +64,7 @@ DumpCapabilityReg (
>    DEBUG ((DEBUG_INFO, "   Driver Type D     %a\n", Capability->DriverTypeD ?
> "TRUE" : "FALSE"));
>    DEBUG ((DEBUG_INFO, "   Driver Type 4     %a\n", Capability->DriverType4 ?
> "TRUE" : "FALSE"));
>    if (Capability->TimerCount == 0) {
> -    DEBUG ((DEBUG_INFO, "   Retuning TimerCnt Disabled\n", 2 * (Capability-
> >TimerCount - 1)));
> +    DEBUG ((DEBUG_INFO, "   Retuning TimerCnt Disabled\n"));
>    } else {
>      DEBUG ((DEBUG_INFO, "   Retuning TimerCnt %dseconds\n", 2 *
> (Capability->TimerCount - 1)));
>    }
> diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
> b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
> index 5495b324b381..aed34596f469 100644
> --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
> +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
> @@ -941,7 +941,7 @@ UsbEnumeratePort (
>        //   which probably is caused by short circuit. It has to wait system
> hardware
>        //   to perform recovery.
>        //
> -      DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: Critical Over Current\n",
> Port));
> +      DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: Critical Over Current
> + (port %d)\n", Port));
>        return EFI_DEVICE_ERROR;
>      }
> 
> @@ -951,7 +951,7 @@ UsbEnumeratePort (
>      //   over current. As a result, all ports are nearly power-off, so
>      //   it's necessary to detach and enumerate all ports again.
>      //
> -    DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 2.0 device Recovery Over
> Current\n", Port));
> +    DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 2.0 device Recovery Over
> + Current (port %d)\n", Port));
>    }
> 
>    if (USB_BIT_IS_SET (PortState.PortChangeStatus,
> USB_PORT_STAT_C_ENABLE)) { @@ -961,7 +961,7 @@ UsbEnumeratePort (
>      //   on 2.0 roothub does. When over-current has influence on 1.1 device,
> the port
>      //   would be disabled, so it's also necessary to detach and enumerate
> again.
>      //
> -    DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 1.1 device Recovery Over
> Current\n", Port));
> +    DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 1.1 device Recovery Over
> + Current (port %d)\n", Port));
>    }
> 
>    if (USB_BIT_IS_SET (PortState.PortChangeStatus,
> USB_PORT_STAT_C_CONNECTION)) { @@ -969,7 +969,7 @@
> UsbEnumeratePort (
>      // Case4:
>      //   Device connected or disconnected normally.
>      //
> -    DEBUG ((DEBUG_INFO, "UsbEnumeratePort: Device Connect/Disconnect
> Normally\n", Port));
> +    DEBUG ((DEBUG_INFO, "UsbEnumeratePort: Device Connect/Disconnect
> + Normally (port %d)\n", Port));
>    }
> 
>    //
> diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c
> b/MdeModulePkg/Core/Dxe/Image/Image.c
> index 68bde5c15c52..06cc6744b8c6 100644
> --- a/MdeModulePkg/Core/Dxe/Image/Image.c
> +++ b/MdeModulePkg/Core/Dxe/Image/Image.c
> @@ -1741,7 +1741,7 @@ CoreStartImage (
>    if ((Image->ExitDataSize != 0) || (Image->ExitData != NULL)) {
>      DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %p",
> (UINT32)Image->ExitDataSize, Image->ExitData));
>      if (Image->ExitData != NULL) {
> -      DEBUG ((DEBUG_LOAD, " (%hs)", Image->ExitData));
> +      DEBUG ((DEBUG_LOAD, " (%s)", Image->ExitData));
>      }
> 
>      DEBUG ((DEBUG_LOAD, "\n"));
> diff --git
> a/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdat
> eProgressLibGraphics.c
> b/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdat
> eProgressLibGraphics.c
> index 83053464e06e..6b012fed35db 100644
> ---
> a/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdat
> eProgressLibGraphics.c
> +++
> b/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdat
> +++ eProgressLibGraphics.c
> @@ -148,7 +148,7 @@ FindDim (
>                    (VOID **)&BootLogo
>                    );
>    if ((BootLogo == NULL) || (EFI_ERROR (Status))) {
> -    DEBUG ((DEBUG_ERROR, "Failed to locate gEdkiiBootLogo2ProtocolGuid.
> No Progress bar support. \n", Status));
> +    DEBUG ((DEBUG_ERROR, "Failed to locate gEdkiiBootLogo2ProtocolGuid
> + Status = %r.  No Progress bar support. \n", Status));
>      return;
>    }
> 
> --
> 2.28.0.windows.1