From 32460e6bfa0940bbe73521d3492fbfdf08cb6186 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Wed, 9 Oct 2013 01:40:43 +0000 Subject: Sync patches r14459 and r14751 from main trunk. 1. MdeModulePkg/Usb: Update some debug messages' print level to EFI_D_VERBOSE. 2. Fix several DEBUG_ERROR messages that are unnecessarily verbose. Several of these are marked as DEBUG_ERROR when they are really not errors. git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@14752 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c | 148 ++++++++++----------- MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c | 4 +- MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c | 4 +- MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c | 50 +++---- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c | 2 +- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c | 2 +- .../FaultTolerantWriteDxe/FaultTolerantWrite.c | 4 +- .../FaultTolerantWriteDxe/UpdateWorkingBlock.c | 4 +- 8 files changed, 109 insertions(+), 109 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c index 54b56de9f8..76368b4748 100644 --- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c +++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c @@ -2,7 +2,7 @@ This file provides the information dump support for EHCI when in debug mode. -Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -28,38 +28,38 @@ EhcDumpStatus ( ) { if (EHC_BIT_IS_SET (State, QTD_STAT_DO_PING)) { - DEBUG ((EFI_D_INFO, " Do_Ping")); + DEBUG ((EFI_D_VERBOSE, " Do_Ping")); } else { - DEBUG ((EFI_D_INFO, " Do_Out")); + DEBUG ((EFI_D_VERBOSE, " Do_Out")); } if (EHC_BIT_IS_SET (State, QTD_STAT_DO_CS)) { - DEBUG ((EFI_D_INFO, " Do_CS")); + DEBUG ((EFI_D_VERBOSE, " Do_CS")); } else { - DEBUG ((EFI_D_INFO, " Do_SS")); + DEBUG ((EFI_D_VERBOSE, " Do_SS")); } if (EHC_BIT_IS_SET (State, QTD_STAT_TRANS_ERR)) { - DEBUG ((EFI_D_INFO, " Transfer_Error")); + DEBUG ((EFI_D_VERBOSE, " Transfer_Error")); } if (EHC_BIT_IS_SET (State, QTD_STAT_BABBLE_ERR)) { - DEBUG ((EFI_D_INFO, " Babble_Error")); + DEBUG ((EFI_D_VERBOSE, " Babble_Error")); } if (EHC_BIT_IS_SET (State, QTD_STAT_BUFF_ERR)) { - DEBUG ((EFI_D_INFO, " Buffer_Error")); + DEBUG ((EFI_D_VERBOSE, " Buffer_Error")); } if (EHC_BIT_IS_SET (State, QTD_STAT_HALTED)) { - DEBUG ((EFI_D_INFO, " Halted")); + DEBUG ((EFI_D_VERBOSE, " Halted")); } if (EHC_BIT_IS_SET (State, QTD_STAT_ACTIVE)) { - DEBUG ((EFI_D_INFO, " Active")); + DEBUG ((EFI_D_VERBOSE, " Active")); } - DEBUG ((EFI_D_INFO, "\n")); + DEBUG ((EFI_D_VERBOSE, "\n")); } @@ -80,37 +80,37 @@ EhcDumpQtd ( UINTN Index; if (Msg != NULL) { - DEBUG ((EFI_D_INFO, Msg)); + DEBUG ((EFI_D_VERBOSE, Msg)); } - DEBUG ((EFI_D_INFO, "Queue TD @ 0x%p, data length %d\n", Qtd, (UINT32)Qtd->DataLen)); + DEBUG ((EFI_D_VERBOSE, "Queue TD @ 0x%p, data length %d\n", Qtd, (UINT32)Qtd->DataLen)); QtdHw = &Qtd->QtdHw; - DEBUG ((EFI_D_INFO, "Next QTD : %x\n", QtdHw->NextQtd)); - DEBUG ((EFI_D_INFO, "AltNext QTD : %x\n", QtdHw->AltNext)); - DEBUG ((EFI_D_INFO, "Status : %x\n", QtdHw->Status)); + DEBUG ((EFI_D_VERBOSE, "Next QTD : %x\n", QtdHw->NextQtd)); + DEBUG ((EFI_D_VERBOSE, "AltNext QTD : %x\n", QtdHw->AltNext)); + DEBUG ((EFI_D_VERBOSE, "Status : %x\n", QtdHw->Status)); EhcDumpStatus (QtdHw->Status); if (QtdHw->Pid == QTD_PID_SETUP) { - DEBUG ((EFI_D_INFO, "PID : Setup\n")); + DEBUG ((EFI_D_VERBOSE, "PID : Setup\n")); } else if (QtdHw->Pid == QTD_PID_INPUT) { - DEBUG ((EFI_D_INFO, "PID : IN\n")); + DEBUG ((EFI_D_VERBOSE, "PID : IN\n")); } else if (QtdHw->Pid == QTD_PID_OUTPUT) { - DEBUG ((EFI_D_INFO, "PID : OUT\n")); + DEBUG ((EFI_D_VERBOSE, "PID : OUT\n")); } - DEBUG ((EFI_D_INFO, "Error Count : %d\n", QtdHw->ErrCnt)); - DEBUG ((EFI_D_INFO, "Current Page : %d\n", QtdHw->CurPage)); - DEBUG ((EFI_D_INFO, "IOC : %d\n", QtdHw->Ioc)); - DEBUG ((EFI_D_INFO, "Total Bytes : %d\n", QtdHw->TotalBytes)); - DEBUG ((EFI_D_INFO, "Data Toggle : %d\n", QtdHw->DataToggle)); + DEBUG ((EFI_D_VERBOSE, "Error Count : %d\n", QtdHw->ErrCnt)); + DEBUG ((EFI_D_VERBOSE, "Current Page : %d\n", QtdHw->CurPage)); + DEBUG ((EFI_D_VERBOSE, "IOC : %d\n", QtdHw->Ioc)); + DEBUG ((EFI_D_VERBOSE, "Total Bytes : %d\n", QtdHw->TotalBytes)); + DEBUG ((EFI_D_VERBOSE, "Data Toggle : %d\n", QtdHw->DataToggle)); for (Index = 0; Index < 5; Index++) { - DEBUG ((EFI_D_INFO, "Page[%d] : 0x%x\n", (UINT32)Index, QtdHw->Page[Index])); + DEBUG ((EFI_D_VERBOSE, "Page[%d] : 0x%x\n", (UINT32)Index, QtdHw->Page[Index])); } } @@ -136,60 +136,60 @@ EhcDumpQh ( UINTN Index; if (Msg != NULL) { - DEBUG ((EFI_D_INFO, Msg)); + DEBUG ((EFI_D_VERBOSE, Msg)); } - DEBUG ((EFI_D_INFO, "Queue head @ 0x%p, interval %ld, next qh %p\n", + DEBUG ((EFI_D_VERBOSE, "Queue head @ 0x%p, interval %ld, next qh %p\n", Qh, (UINT64)Qh->Interval, Qh->NextQh)); QhHw = &Qh->QhHw; - DEBUG ((EFI_D_INFO, "Hoziontal link: %x\n", QhHw->HorizonLink)); - DEBUG ((EFI_D_INFO, "Device address: %d\n", QhHw->DeviceAddr)); - DEBUG ((EFI_D_INFO, "Inactive : %d\n", QhHw->Inactive)); - DEBUG ((EFI_D_INFO, "EP number : %d\n", QhHw->EpNum)); - DEBUG ((EFI_D_INFO, "EP speed : %d\n", QhHw->EpSpeed)); - DEBUG ((EFI_D_INFO, "DT control : %d\n", QhHw->DtCtrl)); - DEBUG ((EFI_D_INFO, "Reclaim head : %d\n", QhHw->ReclaimHead)); - DEBUG ((EFI_D_INFO, "Max packet len: %d\n", QhHw->MaxPacketLen)); - DEBUG ((EFI_D_INFO, "Ctrl EP : %d\n", QhHw->CtrlEp)); - DEBUG ((EFI_D_INFO, "Nak reload : %d\n", QhHw->NakReload)); - - DEBUG ((EFI_D_INFO, "SMask : %x\n", QhHw->SMask)); - DEBUG ((EFI_D_INFO, "CMask : %x\n", QhHw->CMask)); - DEBUG ((EFI_D_INFO, "Hub address : %d\n", QhHw->HubAddr)); - DEBUG ((EFI_D_INFO, "Hub port : %d\n", QhHw->PortNum)); - DEBUG ((EFI_D_INFO, "Multiplier : %d\n", QhHw->Multiplier)); - - DEBUG ((EFI_D_INFO, "Cur QTD : %x\n", QhHw->CurQtd)); - - DEBUG ((EFI_D_INFO, "Next QTD : %x\n", QhHw->NextQtd)); - DEBUG ((EFI_D_INFO, "AltNext QTD : %x\n", QhHw->AltQtd)); - DEBUG ((EFI_D_INFO, "Status : %x\n", QhHw->Status)); + DEBUG ((EFI_D_VERBOSE, "Hoziontal link: %x\n", QhHw->HorizonLink)); + DEBUG ((EFI_D_VERBOSE, "Device address: %d\n", QhHw->DeviceAddr)); + DEBUG ((EFI_D_VERBOSE, "Inactive : %d\n", QhHw->Inactive)); + DEBUG ((EFI_D_VERBOSE, "EP number : %d\n", QhHw->EpNum)); + DEBUG ((EFI_D_VERBOSE, "EP speed : %d\n", QhHw->EpSpeed)); + DEBUG ((EFI_D_VERBOSE, "DT control : %d\n", QhHw->DtCtrl)); + DEBUG ((EFI_D_VERBOSE, "Reclaim head : %d\n", QhHw->ReclaimHead)); + DEBUG ((EFI_D_VERBOSE, "Max packet len: %d\n", QhHw->MaxPacketLen)); + DEBUG ((EFI_D_VERBOSE, "Ctrl EP : %d\n", QhHw->CtrlEp)); + DEBUG ((EFI_D_VERBOSE, "Nak reload : %d\n", QhHw->NakReload)); + + DEBUG ((EFI_D_VERBOSE, "SMask : %x\n", QhHw->SMask)); + DEBUG ((EFI_D_VERBOSE, "CMask : %x\n", QhHw->CMask)); + DEBUG ((EFI_D_VERBOSE, "Hub address : %d\n", QhHw->HubAddr)); + DEBUG ((EFI_D_VERBOSE, "Hub port : %d\n", QhHw->PortNum)); + DEBUG ((EFI_D_VERBOSE, "Multiplier : %d\n", QhHw->Multiplier)); + + DEBUG ((EFI_D_VERBOSE, "Cur QTD : %x\n", QhHw->CurQtd)); + + DEBUG ((EFI_D_VERBOSE, "Next QTD : %x\n", QhHw->NextQtd)); + DEBUG ((EFI_D_VERBOSE, "AltNext QTD : %x\n", QhHw->AltQtd)); + DEBUG ((EFI_D_VERBOSE, "Status : %x\n", QhHw->Status)); EhcDumpStatus (QhHw->Status); if (QhHw->Pid == QTD_PID_SETUP) { - DEBUG ((EFI_D_INFO, "PID : Setup\n")); + DEBUG ((EFI_D_VERBOSE, "PID : Setup\n")); } else if (QhHw->Pid == QTD_PID_INPUT) { - DEBUG ((EFI_D_INFO, "PID : IN\n")); + DEBUG ((EFI_D_VERBOSE, "PID : IN\n")); } else if (QhHw->Pid == QTD_PID_OUTPUT) { - DEBUG ((EFI_D_INFO, "PID : OUT\n")); + DEBUG ((EFI_D_VERBOSE, "PID : OUT\n")); } - DEBUG ((EFI_D_INFO, "Error Count : %d\n", QhHw->ErrCnt)); - DEBUG ((EFI_D_INFO, "Current Page : %d\n", QhHw->CurPage)); - DEBUG ((EFI_D_INFO, "IOC : %d\n", QhHw->Ioc)); - DEBUG ((EFI_D_INFO, "Total Bytes : %d\n", QhHw->TotalBytes)); - DEBUG ((EFI_D_INFO, "Data Toggle : %d\n", QhHw->DataToggle)); + DEBUG ((EFI_D_VERBOSE, "Error Count : %d\n", QhHw->ErrCnt)); + DEBUG ((EFI_D_VERBOSE, "Current Page : %d\n", QhHw->CurPage)); + DEBUG ((EFI_D_VERBOSE, "IOC : %d\n", QhHw->Ioc)); + DEBUG ((EFI_D_VERBOSE, "Total Bytes : %d\n", QhHw->TotalBytes)); + DEBUG ((EFI_D_VERBOSE, "Data Toggle : %d\n", QhHw->DataToggle)); for (Index = 0; Index < 5; Index++) { - DEBUG ((EFI_D_INFO, "Page[%d] : 0x%x\n", Index, QhHw->Page[Index])); + DEBUG ((EFI_D_VERBOSE, "Page[%d] : 0x%x\n", Index, QhHw->Page[Index])); } - DEBUG ((EFI_D_INFO, "\n")); + DEBUG ((EFI_D_VERBOSE, "\n")); EFI_LIST_FOR_EACH (Entry, &Qh->Qtds) { Qtd = EFI_LIST_CONTAINER (Entry, EHC_QTD, QtdList); @@ -219,13 +219,13 @@ EhcDumpBuf ( for (Index = 0; Index < Len; Index++) { if (Index % 16 == 0) { - DEBUG ((EFI_D_INFO,"\n")); + DEBUG ((EFI_D_VERBOSE,"\n")); } - DEBUG ((EFI_D_INFO, "%02x ", Buf[Index])); + DEBUG ((EFI_D_VERBOSE, "%02x ", Buf[Index])); } - DEBUG ((EFI_D_INFO, "\n")); + DEBUG ((EFI_D_VERBOSE, "\n")); } /** @@ -241,18 +241,18 @@ EhcDumpRegs ( { UINT8 Index; - DEBUG ((EFI_D_INFO, " EHC_CAPLENGTH_OFFSET = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_CAPLENGTH_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_HCSPARAMS_OFFSET = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_HCSPARAMS_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_HCCPARAMS_OFFSET = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_HCCPARAMS_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_USBCMD_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBCMD_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_USBSTS_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBSTS_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_USBINTR_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBINTR_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_FRINDEX_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_FRINDEX_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_CTRLDSSEG_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_CTRLDSSEG_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_FRAME_BASE_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_FRAME_BASE_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_ASYNC_HEAD_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_ASYNC_HEAD_OFFSET))); - DEBUG ((EFI_D_INFO, " EHC_CONFIG_FLAG_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_CONFIG_FLAG_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_CAPLENGTH_OFFSET = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_CAPLENGTH_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_HCSPARAMS_OFFSET = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_HCSPARAMS_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_HCCPARAMS_OFFSET = 0x%08x\n", EhcReadCapRegister (Ehc, EHC_HCCPARAMS_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_USBCMD_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBCMD_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_USBSTS_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBSTS_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_USBINTR_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_USBINTR_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_FRINDEX_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_FRINDEX_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_CTRLDSSEG_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_CTRLDSSEG_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_FRAME_BASE_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_FRAME_BASE_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_ASYNC_HEAD_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_ASYNC_HEAD_OFFSET))); + DEBUG ((EFI_D_VERBOSE, " EHC_CONFIG_FLAG_OFFSET = 0x%08x\n", EhcReadOpReg (Ehc, EHC_CONFIG_FLAG_OFFSET))); for (Index = 0; Index < (UINT8) (Ehc->HcStructParams & HCSP_NPORTS); Index++) { - DEBUG ((EFI_D_INFO, " EHC_PORT_STAT_OFFSET(%d) = 0x%08x\n", Index, EhcReadOpReg (Ehc, EHC_PORT_STAT_OFFSET + (4 * Index)))); + DEBUG ((EFI_D_VERBOSE, " EHC_PORT_STAT_OFFSET(%d) = 0x%08x\n", Index, EhcReadOpReg (Ehc, EHC_PORT_STAT_OFFSET + (4 * Index)))); } } diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c index 4dc8e1abf1..5c6e9af648 100644 --- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c +++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c @@ -641,13 +641,13 @@ EhcCheckUrbResult ( // PciAddr = UsbHcGetPciAddressForHostMem (Ehc->MemPool, Ehc->ShortReadStop, sizeof (EHC_QTD)); if (QtdHw->AltNext == QTD_LINK (PciAddr, FALSE)) { - DEBUG ((EFI_D_INFO, "EhcCheckUrbResult: Short packet read, break\n")); + DEBUG ((EFI_D_VERBOSE, "EhcCheckUrbResult: Short packet read, break\n")); Finished = TRUE; goto ON_EXIT; } - DEBUG ((EFI_D_INFO, "EhcCheckUrbResult: Short packet read, continue\n")); + DEBUG ((EFI_D_VERBOSE, "EhcCheckUrbResult: Short packet read, continue\n")); } } } diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c index baac29df66..28be3803f1 100644 --- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c +++ b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c @@ -2,7 +2,7 @@ Routine procedures for memory allocate/free. -Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -476,7 +476,7 @@ UsbHcAllocateMem ( NewBlock = UsbHcAllocMemBlock (Pool, Pages); if (NewBlock == NULL) { - DEBUG ((EFI_D_INFO, "UsbHcAllocateMem: failed to allocate block\n")); + DEBUG ((EFI_D_ERROR, "UsbHcAllocateMem: failed to allocate block\n")); return NULL; } diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c index 4e9b534e78..9bf53fd411 100644 --- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c +++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c @@ -26,12 +26,12 @@ UhciDumpQh ( IN UHCI_QH_SW *QhSw ) { - DEBUG ((EFI_D_INFO, "&QhSw @ 0x%p\n", QhSw)); - DEBUG ((EFI_D_INFO, "QhSw.NextQh - 0x%p\n", QhSw->NextQh)); - DEBUG ((EFI_D_INFO, "QhSw.TDs - 0x%p\n", QhSw->TDs)); - DEBUG ((EFI_D_INFO, "QhSw.QhHw:\n")); - DEBUG ((EFI_D_INFO, " Horizon Link - %x\n", QhSw->QhHw.HorizonLink)); - DEBUG ((EFI_D_INFO, " Vertical Link - %x\n\n", QhSw->QhHw.VerticalLink)); + DEBUG ((EFI_D_VERBOSE, "&QhSw @ 0x%p\n", QhSw)); + DEBUG ((EFI_D_VERBOSE, "QhSw.NextQh - 0x%p\n", QhSw->NextQh)); + DEBUG ((EFI_D_VERBOSE, "QhSw.TDs - 0x%p\n", QhSw->TDs)); + DEBUG ((EFI_D_VERBOSE, "QhSw.QhHw:\n")); + DEBUG ((EFI_D_VERBOSE, " Horizon Link - %x\n", QhSw->QhHw.HorizonLink)); + DEBUG ((EFI_D_VERBOSE, " Vertical Link - %x\n\n", QhSw->QhHw.VerticalLink)); } @@ -51,25 +51,25 @@ UhciDumpTds ( CurTdSw = TdSw; while (CurTdSw != NULL) { - DEBUG ((EFI_D_INFO, "TdSw @ 0x%p\n", CurTdSw)); - DEBUG ((EFI_D_INFO, "TdSw.NextTd - 0x%p\n", CurTdSw->NextTd)); - DEBUG ((EFI_D_INFO, "TdSw.DataLen - %d\n", CurTdSw->DataLen)); - DEBUG ((EFI_D_INFO, "TdSw.Data - 0x%p\n", CurTdSw->Data)); - DEBUG ((EFI_D_INFO, "TdHw:\n")); - DEBUG ((EFI_D_INFO, " NextLink - 0x%x\n", CurTdSw->TdHw.NextLink)); - DEBUG ((EFI_D_INFO, " ActualLen - %d\n", CurTdSw->TdHw.ActualLen)); - DEBUG ((EFI_D_INFO, " Status - 0x%x\n", CurTdSw->TdHw.Status)); - DEBUG ((EFI_D_INFO, " IOC - %d\n", CurTdSw->TdHw.IntOnCpl)); - DEBUG ((EFI_D_INFO, " IsIsoCh - %d\n", CurTdSw->TdHw.IsIsoch)); - DEBUG ((EFI_D_INFO, " LowSpeed - %d\n", CurTdSw->TdHw.LowSpeed)); - DEBUG ((EFI_D_INFO, " ErrorCount - %d\n", CurTdSw->TdHw.ErrorCount)); - DEBUG ((EFI_D_INFO, " ShortPacket - %d\n", CurTdSw->TdHw.ShortPacket)); - DEBUG ((EFI_D_INFO, " PidCode - 0x%x\n", CurTdSw->TdHw.PidCode)); - DEBUG ((EFI_D_INFO, " DevAddr - %d\n", CurTdSw->TdHw.DeviceAddr)); - DEBUG ((EFI_D_INFO, " EndPoint - %d\n", CurTdSw->TdHw.EndPoint)); - DEBUG ((EFI_D_INFO, " DataToggle - %d\n", CurTdSw->TdHw.DataToggle)); - DEBUG ((EFI_D_INFO, " MaxPacketLen - %d\n", CurTdSw->TdHw.MaxPacketLen)); - DEBUG ((EFI_D_INFO, " DataBuffer - 0x%x\n\n",CurTdSw->TdHw.DataBuffer)); + DEBUG ((EFI_D_VERBOSE, "TdSw @ 0x%p\n", CurTdSw)); + DEBUG ((EFI_D_VERBOSE, "TdSw.NextTd - 0x%p\n", CurTdSw->NextTd)); + DEBUG ((EFI_D_VERBOSE, "TdSw.DataLen - %d\n", CurTdSw->DataLen)); + DEBUG ((EFI_D_VERBOSE, "TdSw.Data - 0x%p\n", CurTdSw->Data)); + DEBUG ((EFI_D_VERBOSE, "TdHw:\n")); + DEBUG ((EFI_D_VERBOSE, " NextLink - 0x%x\n", CurTdSw->TdHw.NextLink)); + DEBUG ((EFI_D_VERBOSE, " ActualLen - %d\n", CurTdSw->TdHw.ActualLen)); + DEBUG ((EFI_D_VERBOSE, " Status - 0x%x\n", CurTdSw->TdHw.Status)); + DEBUG ((EFI_D_VERBOSE, " IOC - %d\n", CurTdSw->TdHw.IntOnCpl)); + DEBUG ((EFI_D_VERBOSE, " IsIsoCh - %d\n", CurTdSw->TdHw.IsIsoch)); + DEBUG ((EFI_D_VERBOSE, " LowSpeed - %d\n", CurTdSw->TdHw.LowSpeed)); + DEBUG ((EFI_D_VERBOSE, " ErrorCount - %d\n", CurTdSw->TdHw.ErrorCount)); + DEBUG ((EFI_D_VERBOSE, " ShortPacket - %d\n", CurTdSw->TdHw.ShortPacket)); + DEBUG ((EFI_D_VERBOSE, " PidCode - 0x%x\n", CurTdSw->TdHw.PidCode)); + DEBUG ((EFI_D_VERBOSE, " DevAddr - %d\n", CurTdSw->TdHw.DeviceAddr)); + DEBUG ((EFI_D_VERBOSE, " EndPoint - %d\n", CurTdSw->TdHw.EndPoint)); + DEBUG ((EFI_D_VERBOSE, " DataToggle - %d\n", CurTdSw->TdHw.DataToggle)); + DEBUG ((EFI_D_VERBOSE, " MaxPacketLen - %d\n", CurTdSw->TdHw.MaxPacketLen)); + DEBUG ((EFI_D_VERBOSE, " DataBuffer - 0x%x\n\n",CurTdSw->TdHw.DataBuffer)); CurTdSw = CurTdSw->NextTd; } diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c index 1713e3c421..b2401ca40e 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c @@ -847,7 +847,7 @@ UsbBuildDescTable ( Status = UsbBuildLangTable (UsbDev); if (EFI_ERROR (Status)) { - DEBUG (( EFI_D_ERROR, "UsbBuildDescTable: get language ID table %r\n", Status)); + DEBUG (( EFI_D_INFO, "UsbBuildDescTable: get language ID table %r\n", Status)); } return EFI_SUCCESS; diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c index e73accd75d..e385395ed9 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c @@ -921,7 +921,7 @@ UsbEnumeratePort ( // Case4: // Device connected or disconnected normally. // - DEBUG ((EFI_D_ERROR, "UsbEnumeratePort: Device Connect/Discount Normally\n", Port)); + DEBUG ((EFI_D_INFO, "UsbEnumeratePort: Device Connect/Discount Normally\n", Port)); } // diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c index 2f110167d7..b1060f6f5a 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c @@ -159,7 +159,7 @@ FtwAllocate ( } DEBUG ( - (EFI_D_ERROR, + (EFI_D_INFO, "Ftw: Allocate() success, Caller:%g, # %d\n", CallerId, NumberOfWrites) @@ -573,7 +573,7 @@ FtwWrite ( FreePool (SpareBuffer); DEBUG ( - (EFI_D_ERROR, + (EFI_D_INFO, "Ftw: Write() success, (Lba:Offset)=(%lx:0x%x), Length: 0x%x\n", Lba, Offset, diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c index bd8285d00e..2f3ec22f3a 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c @@ -258,7 +258,7 @@ FtwReclaimWorkSpace ( UINT8 *Ptr; EFI_LBA WorkSpaceLbaOffset; - DEBUG ((EFI_D_ERROR, "Ftw: start to reclaim work space\n")); + DEBUG ((EFI_D_INFO, "Ftw: start to reclaim work space\n")); WorkSpaceLbaOffset = FtwDevice->FtwWorkSpaceLba - FtwDevice->FtwWorkBlockLba; @@ -473,7 +473,7 @@ FtwReclaimWorkSpace ( FreePool (SpareBuffer); - DEBUG ((EFI_D_ERROR, "Ftw: reclaim work space successfully\n")); + DEBUG ((EFI_D_INFO, "Ftw: reclaim work space successfully\n")); return EFI_SUCCESS; } -- cgit