Roll back the DEBUG mask change which cause SerialIo read_conf test item failure.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7477 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Universal/Network/SnpDxe/Callback.c

@@ -61,7 +61,7 @@ SnpUndi32CallbackV2p30 (
   // EFI uses identical mapping
   //
   if ((CpuAddr == 0) || (DeviceAddrPtr == 0)) {
-    DEBUG ((EFI_D_INFO | EFI_D_NET, "\nv2p: Null virtual address or physical pointer.\n"));
+    DEBUG ((EFI_D_NET, "\nv2p: Null virtual address or physical pointer.\n"));
     return ;
   }
 

MdeModulePkg/Universal/Network/SnpDxe/Get_status.c

@@ -72,13 +72,13 @@ PxeGetStatus (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.get_status()  "));
+  DEBUG ((EFI_D_NET, "\nSnp->undi.get_status()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
   if (Snp->Cdb.StatCode != EFI_SUCCESS) {
     DEBUG (
-      (EFI_D_ERROR | EFI_D_NET,
+      (EFI_D_NET,
       "\nSnp->undi.get_status()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatFlags)

MdeModulePkg/Universal/Network/SnpDxe/Initialize.c

@@ -95,7 +95,7 @@ PxeInit (
   Snp->Cdb.IFnum      = Snp->IfNum;
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;
 
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.initialize()  "));
+  DEBUG ((EFI_D_NET, "\nSnp->undi.initialize()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
@@ -105,7 +105,7 @@ PxeInit (
     Status          = EFI_SUCCESS;
   } else {
     DEBUG (
-      (EFI_D_ERROR,
+      (EFI_D_WARN,
       "\nSnp->undi.initialize()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatCode)

MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c

@@ -61,7 +61,7 @@ PxeIp2Mac (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.mcast_ip_to_mac()  "));
+  DEBUG ((EFI_D_NET, "\nSnp->undi.mcast_ip_to_mac()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
@@ -74,7 +74,7 @@ PxeIp2Mac (
 
   case PXE_STATCODE_UNSUPPORTED:
     DEBUG (
-      (EFI_D_ERROR | EFI_D_NET,
+      (EFI_D_NET,
       "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatCode)
@@ -87,7 +87,7 @@ PxeIp2Mac (
     // to caller.
     //
     DEBUG (
-      (EFI_D_ERROR | EFI_D_NET,
+      (EFI_D_NET,
       "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatCode)

MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c

@@ -59,7 +59,7 @@ PxeNvDataRead (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.nvdata ()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.nvdata ()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
@@ -69,7 +69,7 @@ PxeNvDataRead (
 
   case PXE_STATCODE_UNSUPPORTED:
     DEBUG (
-      (EFI_D_ERROR | EFI_D_NET,
+      (EFI_D_NET,
       "\nsnp->undi.nvdata()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatCode)
@@ -79,7 +79,7 @@ PxeNvDataRead (
 
   default:
     DEBUG (
-      (EFI_D_ERROR | EFI_D_NET,
+      (EFI_D_NET,
       "\nsnp->undi.nvdata()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatCode)

MdeModulePkg/Universal/Network/SnpDxe/Receive.c

@@ -102,7 +102,7 @@ PxeReceive (
 
   default:
     DEBUG (
-      (EFI_D_NET,
+      (EFI_D_ERROR,
       "\nsnp->undi.receive()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatCode)

MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c

@@ -79,7 +79,7 @@ PxeRecvFilterEnable (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.receive_filters()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
@@ -167,7 +167,7 @@ PxeRecvFilterDisable (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.receive_filters()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
@@ -176,7 +176,7 @@ PxeRecvFilterDisable (
     // UNDI command failed.  Return UNDI status to caller.
     //
     DEBUG (
-      (EFI_D_ERROR | EFI_D_NET,
+      (EFI_D_ERROR,
       "\nsnp->undi.receive_filters()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatCode)
@@ -219,7 +219,7 @@ PxeRecvFilterRead (
   Snp->Cdb.IFnum      = Snp->IfNum;
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;
 
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.receive_filters()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 

MdeModulePkg/Universal/Network/SnpDxe/Reset.c

@@ -43,13 +43,13 @@ PxeReset (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.reset()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.reset()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
     DEBUG (
-      (EFI_D_ERROR | EFI_D_NET,
+      (EFI_D_WARN,
       "\nsnp->undi32.reset()  %xh:%xh\n",
       Snp->Cdb.StatFlags,
       Snp->Cdb.StatCode)

MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c

@@ -43,7 +43,7 @@ PxeShutdown (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.shutdown()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.shutdown()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
@@ -51,7 +51,7 @@ PxeShutdown (
     //
     // UNDI could not be shutdown. Return UNDI error.
     //
-    DEBUG ((EFI_D_ERROR, "\nsnp->undi.shutdown()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
+    DEBUG ((EFI_D_WARN, "\nsnp->undi.shutdown()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
 
     return EFI_DEVICE_ERROR;
   }

MdeModulePkg/Universal/Network/SnpDxe/Snp.c

@@ -155,7 +155,7 @@ SimpleNetworkDriverSupported (
   // Check to see if !PXE structure is valid. Paragraph alignment of !PXE structure is required.
   //
   if (NiiProtocol->ID & 0x0F) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\n!PXE structure is not paragraph aligned.\n"));
+    DEBUG ((EFI_D_NET, "\n!PXE structure is not paragraph aligned.\n"));
     Status = EFI_UNSUPPORTED;
     goto Done;
   }
@@ -166,25 +166,25 @@ SimpleNetworkDriverSupported (
   //  Verify !PXE revisions.
   //
   if (Pxe->hw.Signature != PXE_ROMID_SIGNATURE) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\n!PXE signature is not valid.\n"));
+    DEBUG ((EFI_D_NET, "\n!PXE signature is not valid.\n"));
     Status = EFI_UNSUPPORTED;
     goto Done;
   }
 
   if (Pxe->hw.Rev < PXE_ROMID_REV) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\n!PXE.Rev is not supported.\n"));
+    DEBUG ((EFI_D_NET, "\n!PXE.Rev is not supported.\n"));
     Status = EFI_UNSUPPORTED;
     goto Done;
   }
 
   if (Pxe->hw.MajorVer < PXE_ROMID_MAJORVER) {
 
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\n!PXE.MajorVer is not supported.\n"));
+    DEBUG ((EFI_D_NET, "\n!PXE.MajorVer is not supported.\n"));
     Status = EFI_UNSUPPORTED;
     goto Done;
 
   } else if (Pxe->hw.MajorVer == PXE_ROMID_MAJORVER && Pxe->hw.MinorVer < PXE_ROMID_MINORVER) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\n!PXE.MinorVer is not supported."));
+    DEBUG ((EFI_D_NET, "\n!PXE.MinorVer is not supported."));
     Status = EFI_UNSUPPORTED;
     goto Done;
   }
@@ -193,13 +193,13 @@ SimpleNetworkDriverSupported (
   //
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_HW_UNDI) == 0) {
     if (Pxe->sw.EntryPoint < Pxe->sw.Len) {
-      DEBUG ((EFI_D_ERROR | EFI_D_NET, "\n!PXE S/W entry point is not valid."));
+      DEBUG ((EFI_D_NET, "\n!PXE S/W entry point is not valid."));
       Status = EFI_UNSUPPORTED;
       goto Done;
     }
 
     if (Pxe->sw.BusCnt == 0) {
-      DEBUG ((EFI_D_ERROR | EFI_D_NET, "\n!PXE.BusCnt is zero."));
+      DEBUG ((EFI_D_NET, "\n!PXE.BusCnt is zero."));
       Status = EFI_UNSUPPORTED;
       goto Done;
     }
@@ -258,7 +258,7 @@ SimpleNetworkDriverStart (
   UINT8                                     BarIndex;
   PXE_STATFLAGS                             InitStatFlags;
 
-  DEBUG ((EFI_D_INFO, "\nSnpNotifyNetworkInterfaceIdentifier()  "));
+  DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));
 
   Status = gBS->OpenProtocol (
                   Controller,
@@ -320,7 +320,7 @@ SimpleNetworkDriverStart (
   Pxe = (PXE_UNDI *) (UINTN) (Nii->ID);
 
   if (Calc8BitCksum (Pxe, Pxe->hw.Len) != 0) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\n!PXE checksum is not correct.\n"));
+    DEBUG ((EFI_D_NET, "\n!PXE checksum is not correct.\n"));
     goto NiiError;
   }
 
@@ -335,7 +335,7 @@ SimpleNetworkDriverStart (
     //  broadcast support or we cannot do DHCP!
     //
   } else {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\nUNDI does not have promiscuous or broadcast support."));
+    DEBUG ((EFI_D_NET, "\nUNDI does not have promiscuous or broadcast support."));
     goto NiiError;
   }
   //
@@ -352,7 +352,7 @@ SimpleNetworkDriverStart (
                         );
 
   if (Status != EFI_SUCCESS) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\nCould not allocate SNP_DRIVER structure.\n"));
+    DEBUG ((EFI_D_NET, "\nCould not allocate SNP_DRIVER structure.\n"));
     goto NiiError;
   }
 
@@ -426,7 +426,7 @@ SimpleNetworkDriverStart (
                         );
 
   if (Status != EFI_SUCCESS) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\nCould not allocate CPB and DB structures.\n"));
+    DEBUG ((EFI_D_NET, "\nCould not allocate CPB and DB structures.\n"));
     goto Error_DeleteSNP;
   }
 
@@ -468,7 +468,7 @@ SimpleNetworkDriverStart (
   Snp->Cdb.IFnum      = Snp->IfNum;
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;
 
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.get_init_info()  "));
+  DEBUG ((EFI_D_NET, "\nSnp->undi.get_init_info()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
@@ -478,7 +478,7 @@ SimpleNetworkDriverStart (
   InitStatFlags = Snp->Cdb.StatFlags;
 
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\nSnp->undi.init_info()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
+    DEBUG ((EFI_D_NET, "\nSnp->undi.init_info()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
     PxeStop (Snp);
     goto Error_DeleteSNP;
   }
@@ -498,12 +498,12 @@ SimpleNetworkDriverStart (
   Snp->Cdb.IFnum      = Snp->IfNum;
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;
 
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.get_config_info()  "));
+  DEBUG ((EFI_D_NET, "\nSnp->undi.get_config_info()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\nSnp->undi.config_info()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
+    DEBUG ((EFI_D_NET, "\nSnp->undi.config_info()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
     PxeStop (Snp);
     goto Error_DeleteSNP;
   }

MdeModulePkg/Universal/Network/SnpDxe/Start.c

@@ -72,7 +72,7 @@ PxeStart (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.start()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.start()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 

MdeModulePkg/Universal/Network/SnpDxe/Station_address.c

@@ -50,7 +50,7 @@ PxeGetStnAddr (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.station_addr()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.station_addr()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
@@ -139,7 +139,7 @@ PxeSetStnAddr (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.station_addr()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.station_addr()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 

MdeModulePkg/Universal/Network/SnpDxe/Statistics.c

@@ -139,7 +139,7 @@ SnpUndi32Statistics (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.statistics()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.statistics()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 

MdeModulePkg/Universal/Network/SnpDxe/Stop.c

@@ -43,13 +43,13 @@ PxeStop (
   //
   // Issue UNDI command
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.stop()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.stop()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
     DEBUG (
-      (EFI_D_ERROR,
+      (EFI_D_WARN,
       "\nsnp->undi.stop()  %xh:%xh\n",
       Snp->Cdb.StatCode,
       Snp->Cdb.StatFlags)

MdeModulePkg/Universal/Network/SnpDxe/Transmit.c

@@ -101,7 +101,7 @@ PxeFillHeader (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.fill_header()  "));
+  DEBUG ((EFI_D_NET, "\nSnp->undi.fill_header()  "));
 
   (*Snp->IssueUndi32Command) ((UINT64) (UINTN) &Snp->Cdb);
 
@@ -177,16 +177,16 @@ PxeTransmit (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.transmit()  "));
+  DEBUG ((EFI_D_NET, "\nSnp->undi.transmit()  "));
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->Cdb.OpCode  == %x", Snp->Cdb.OpCode));
+  DEBUG ((EFI_D_NET, "\nSnp->Cdb.OpCode  == %x", Snp->Cdb.OpCode));
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->Cdb.CPBaddr == %LX", Snp->Cdb.CPBaddr));
+  DEBUG ((EFI_D_NET, "\nSnp->Cdb.CPBaddr == %LX", Snp->Cdb.CPBaddr));
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->Cdb.DBaddr  == %LX", Snp->Cdb.DBaddr));
+  DEBUG ((EFI_D_NET, "\nSnp->Cdb.DBaddr  == %LX", Snp->Cdb.DBaddr));
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nCpb->FrameAddr   == %LX\n", Cpb->FrameAddr));
+  DEBUG ((EFI_D_NET, "\nCpb->FrameAddr   == %LX\n", Cpb->FrameAddr));
 
   (*Snp->IssueUndi32Command) ((UINT64) (UINTN) &Snp->Cdb);
 
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nexit Snp->undi.transmit()  "));
+  DEBUG ((EFI_D_NET, "\nexit Snp->undi.transmit()  "));
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->Cdb.StatCode == %r", Snp->Cdb.StatCode));
+  DEBUG ((EFI_D_NET, "\nSnp->Cdb.StatCode == %r", Snp->Cdb.StatCode));
 
   //
   // we will unmap the buffers in get_status call, not here