From nobody Sat Nov 2 14:24:41 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1490146117732192.78099289222666; Tue, 21 Mar 2017 18:28:37 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id BB09580424; Tue, 21 Mar 2017 18:28:34 -0700 (PDT) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 787D0803D2 for ; Tue, 21 Mar 2017 18:28:32 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP; 21 Mar 2017 18:28:32 -0700 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by orsmga002.jf.intel.com with ESMTP; 21 Mar 2017 18:28:31 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,202,1486454400"; d="scan'208";a="63424770" From: Hao Wu To: edk2-devel@lists.01.org Date: Wed, 22 Mar 2017 09:28:25 +0800 Message-Id: <20170322012826.13016-2-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20170322012826.13016-1-hao.a.wu@intel.com> References: <20170322012826.13016-1-hao.a.wu@intel.com> Subject: [edk2] [PATCH 1/2] MdeModulePkg/UfsPassThruDxe: Replace 'EFI_D_XXX' with 'DEBUG_XXX' X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Feng Tian MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Feng Tian Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c | 26 ++++---- MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c | 70 ++++++++++------= ---- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c b/MdeModuleP= kg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c index 7c831e92d0..63b90de991 100644 --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -784,7 +784,7 @@ UfsPassThruDriverBindingStart ( Private =3D NULL; UfsHcBase =3D 0; =20 - DEBUG ((EFI_D_INFO, "=3D=3DUfsPassThru Start=3D=3D Controller =3D %x\n",= Controller)); + DEBUG ((DEBUG_INFO, "=3D=3DUfsPassThru Start=3D=3D Controller =3D %x\n",= Controller)); =20 Status =3D gBS->OpenProtocol ( Controller, @@ -796,7 +796,7 @@ UfsPassThruDriverBindingStart ( ); =20 if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Open Ufs Host Controller Protocol Error, Status = =3D %r\n", Status)); + DEBUG ((DEBUG_ERROR, "Open Ufs Host Controller Protocol Error, Status = =3D %r\n", Status)); goto Error; } =20 @@ -805,7 +805,7 @@ UfsPassThruDriverBindingStart ( // Status =3D UfsHc->GetUfsHcMmioBar (UfsHc, &UfsHcBase); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Get Ufs Host Controller Mmio Bar Error, Status = =3D %r\n", Status)); + DEBUG ((DEBUG_ERROR, "Get Ufs Host Controller Mmio Bar Error, Status = =3D %r\n", Status)); goto Error; } =20 @@ -814,7 +814,7 @@ UfsPassThruDriverBindingStart ( // Private =3D AllocateCopyPool (sizeof (UFS_PASS_THRU_PRIVATE_DATA), &gUfs= PassThruTemplate); if (Private =3D=3D NULL) { - DEBUG ((EFI_D_ERROR, "Unable to allocate Ufs Pass Thru private data\n"= )); + DEBUG ((DEBUG_ERROR, "Unable to allocate Ufs Pass Thru private data\n"= )); Status =3D EFI_OUT_OF_RESOURCES; goto Error; } @@ -829,7 +829,7 @@ UfsPassThruDriverBindingStart ( // Status =3D UfsControllerInit (Private); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Ufs Host Controller Initialization Error, Status= =3D %r\n", Status)); + DEBUG ((DEBUG_ERROR, "Ufs Host Controller Initialization Error, Status= =3D %r\n", Status)); goto Error; } =20 @@ -840,7 +840,7 @@ UfsPassThruDriverBindingStart ( // Status =3D UfsExecNopCmds (Private); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Ufs Sending NOP IN command Error, Status =3D %r\= n", Status)); + DEBUG ((DEBUG_ERROR, "Ufs Sending NOP IN command Error, Status =3D %r\= n", Status)); goto Error; } =20 @@ -849,7 +849,7 @@ UfsPassThruDriverBindingStart ( // Status =3D UfsSetFlag (Private, UfsFlagDevInit); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Ufs Set fDeviceInit Flag Error, Status =3D %r\n"= , Status)); + DEBUG ((DEBUG_ERROR, "Ufs Set fDeviceInit Flag Error, Status =3D %r\n"= , Status)); goto Error; } =20 @@ -858,7 +858,7 @@ UfsPassThruDriverBindingStart ( // Status =3D UfsRwDeviceDesc (Private, TRUE, UfsConfigDesc, 0, 0, &Config,= sizeof (UFS_CONFIG_DESC)); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Ufs Get Configuration Descriptor Error, Status = =3D %r\n", Status)); + DEBUG ((DEBUG_ERROR, "Ufs Get Configuration Descriptor Error, Status = =3D %r\n", Status)); goto Error; } =20 @@ -869,7 +869,7 @@ UfsPassThruDriverBindingStart ( for (Index =3D 0; Index < 8; Index++) { if (Config.UnitDescConfParams[Index].LunEn !=3D 0) { Private->Luns.BitMask |=3D (BIT0 << Index); - DEBUG ((EFI_D_INFO, "Ufs Lun %d is enabled\n", Index)); + DEBUG ((DEBUG_INFO, "Ufs Lun %d is enabled\n", Index)); } } =20 @@ -884,7 +884,7 @@ UfsPassThruDriverBindingStart ( &Private->TimerEvent ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Ufs Create Async Tasks Event Error, Status =3D %= r\n", Status)); + DEBUG ((DEBUG_ERROR, "Ufs Create Async Tasks Event Error, Status =3D %= r\n", Status)); goto Error; } =20 @@ -894,7 +894,7 @@ UfsPassThruDriverBindingStart ( UFS_HC_ASYNC_TIMER ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Ufs Set Periodic Timer Error, Status =3D %r\n", = Status)); + DEBUG ((DEBUG_ERROR, "Ufs Set Periodic Timer Error, Status =3D %r\n", = Status)); goto Error; } =20 @@ -986,7 +986,7 @@ UfsPassThruDriverBindingStop ( LIST_ENTRY *Entry; LIST_ENTRY *NextEntry; =20 - DEBUG ((EFI_D_INFO, "=3D=3DUfsPassThru Stop=3D=3D Controller Controller = =3D %x\n", Controller)); + DEBUG ((DEBUG_INFO, "=3D=3DUfsPassThru Stop=3D=3D Controller Controller = =3D %x\n", Controller)); =20 Status =3D gBS->OpenProtocol ( Controller, diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c b/MdeModu= lePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c index 3dd8cbfe7a..822554cebb 100644 --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c @@ -157,34 +157,34 @@ DumpUicCmdExecResult ( case 0x00: break; case 0x01: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - INVALID_= MIB_ATTRIBUTE\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - INVALID_= MIB_ATTRIBUTE\n")); break; case 0x02: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - INVALID_= MIB_ATTRIBUTE_VALUE\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - INVALID_= MIB_ATTRIBUTE_VALUE\n")); break; case 0x03: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - READ_ONL= Y_MIB_ATTRIBUTE\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - READ_ONL= Y_MIB_ATTRIBUTE\n")); break; case 0x04: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - WRITE_ON= LY_MIB_ATTRIBUTE\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - WRITE_ON= LY_MIB_ATTRIBUTE\n")); break; case 0x05: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - BAD_INDE= X\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - BAD_INDE= X\n")); break; case 0x06: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - LOCKED_M= IB_ATTRIBUTE\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - LOCKED_M= IB_ATTRIBUTE\n")); break; case 0x07: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - BAD_TEST= _FEATURE_INDEX\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - BAD_TEST= _FEATURE_INDEX\n")); break; case 0x08: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - PEER_COM= MUNICATION_FAILURE\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - PEER_COM= MUNICATION_FAILURE\n")); break;=20 case 0x09: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - BUSY\n")= ); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - BUSY\n")= ); break; case 0x0A: - DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - DME_FAIL= URE\n")); + DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - DME_FAIL= URE\n")); break; =20 default : ASSERT (FALSE); @@ -195,7 +195,7 @@ DumpUicCmdExecResult ( case 0x00: break; case 0x01: - DEBUG ((EFI_D_VERBOSE, "UIC control command fails - FAILURE\n")); + DEBUG ((DEBUG_VERBOSE, "UIC control command fails - FAILURE\n")); break; =20 default : ASSERT (FALSE); @@ -217,34 +217,34 @@ DumpQueryResponseResult ( { switch (Result) { case 0xF6: - DEBUG ((EFI_D_VERBOSE, "Query Response with Parameter Not Readable\n= ")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Parameter Not Readable\n= ")); break; case 0xF7: - DEBUG ((EFI_D_VERBOSE, "Query Response with Parameter Not Writeable\= n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Parameter Not Writeable\= n")); break; case 0xF8: - DEBUG ((EFI_D_VERBOSE, "Query Response with Parameter Already Writte= n\n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Parameter Already Writte= n\n")); break; case 0xF9: - DEBUG ((EFI_D_VERBOSE, "Query Response with Invalid Length\n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Invalid Length\n")); break; case 0xFA: - DEBUG ((EFI_D_VERBOSE, "Query Response with Invalid Value\n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Invalid Value\n")); break; case 0xFB: - DEBUG ((EFI_D_VERBOSE, "Query Response with Invalid Selector\n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Invalid Selector\n")); break; case 0xFC: - DEBUG ((EFI_D_VERBOSE, "Query Response with Invalid Index\n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Invalid Index\n")); break; case 0xFD: - DEBUG ((EFI_D_VERBOSE, "Query Response with Invalid Idn\n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Invalid Idn\n")); break; case 0xFE: - DEBUG ((EFI_D_VERBOSE, "Query Response with Invalid Opcode\n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with Invalid Opcode\n")); break;=20 case 0xFF: - DEBUG ((EFI_D_VERBOSE, "Query Response with General Failure\n")); + DEBUG ((DEBUG_VERBOSE, "Query Response with General Failure\n")); break; default : ASSERT (FALSE); @@ -402,7 +402,7 @@ UfsInitUtpPrdt ( =20 if ((BufferSize & (BIT0 | BIT1)) !=3D 0) { BufferSize &=3D ~(BIT0 | BIT1); - DEBUG ((EFI_D_WARN, "UfsInitUtpPrdt: The BufferSize [%d] is not dword-= aligned!\n", BufferSize)); + DEBUG ((DEBUG_WARN, "UfsInitUtpPrdt: The BufferSize [%d] is not dword-= aligned!\n", BufferSize)); } =20 if (BufferSize =3D=3D 0) { @@ -1559,7 +1559,7 @@ UfsExecScsiCmds ( // Packet->TargetStatus =3D Response->Status; if (Response->Response !=3D 0) { - DEBUG ((EFI_D_ERROR, "UfsExecScsiCmds() fails with Target Failure\n")); + DEBUG ((DEBUG_ERROR, "UfsExecScsiCmds() fails with Target Failure\n")); Status =3D EFI_DEVICE_ERROR; goto Exit; } @@ -1717,7 +1717,7 @@ UfsExecUicCommands ( return EFI_NOT_FOUND; } =20 - DEBUG ((EFI_D_INFO, "UfsPassThruDxe: found a attached UFS device\n")); + DEBUG ((DEBUG_INFO, "UfsPassThruDxe: found a attached UFS device\n")); =20 return EFI_SUCCESS; } @@ -2084,29 +2084,29 @@ UfsControllerInit ( =20 Status =3D UfsEnableHostController (Private); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "UfsControllerInit: Enable Host Controller Fails,= Status =3D %r\n", Status)); + DEBUG ((DEBUG_ERROR, "UfsControllerInit: Enable Host Controller Fails,= Status =3D %r\n", Status)); return Status; } =20 Status =3D UfsDeviceDetection (Private); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "UfsControllerInit: Device Detection Fails, Statu= s =3D %r\n", Status)); + DEBUG ((DEBUG_ERROR, "UfsControllerInit: Device Detection Fails, Statu= s =3D %r\n", Status)); return Status; } =20 Status =3D UfsInitTaskManagementRequestList (Private); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "UfsControllerInit: Task management list initiali= zation Fails, Status =3D %r\n", Status)); + DEBUG ((DEBUG_ERROR, "UfsControllerInit: Task management list initiali= zation Fails, Status =3D %r\n", Status)); return Status; } =20 Status =3D UfsInitTransferRequestList (Private); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "UfsControllerInit: Transfer list initialization = Fails, Status =3D %r\n", Status)); + DEBUG ((DEBUG_ERROR, "UfsControllerInit: Transfer list initialization = Fails, Status =3D %r\n", Status)); return Status; } =20 - DEBUG ((EFI_D_INFO, "UfsControllerInit Finished\n")); + DEBUG ((DEBUG_INFO, "UfsControllerInit Finished\n")); return EFI_SUCCESS; } =20 @@ -2167,7 +2167,7 @@ UfsControllerStop ( return EFI_DEVICE_ERROR; } =20 - DEBUG ((EFI_D_INFO, "UfsController is stopped\n")); + DEBUG ((DEBUG_INFO, "UfsController is stopped\n")); =20 return EFI_SUCCESS; } @@ -2274,7 +2274,7 @@ ProcessAsyncTaskList ( // case. // Packet->HostAdapterStatus =3D EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PHA= SE_ERROR; - DEBUG ((EFI_D_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p Uf= sMmioRead32() Error.\n", TransReq->CallerEvent)); + DEBUG ((DEBUG_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p Uf= sMmioRead32() Error.\n", TransReq->CallerEvent)); SignalCallerEvent (Private, TransReq); continue; } @@ -2291,7 +2291,7 @@ ProcessAsyncTaskList ( // Timeout occurs. // Packet->HostAdapterStatus =3D EFI_EXT_SCSI_STATUS_HOST_ADAPTER_T= IMEOUT_COMMAND; - DEBUG ((EFI_D_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p = EFI_TIMEOUT.\n", TransReq->CallerEvent)); + DEBUG ((DEBUG_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p = EFI_TIMEOUT.\n", TransReq->CallerEvent)); SignalCallerEvent (Private, TransReq); continue; } @@ -2316,7 +2316,7 @@ ProcessAsyncTaskList ( // Packet->TargetStatus =3D Response->Status; if (Response->Response !=3D 0) { - DEBUG ((EFI_D_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p = Target Failure.\n", TransReq->CallerEvent)); + DEBUG ((DEBUG_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p = Target Failure.\n", TransReq->CallerEvent)); SignalCallerEvent (Private, TransReq); continue; } @@ -2336,12 +2336,12 @@ ProcessAsyncTaskList ( } } } else { - DEBUG ((EFI_D_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p = Target Device Error.\n", TransReq->CallerEvent)); + DEBUG ((DEBUG_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p = Target Device Error.\n", TransReq->CallerEvent)); SignalCallerEvent (Private, TransReq); continue; } =20 - DEBUG ((EFI_D_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p Su= ccess.\n", TransReq->CallerEvent)); + DEBUG ((DEBUG_VERBOSE, "ProcessAsyncTaskList(): Signal Event %p Su= ccess.\n", TransReq->CallerEvent)); SignalCallerEvent (Private, TransReq); } } --=20 2.12.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel