MdeModulePkg: Put USB DEBUGs that occur for bulk timeouts under VERBOSE

With the pending commit of UsbNetworkPkg, it will become common for
UsbBulkTransfer calls to timeout, given that the drivers are called from
MnpSystemPoll every MNP_SYS_POLL_INTERVAL milliseconds: the drivers
check for network packets by calling UsbBulkTransfer with a timeout of
1ms.

Avoid console spam by moving DEBUG messages that occur each time a bulk
transfer request times out from DEBUG_ERROR to DEBUG_VERBOSE, for both
EHCI and XHCI drivers.

Signed-off-by: Rebecca Cran <rebecca@quicinc.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index 0b7270f4e9305136b17425e05581a0f5a9be7f22..e903593b0198f5a48f9d78e62fc5bdcb1ff7ac66 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -848,6 +848,7 @@ EhcBulkTransfer (
   URB          *Urb;\r
   EFI_TPL      OldTpl;\r
   EFI_STATUS   Status;\r
+  UINTN        DebugErrorLevel;\r
 \r
   //\r
   // Validate the parameters\r
@@ -932,7 +933,13 @@ ON_EXIT:
   gBS->RestoreTPL (OldTpl);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "EhcBulkTransfer: error - %r, transfer - %x\n", Status, *TransferResult));\r
+    if (Status == EFI_TIMEOUT) {\r
+      DebugErrorLevel = DEBUG_VERBOSE;\r
+    } else {\r
+      DebugErrorLevel = DEBUG_ERROR;\r
+    }\r
+\r
+    DEBUG ((DebugErrorLevel, "EhcBulkTransfer: error - %r, transfer - %x\n", Status, *TransferResult));\r
   }\r
 \r
   return Status;\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 5da26afbe120e0102b100c3eaba389efed7a6434..6967aabceb7877d8df8c692e009cd651bf1558ce 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
@@ -702,7 +702,7 @@ EhcExecTransfer (
   }\r
 \r
   if (!Finished) {\r
-    DEBUG ((DEBUG_ERROR, "EhcExecTransfer: transfer not finished in %dms\n", (UINT32)TimeOut));\r
+    DEBUG ((DEBUG_VERBOSE, "EhcExecTransfer: transfer not finished in %dms\n", (UINT32)TimeOut));\r
     EhcDumpQh (Urb->Qh, NULL, FALSE);\r
 \r
     Status = EFI_TIMEOUT;\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index c05431ff30ec161b90ede2d1284c133561e4f02e..15fb49f28fa04adb3978f7a93ccbdd37c9f87172 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -1242,6 +1242,7 @@ XhcBulkTransfer (
   UINT8              SlotId;\r
   EFI_STATUS         Status;\r
   EFI_TPL            OldTpl;\r
+  UINTN              DebugErrorLevel;\r
 \r
   //\r
   // Validate the parameters\r
@@ -1304,7 +1305,13 @@ XhcBulkTransfer (
 \r
 ON_EXIT:\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "XhcBulkTransfer: error - %r, transfer - %x\n", Status, *TransferResult));\r
+    if (Status == EFI_TIMEOUT) {\r
+      DebugErrorLevel = DEBUG_VERBOSE;\r
+    } else {\r
+      DebugErrorLevel = DEBUG_ERROR;\r
+    }\r
+\r
+    DEBUG ((DebugErrorLevel, "XhcBulkTransfer: error - %r, transfer - %x\n", Status, *TransferResult));\r
   }\r
 \r
   gBS->RestoreTPL (OldTpl);\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 13b0400e83d7f711bd42d3a017da8f0c7d994f99..13247f7b0dfcc33eeb16bcf286b9736ee1f9340b 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -734,7 +734,7 @@ XhcDequeueTrbFromEndpoint (
   Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   ASSERT (Dci < 32);\r
 \r
-  DEBUG ((DEBUG_INFO, "Stop Slot = %x,Dci = %x\n", SlotId, Dci));\r
+  DEBUG ((DEBUG_VERBOSE, "Stop Slot = %x,Dci = %x\n", SlotId, Dci));\r
 \r
   //\r
   // 1) Send Stop endpoint command to stop xHC from executing of the TDs on the endpoint\r
@@ -3376,7 +3376,7 @@ XhcStopEndpoint (
   EVT_TRB_COMMAND_COMPLETION  *EvtTrb;\r
   CMD_TRB_STOP_ENDPOINT       CmdTrbStopED;\r
 \r
-  DEBUG ((DEBUG_INFO, "XhcStopEndpoint: Slot = 0x%x, Dci = 0x%x\n", SlotId, Dci));\r
+  DEBUG ((DEBUG_VERBOSE, "XhcStopEndpoint: Slot = 0x%x, Dci = 0x%x\n", SlotId, Dci));\r
 \r
   //\r
   // When XhcCheckUrbResult waits for the Stop_Endpoint completion, it also checks\r
@@ -3497,7 +3497,7 @@ XhcSetTrDequeuePointer (
   CMD_SET_TR_DEQ_POINTER      CmdSetTRDeq;\r
   EFI_PHYSICAL_ADDRESS        PhyAddr;\r
 \r
-  DEBUG ((DEBUG_INFO, "XhcSetTrDequeuePointer: Slot = 0x%x, Dci = 0x%x, Urb = 0x%x\n", SlotId, Dci, Urb));\r
+  DEBUG ((DEBUG_VERBOSE, "XhcSetTrDequeuePointer: Slot = 0x%x, Dci = 0x%x, Urb = 0x%x\n", SlotId, Dci, Urb));\r
 \r
   //\r
   // Send stop endpoint command to transit Endpoint from running to stop state\r