MdeModulePkg/Usb: Update some debug messages’ print level to EFI_D_VERBOSE

Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Elvin Li <elvin.li@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14459 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
index 54b56de9f801280386a118953b4edbfa529bd431..76368b474865920381e69637262492c649a4ccca 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
@@ -2,7 +2,7 @@
 \r
   This file provides the information dump support for EHCI when in debug mode.\r
 \r
-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -28,38 +28,38 @@ EhcDumpStatus (
   )\r
 {\r
   if (EHC_BIT_IS_SET (State, QTD_STAT_DO_PING)) {\r
-    DEBUG ((EFI_D_INFO, "  Do_Ping"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Do_Ping"));\r
   } else {\r
-    DEBUG ((EFI_D_INFO, "  Do_Out"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Do_Out"));\r
   }\r
 \r
   if (EHC_BIT_IS_SET (State, QTD_STAT_DO_CS)) {\r
-    DEBUG ((EFI_D_INFO, "  Do_CS"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Do_CS"));\r
   } else {\r
-    DEBUG ((EFI_D_INFO, "  Do_SS"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Do_SS"));\r
   }\r
 \r
   if (EHC_BIT_IS_SET (State, QTD_STAT_TRANS_ERR)) {\r
-    DEBUG ((EFI_D_INFO, "  Transfer_Error"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Transfer_Error"));\r
   }\r
 \r
   if (EHC_BIT_IS_SET (State, QTD_STAT_BABBLE_ERR)) {\r
-    DEBUG ((EFI_D_INFO, "  Babble_Error"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Babble_Error"));\r
   }\r
 \r
   if (EHC_BIT_IS_SET (State, QTD_STAT_BUFF_ERR)) {\r
-    DEBUG ((EFI_D_INFO, "  Buffer_Error"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Buffer_Error"));\r
   }\r
 \r
   if (EHC_BIT_IS_SET (State, QTD_STAT_HALTED)) {\r
-    DEBUG ((EFI_D_INFO, "  Halted"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Halted"));\r
   }\r
 \r
   if (EHC_BIT_IS_SET (State, QTD_STAT_ACTIVE)) {\r
-    DEBUG ((EFI_D_INFO, "  Active"));\r
+    DEBUG ((EFI_D_VERBOSE, "  Active"));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "\n"));\r
+  DEBUG ((EFI_D_VERBOSE, "\n"));\r
 }\r
 \r
 \r
@@ -80,37 +80,37 @@ EhcDumpQtd (
   UINTN                   Index;\r
 \r
   if (Msg != NULL) {\r
-    DEBUG ((EFI_D_INFO, Msg));\r
+    DEBUG ((EFI_D_VERBOSE, Msg));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Queue TD @ 0x%p, data length %d\n", Qtd, (UINT32)Qtd->DataLen));\r
+  DEBUG ((EFI_D_VERBOSE, "Queue TD @ 0x%p, data length %d\n", Qtd, (UINT32)Qtd->DataLen));\r
 \r
   QtdHw = &Qtd->QtdHw;\r
 \r
-  DEBUG ((EFI_D_INFO, "Next QTD     : %x\n", QtdHw->NextQtd));\r
-  DEBUG ((EFI_D_INFO, "AltNext QTD  : %x\n", QtdHw->AltNext));\r
-  DEBUG ((EFI_D_INFO, "Status       : %x\n", QtdHw->Status));\r
+  DEBUG ((EFI_D_VERBOSE, "Next QTD     : %x\n", QtdHw->NextQtd));\r
+  DEBUG ((EFI_D_VERBOSE, "AltNext QTD  : %x\n", QtdHw->AltNext));\r
+  DEBUG ((EFI_D_VERBOSE, "Status       : %x\n", QtdHw->Status));\r
   EhcDumpStatus (QtdHw->Status);\r
 \r
   if (QtdHw->Pid == QTD_PID_SETUP) {\r
-    DEBUG ((EFI_D_INFO, "PID          : Setup\n"));\r
+    DEBUG ((EFI_D_VERBOSE, "PID          : Setup\n"));\r
 \r
   } else if (QtdHw->Pid == QTD_PID_INPUT) {\r
-    DEBUG ((EFI_D_INFO, "PID          : IN\n"));\r
+    DEBUG ((EFI_D_VERBOSE, "PID          : IN\n"));\r
 \r
   } else if (QtdHw->Pid == QTD_PID_OUTPUT) {\r
-    DEBUG ((EFI_D_INFO, "PID          : OUT\n"));\r
+    DEBUG ((EFI_D_VERBOSE, "PID          : OUT\n"));\r
 \r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Error Count  : %d\n", QtdHw->ErrCnt));\r
-  DEBUG ((EFI_D_INFO, "Current Page : %d\n", QtdHw->CurPage));\r
-  DEBUG ((EFI_D_INFO, "IOC          : %d\n", QtdHw->Ioc));\r
-  DEBUG ((EFI_D_INFO, "Total Bytes  : %d\n", QtdHw->TotalBytes));\r
-  DEBUG ((EFI_D_INFO, "Data Toggle  : %d\n", QtdHw->DataToggle));\r
+  DEBUG ((EFI_D_VERBOSE, "Error Count  : %d\n", QtdHw->ErrCnt));\r
+  DEBUG ((EFI_D_VERBOSE, "Current Page : %d\n", QtdHw->CurPage));\r
+  DEBUG ((EFI_D_VERBOSE, "IOC          : %d\n", QtdHw->Ioc));\r
+  DEBUG ((EFI_D_VERBOSE, "Total Bytes  : %d\n", QtdHw->TotalBytes));\r
+  DEBUG ((EFI_D_VERBOSE, "Data Toggle  : %d\n", QtdHw->DataToggle));\r
 \r
   for (Index = 0; Index < 5; Index++) {\r
-    DEBUG ((EFI_D_INFO, "Page[%d]      : 0x%x\n", (UINT32)Index, QtdHw->Page[Index]));\r
+    DEBUG ((EFI_D_VERBOSE, "Page[%d]      : 0x%x\n", (UINT32)Index, QtdHw->Page[Index]));\r
   }\r
 }\r
 \r
@@ -136,60 +136,60 @@ EhcDumpQh (
   UINTN                   Index;\r
 \r
   if (Msg != NULL) {\r
-    DEBUG ((EFI_D_INFO, Msg));\r
+    DEBUG ((EFI_D_VERBOSE, Msg));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Queue head @ 0x%p, interval %ld, next qh %p\n",\r
+  DEBUG ((EFI_D_VERBOSE, "Queue head @ 0x%p, interval %ld, next qh %p\n",\r
                                 Qh, (UINT64)Qh->Interval, Qh->NextQh));\r
 \r
   QhHw = &Qh->QhHw;\r
 \r
-  DEBUG ((EFI_D_INFO, "Hoziontal link: %x\n", QhHw->HorizonLink));\r
-  DEBUG ((EFI_D_INFO, "Device address: %d\n", QhHw->DeviceAddr));\r
-  DEBUG ((EFI_D_INFO, "Inactive      : %d\n", QhHw->Inactive));\r
-  DEBUG ((EFI_D_INFO, "EP number     : %d\n", QhHw->EpNum));\r
-  DEBUG ((EFI_D_INFO, "EP speed      : %d\n", QhHw->EpSpeed));\r
-  DEBUG ((EFI_D_INFO, "DT control    : %d\n", QhHw->DtCtrl));\r
-  DEBUG ((EFI_D_INFO, "Reclaim head  : %d\n", QhHw->ReclaimHead));\r
-  DEBUG ((EFI_D_INFO, "Max packet len: %d\n", QhHw->MaxPacketLen));\r
-  DEBUG ((EFI_D_INFO, "Ctrl EP       : %d\n", QhHw->CtrlEp));\r
-  DEBUG ((EFI_D_INFO, "Nak reload    : %d\n", QhHw->NakReload));\r
-\r
-  DEBUG ((EFI_D_INFO, "SMask         : %x\n", QhHw->SMask));\r
-  DEBUG ((EFI_D_INFO, "CMask         : %x\n", QhHw->CMask));\r
-  DEBUG ((EFI_D_INFO, "Hub address   : %d\n", QhHw->HubAddr));\r
-  DEBUG ((EFI_D_INFO, "Hub port      : %d\n", QhHw->PortNum));\r
-  DEBUG ((EFI_D_INFO, "Multiplier    : %d\n", QhHw->Multiplier));\r
-\r
-  DEBUG ((EFI_D_INFO, "Cur QTD       : %x\n", QhHw->CurQtd));\r
-\r
-  DEBUG ((EFI_D_INFO, "Next QTD      : %x\n", QhHw->NextQtd));\r
-  DEBUG ((EFI_D_INFO, "AltNext QTD   : %x\n", QhHw->AltQtd));\r
-  DEBUG ((EFI_D_INFO, "Status        : %x\n", QhHw->Status));\r
+  DEBUG ((EFI_D_VERBOSE, "Hoziontal link: %x\n", QhHw->HorizonLink));\r
+  DEBUG ((EFI_D_VERBOSE, "Device address: %d\n", QhHw->DeviceAddr));\r
+  DEBUG ((EFI_D_VERBOSE, "Inactive      : %d\n", QhHw->Inactive));\r
+  DEBUG ((EFI_D_VERBOSE, "EP number     : %d\n", QhHw->EpNum));\r
+  DEBUG ((EFI_D_VERBOSE, "EP speed      : %d\n", QhHw->EpSpeed));\r
+  DEBUG ((EFI_D_VERBOSE, "DT control    : %d\n", QhHw->DtCtrl));\r
+  DEBUG ((EFI_D_VERBOSE, "Reclaim head  : %d\n", QhHw->ReclaimHead));\r
+  DEBUG ((EFI_D_VERBOSE, "Max packet len: %d\n", QhHw->MaxPacketLen));\r
+  DEBUG ((EFI_D_VERBOSE, "Ctrl EP       : %d\n", QhHw->CtrlEp));\r
+  DEBUG ((EFI_D_VERBOSE, "Nak reload    : %d\n", QhHw->NakReload));\r
+\r
+  DEBUG ((EFI_D_VERBOSE, "SMask         : %x\n", QhHw->SMask));\r
+  DEBUG ((EFI_D_VERBOSE, "CMask         : %x\n", QhHw->CMask));\r
+  DEBUG ((EFI_D_VERBOSE, "Hub address   : %d\n", QhHw->HubAddr));\r
+  DEBUG ((EFI_D_VERBOSE, "Hub port      : %d\n", QhHw->PortNum));\r
+  DEBUG ((EFI_D_VERBOSE, "Multiplier    : %d\n", QhHw->Multiplier));\r
+\r
+  DEBUG ((EFI_D_VERBOSE, "Cur QTD       : %x\n", QhHw->CurQtd));\r
+\r
+  DEBUG ((EFI_D_VERBOSE, "Next QTD      : %x\n", QhHw->NextQtd));\r
+  DEBUG ((EFI_D_VERBOSE, "AltNext QTD   : %x\n", QhHw->AltQtd));\r
+  DEBUG ((EFI_D_VERBOSE, "Status        : %x\n", QhHw->Status));\r
 \r
   EhcDumpStatus (QhHw->Status);\r
 \r
   if (QhHw->Pid == QTD_PID_SETUP) {\r
-    DEBUG ((EFI_D_INFO, "PID           : Setup\n"));\r
+    DEBUG ((EFI_D_VERBOSE, "PID           : Setup\n"));\r
 \r
   } else if (QhHw->Pid == QTD_PID_INPUT) {\r
-    DEBUG ((EFI_D_INFO, "PID           : IN\n"));\r
+    DEBUG ((EFI_D_VERBOSE, "PID           : IN\n"));\r
 \r
   } else if (QhHw->Pid == QTD_PID_OUTPUT) {\r
-    DEBUG ((EFI_D_INFO, "PID           : OUT\n"));\r
+    DEBUG ((EFI_D_VERBOSE, "PID           : OUT\n"));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Error Count   : %d\n", QhHw->ErrCnt));\r
-  DEBUG ((EFI_D_INFO, "Current Page  : %d\n", QhHw->CurPage));\r
-  DEBUG ((EFI_D_INFO, "IOC           : %d\n", QhHw->Ioc));\r
-  DEBUG ((EFI_D_INFO, "Total Bytes   : %d\n", QhHw->TotalBytes));\r
-  DEBUG ((EFI_D_INFO, "Data Toggle   : %d\n", QhHw->DataToggle));\r
+  DEBUG ((EFI_D_VERBOSE, "Error Count   : %d\n", QhHw->ErrCnt));\r
+  DEBUG ((EFI_D_VERBOSE, "Current Page  : %d\n", QhHw->CurPage));\r
+  DEBUG ((EFI_D_VERBOSE, "IOC           : %d\n", QhHw->Ioc));\r
+  DEBUG ((EFI_D_VERBOSE, "Total Bytes   : %d\n", QhHw->TotalBytes));\r
+  DEBUG ((EFI_D_VERBOSE, "Data Toggle   : %d\n", QhHw->DataToggle));\r
 \r
   for (Index = 0; Index < 5; Index++) {\r
-    DEBUG ((EFI_D_INFO, "Page[%d]       : 0x%x\n", Index, QhHw->Page[Index]));\r
+    DEBUG ((EFI_D_VERBOSE, "Page[%d]       : 0x%x\n", Index, QhHw->Page[Index]));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "\n"));\r
+  DEBUG ((EFI_D_VERBOSE, "\n"));\r
 \r
   EFI_LIST_FOR_EACH (Entry, &Qh->Qtds) {\r
     Qtd = EFI_LIST_CONTAINER (Entry, EHC_QTD, QtdList);\r
@@ -219,13 +219,13 @@ EhcDumpBuf (
 \r
   for (Index = 0; Index < Len; Index++) {\r
     if (Index % 16 == 0) {\r
-      DEBUG ((EFI_D_INFO,"\n"));\r
+      DEBUG ((EFI_D_VERBOSE,"\n"));\r
     }\r
 \r
-    DEBUG ((EFI_D_INFO, "%02x ", Buf[Index]));\r
+    DEBUG ((EFI_D_VERBOSE, "%02x ", Buf[Index]));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "\n"));\r
+  DEBUG ((EFI_D_VERBOSE, "\n"));\r
 }\r
 \r
 /**\r
@@ -241,18 +241,18 @@ EhcDumpRegs (
 {\r
   UINT8   Index;\r
 \r
-  DEBUG ((EFI_D_INFO, "  EHC_CAPLENGTH_OFFSET   = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_CAPLENGTH_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_HCSPARAMS_OFFSET   = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_HCSPARAMS_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_HCCPARAMS_OFFSET   = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_HCCPARAMS_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_USBCMD_OFFSET      = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBCMD_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_USBSTS_OFFSET      = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBSTS_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_USBINTR_OFFSET     = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBINTR_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_FRINDEX_OFFSET     = 0x%08x\n", EhcReadOpReg (Ehc, EHC_FRINDEX_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_CTRLDSSEG_OFFSET   = 0x%08x\n", EhcReadOpReg (Ehc,  EHC_CTRLDSSEG_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_FRAME_BASE_OFFSET  = 0x%08x\n", EhcReadOpReg (Ehc,  EHC_FRAME_BASE_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_ASYNC_HEAD_OFFSET  = 0x%08x\n", EhcReadOpReg (Ehc, EHC_ASYNC_HEAD_OFFSET)));\r
-  DEBUG ((EFI_D_INFO, "  EHC_CONFIG_FLAG_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_CONFIG_FLAG_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_CAPLENGTH_OFFSET   = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_CAPLENGTH_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_HCSPARAMS_OFFSET   = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_HCSPARAMS_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_HCCPARAMS_OFFSET   = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_HCCPARAMS_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_USBCMD_OFFSET      = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBCMD_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_USBSTS_OFFSET      = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBSTS_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_USBINTR_OFFSET     = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBINTR_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_FRINDEX_OFFSET     = 0x%08x\n", EhcReadOpReg (Ehc, EHC_FRINDEX_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_CTRLDSSEG_OFFSET   = 0x%08x\n", EhcReadOpReg (Ehc,  EHC_CTRLDSSEG_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_FRAME_BASE_OFFSET  = 0x%08x\n", EhcReadOpReg (Ehc,  EHC_FRAME_BASE_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_ASYNC_HEAD_OFFSET  = 0x%08x\n", EhcReadOpReg (Ehc, EHC_ASYNC_HEAD_OFFSET)));\r
+  DEBUG ((EFI_D_VERBOSE, "  EHC_CONFIG_FLAG_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_CONFIG_FLAG_OFFSET)));\r
   for (Index = 0; Index < (UINT8) (Ehc->HcStructParams & HCSP_NPORTS); Index++) {\r
-    DEBUG ((EFI_D_INFO, "  EHC_PORT_STAT_OFFSET(%d)  = 0x%08x\n", Index, EhcReadOpReg (Ehc, EHC_PORT_STAT_OFFSET + (4 * Index))));\r
+    DEBUG ((EFI_D_VERBOSE, "  EHC_PORT_STAT_OFFSET(%d)  = 0x%08x\n", Index, EhcReadOpReg (Ehc, EHC_PORT_STAT_OFFSET + (4 * Index))));\r
   }\r
 }\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 366ab84dcf63b868dde8638fd33e635165a56192..5594e6699ea648052a2be683dc46dba6d0c3aa68 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
@@ -641,13 +641,13 @@ EhcCheckUrbResult (
         //\r
         PciAddr = UsbHcGetPciAddressForHostMem (Ehc->MemPool, Ehc->ShortReadStop, sizeof (EHC_QTD));\r
         if (QtdHw->AltNext == QTD_LINK (PciAddr, FALSE)) {\r
-          DEBUG ((EFI_D_INFO, "EhcCheckUrbResult: Short packet read, break\n"));\r
+          DEBUG ((EFI_D_VERBOSE, "EhcCheckUrbResult: Short packet read, break\n"));\r
 \r
           Finished = TRUE;\r
           goto ON_EXIT;\r
         }\r
 \r
-        DEBUG ((EFI_D_INFO, "EhcCheckUrbResult: Short packet read, continue\n"));\r
+        DEBUG ((EFI_D_VERBOSE, "EhcCheckUrbResult: Short packet read, continue\n"));\r
       }\r
     }\r
   }\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
index baac29df66419b3f2ba9068edf58542dbf048558..28be3803f1b29f10f03e2c41535bb603b3c27d9b 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
@@ -2,7 +2,7 @@
 \r
   Routine procedures for memory allocate/free.\r
 \r
-Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -476,7 +476,7 @@ UsbHcAllocateMem (
   NewBlock = UsbHcAllocMemBlock (Pool, Pages);\r
 \r
   if (NewBlock == NULL) {\r
-    DEBUG ((EFI_D_INFO, "UsbHcAllocateMem: failed to allocate block\n"));\r
+    DEBUG ((EFI_D_ERROR, "UsbHcAllocateMem: failed to allocate block\n"));\r
     return NULL;\r
   }\r
 \r