From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 BDD2421A04802 for ; Tue, 11 Apr 2017 00:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491895006; x=1523431006; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8xY9M9DSgvwINJVBe6kP8lJjE4NfDxSOG1UPwcTxXSs=; b=ojkC3o9A4FLcQZELJTBbnzlHWLieobAeSjUOo/gcl5T8JfT8BJMOvI1s 4xGilIqxucGFV/5SmbIK8HEnDyJzyA==; Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Apr 2017 00:16:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,184,1488873600"; d="scan'208";a="87617412" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga006.fm.intel.com with ESMTP; 11 Apr 2017 00:16:46 -0700 Received: from fmsmsx151.amr.corp.intel.com (10.18.125.4) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 11 Apr 2017 00:16:46 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX151.amr.corp.intel.com (10.18.125.4) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 11 Apr 2017 00:16:40 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.193]) by shsmsx102.ccr.corp.intel.com ([169.254.2.246]) with mapi id 14.03.0319.002; Tue, 11 Apr 2017 15:16:37 +0800 From: "Tian, Feng" To: "Fan, Jeff" , "edk2-devel@lists.01.org" CC: "Tian, Feng" Thread-Topic: [PATCH 1/3] MdeModulePkg: Error Level is not used correctly Thread-Index: AQHSscJ9yvZ7HxQEI0aW3sIbOiW+g6G/w4PQ Date: Tue, 11 Apr 2017 07:16:36 +0000 Message-ID: <7F1BAD85ADEA444D97065A60D2E97EE5699E3CB4@SHSMSX101.ccr.corp.intel.com> References: <20170410061941.5016-1-jeff.fan@intel.com> <20170410061941.5016-2-jeff.fan@intel.com> In-Reply-To: <20170410061941.5016-2-jeff.fan@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 1/3] MdeModulePkg: Error Level is not used correctly 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: , X-List-Received-Date: Tue, 11 Apr 2017 07:16:47 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Feng Tian -----Original Message----- From: Fan, Jeff=20 Sent: Monday, April 10, 2017 2:20 PM To: edk2-devel@lists.01.org Cc: Tian, Feng Subject: [PATCH 1/3] MdeModulePkg: Error Level is not used correctly Cc: Feng Tian Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan --- .../Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c | 10 +++++-= ---- .../Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c | 4 ++-- MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c | 2 +- MdeModulePkg/Universal/CapsulePei/UefiCapsule.c | 2 +- .../Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c | 4 ++-- MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c | 10 +++++-= ---- .../Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecut= e.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c index 5147e66..4545d6e 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c @@ -103,7 +103,7 @@ S3BootScriptExecutorEntryFunction ( // // X64 S3 Resume // - DEBUG ((EFI_D_ERROR, "Call AsmDisablePaging64() to return to S3 Resu= me in PEI Phase\n")); + DEBUG ((DEBUG_INFO, "Call AsmDisablePaging64() to return to S3=20 + Resume in PEI Phase\n")); PeiS3ResumeState->AsmTransferControl =3D (EFI_PHYSICAL_ADDRESS)(UINT= N)AsmTransferControl32; =20 if ((Facs !=3D NULL) && @@ -128,7 +128,7 @@ S3BootScriptExecutorEntryFunction ( // // IA32 S3 Resume // - DEBUG ((EFI_D_ERROR, "Call SwitchStack() to return to S3 Resume in P= EI Phase\n")); + DEBUG ((DEBUG_INFO, "Call SwitchStack() to return to S3 Resume in=20 + PEI Phase\n")); PeiS3ResumeState->AsmTransferControl =3D (EFI_PHYSICAL_ADDRESS)(UINT= N)AsmTransferControl; =20 SwitchStack ( @@ -160,7 +160,7 @@ S3BootScriptExecutorEntryFunction ( // // X64 long mode waking vector // - DEBUG (( EFI_D_ERROR, "Transfer to 64bit OS waking vector - %x\r\n",= (UINTN)Facs->XFirmwareWakingVector)); + DEBUG ((DEBUG_INFO, "Transfer to 64bit OS waking vector -=20 + %x\r\n", (UINTN)Facs->XFirmwareWakingVector)); if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { SwitchStack ( (SWITCH_STACK_ENTRY_POINT)(UINTN)Facs->XFirmwareWakingVector, @@ -177,7 +177,7 @@ S3BootScriptExecutorEntryFunction ( // // IA32 protected mode waking vector (Page disabled) // - DEBUG (( EFI_D_ERROR, "Transfer to 32bit OS waking vector - %x\r\n",= (UINTN)Facs->XFirmwareWakingVector)); + DEBUG ((DEBUG_INFO, "Transfer to 32bit OS waking vector -=20 + %x\r\n", (UINTN)Facs->XFirmwareWakingVector)); if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { AsmDisablePaging64 ( 0x10, @@ -199,7 +199,7 @@ S3BootScriptExecutorEntryFunction ( // // 16bit Realmode waking vector // - DEBUG (( EFI_D_ERROR, "Transfer to 16bit OS waking vector - %x\r\n", (= UINTN)Facs->FirmwareWakingVector)); + DEBUG ((DEBUG_INFO, "Transfer to 16bit OS waking vector - %x\r\n",=20 + (UINTN)Facs->FirmwareWakingVector)); AsmTransferControl (Facs->FirmwareWakingVector, 0x0); } =20 diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEn= try.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c index d433cf1..70eecf5 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry. +++ c @@ -3,7 +3,7 @@ =20 Set a IDT entry for interrupt vector 3 for debug purpose for x64 platfor= m =20 -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 =20 @@ -234,7 +234,7 @@ PageFaultHandler ( UINTN PTIndex; =20 PFAddress =3D AsmReadCr2 (); - DEBUG ((EFI_D_ERROR, "BootScript - PageFaultHandler: Cr2 - %lx\n", PFAdd= ress)); + DEBUG ((DEBUG_INFO, "BootScript - PageFaultHandler: Cr2 - %lx\n",=20 + PFAddress)); =20 if (PFAddress >=3D mPhyMask + SIZE_4KB) { return FALSE; diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c= b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c index dcfd61c..3c05558 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c @@ -407,7 +407,7 @@ S3AllocatePageTablesBuffer ( } =20 TotalPageTableSize +=3D ExtraPageTablePages; - DEBUG ((EFI_D_ERROR, "AcpiS3ContextSave TotalPageTableSize - 0x%x page= s\n", TotalPageTableSize)); + DEBUG ((DEBUG_INFO, "AcpiS3ContextSave TotalPageTableSize - 0x%x=20 + pages\n", TotalPageTableSize)); =20 // // By architecture only one PageMapLevel4 exists - so lets allocate st= orage for it. diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg= /Universal/CapsulePei/UefiCapsule.c index d61d5ff..cca455e 100644 --- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c +++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c @@ -763,7 +763,7 @@ GetCapsuleDescriptors ( (VOID *) &CapsuleDataPtr64 ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Capsule -- capsule variable not set\n")); + DEBUG ((DEBUG_INFO, "Capsule -- capsule variable not=20 + set\n")); return EFI_NOT_FOUND; } // diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeConte= xt.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c index 7e0dd5c..b0512fd 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c @@ -2,7 +2,7 @@ Create the variable to save the base address of page table and stack for transferring into long mode in IA32 capsule PEI. =20 -Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availab= le under the terms and conditions of the BSD License which accompanies thi= s distribution. The full text of the license may be found at @@ -160,7 +16= 0,7 @@ PrepareContextForCapsulePei ( TotalPagesNum =3D NumberOfPml4EntriesNeeded + 1; } TotalPagesNum +=3D ExtraPageTablePages; - DEBUG ((EFI_D_ERROR, "CapsuleRuntimeDxe X64 TotalPagesNum - 0x%x pages\n= ", TotalPagesNum)); + DEBUG ((DEBUG_INFO, "CapsuleRuntimeDxe X64 TotalPagesNum - 0x%x=20 + pages\n", TotalPagesNum)); =20 LongModeBuffer.PageTableAddress =3D (EFI_PHYSICAL_ADDRESS)(UINTN)Allocat= eReservedMemoryBelow4G (EFI_PAGES_TO_SIZE (TotalPagesNum)); ASSERT (LongModeBuffer.PageTableAddress !=3D 0); diff --git a/MdeModuleP= kg/Universal/LockBox/SmmLockBox/SmmLockBox.c b/MdeModulePkg/Universal/LockB= ox/SmmLockBox/SmmLockBox.c index f1880d4..2dc8815 100644 --- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c +++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c @@ -9,7 +9,7 @@ SmmLockBoxHandler(), SmmLockBoxRestore(), SmmLockBoxUpdate(), SmmLockBox= Save() will receive untrusted input and do basic validation. =20 -Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made availab= le under the terms and conditions @@ -267,7 +267,7 @@ SmmLockBoxHandler ( EFI_SMM_LOCK_BOX_PARAMETER_HEADER *LockBoxParameterHeader; UINTN TempCommBufferSize; =20 - DEBUG ((EFI_D_ERROR, "SmmLockBox SmmLockBoxHandler Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBox SmmLockBoxHandler Enter\n")); =20 // // If input is invalid, stop processing this SMI @@ -294,9 +294,9 @@ Smm= LockBoxHandler ( =20 LockBoxParameterHeader->ReturnStatus =3D (UINT64)-1; =20 - DEBUG ((EFI_D_ERROR, "SmmLockBox LockBoxParameterHeader - %x\n", (UINTN)= LockBoxParameterHeader)); + DEBUG ((DEBUG_INFO, "SmmLockBox LockBoxParameterHeader - %x\n",=20 + (UINTN)LockBoxParameterHeader)); =20 - DEBUG ((EFI_D_ERROR, "SmmLockBox Command - %x\n", (UINTN)LockBoxParamete= rHeader->Command)); + DEBUG ((DEBUG_INFO, "SmmLockBox Command - %x\n",=20 + (UINTN)LockBoxParameterHeader->Command)); =20 switch (LockBoxParameterHeader->Command) { case EFI_SMM_LOCK_BOX_COMMAND_SAVE: @@ -341,7 +341,7 @@ SmmLockBoxHandler ( =20 LockBoxParameterHeader->Command =3D (UINT32)-1; =20 - DEBUG ((EFI_D_ERROR, "SmmLockBox SmmLockBoxHandler Exit\n")); + DEBUG ((DEBUG_INFO, "SmmLockBox SmmLockBoxHandler Exit\n")); =20 return EFI_SUCCESS; } diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideD= xe.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c index eddd75a..76c240b 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c @@ -13,7 +13,7 @@ 4. It save all the mapping info in NV variables which will be consumed by platform override protocol driver to publish the platform override= protocol. =20 -Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availab= le under the terms and conditions of the BSD License which accompanies thi= s distribution. The full text of the license may be found at @@ -1500,7 +1= 500,7 @@ GetDriver ( =20 Status =3D InitOverridesMapping (&mMappingDataBase); if (EFI_ERROR (Status)){ - DEBUG ((DEBUG_ERROR, "The status to Get Platform Driver Override Var= iable is %r\n", Status)); + DEBUG ((DEBUG_INFO, "The status to Get Platform Driver Override=20 + Variable is %r\n", Status)); InitializeListHead (&mMappingDataBase); return EFI_NOT_FOUND; } -- 2.9.3.windows.2