From nobody Sat May 18 23:44:07 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 1491805193803812.0900765790446; Sun, 9 Apr 2017 23:19:53 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1EE5421A04802; Sun, 9 Apr 2017 23:19:50 -0700 (PDT) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 B62C521A04802 for ; Sun, 9 Apr 2017 23:19:48 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2017 23:19:48 -0700 Received: from jfan12-desk.ccr.corp.intel.com ([10.239.158.57]) by orsmga004.jf.intel.com with ESMTP; 09 Apr 2017 23:19:47 -0700 X-Original-To: edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491805188; x=1523341188; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=LlYG/JJqobtvHtbjkjInvNMjtZTHKSHpfjY9prqn048=; b=ZplewKUbv2jOjCteDP/VV/c+XlM3NzVO97aqXqk/Qgo7ziRqw6kEsxKj Rbncdy2xjZDcWGsh0HQ7PzdYV/wzyg==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,181,1488873600"; d="scan'208";a="75678116" From: Jeff Fan To: edk2-devel@lists.01.org Date: Mon, 10 Apr 2017 14:19:39 +0800 Message-Id: <20170410061941.5016-2-jeff.fan@intel.com> X-Mailer: git-send-email 2.9.3.windows.2 In-Reply-To: <20170410061941.5016-1-jeff.fan@intel.com> References: <20170410061941.5016-1-jeff.fan@intel.com> Subject: [edk2] [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: , Cc: 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: Jeff Fan Reviewed-by: Feng Tian --- .../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 Resum= e 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 PE= I 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 - %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 - %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", (UI= NTN)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 platform =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", PFAddr= ess)); =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 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 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 available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -160,7 +160,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 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/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c b/MdeMo= dulePkg/Universal/LockBox/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 available 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 @@ SmmLockBoxHandler ( =20 LockBoxParameterHeader->ReturnStatus =3D (UINT64)-1; =20 - DEBUG ((EFI_D_ERROR, "SmmLockBox LockBoxParameterHeader - %x\n", (UINTN)= LockBoxParameterHeader)); + DEBUG ((DEBUG_INFO, "SmmLockBox LockBoxParameterHeader - %x\n", (UINTN)L= ockBoxParameterHeader)); =20 - DEBUG ((EFI_D_ERROR, "SmmLockBox Command - %x\n", (UINTN)LockBoxParamete= rHeader->Command)); + DEBUG ((DEBUG_INFO, "SmmLockBox Command - %x\n", (UINTN)LockBoxParameter= Header->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 available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -1500,7 +1500,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 Vari= able is %r\n", Status)); InitializeListHead (&mMappingDataBase); return EFI_NOT_FOUND; } --=20 2.9.3.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 18 23:44:07 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 1491805195892898.6084394135054; Sun, 9 Apr 2017 23:19:55 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5832920080EE0; Sun, 9 Apr 2017 23:19:51 -0700 (PDT) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 B2AED21A04802 for ; Sun, 9 Apr 2017 23:19:49 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2017 23:19:49 -0700 Received: from jfan12-desk.ccr.corp.intel.com ([10.239.158.57]) by orsmga004.jf.intel.com with ESMTP; 09 Apr 2017 23:19:48 -0700 X-Original-To: edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491805189; x=1523341189; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=xRoMp+Yd4ihD/WXO06HTMZrC+hknOu0m0GT3ZDj6TJ8=; b=d+48/t2RSeguH0bonCER4o60qhaDWrFqMzxugEQ40GhcFryUy5C6+9Y8 B8wWOlKHrWWBM0svunIBN9UXUQauVg==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,181,1488873600"; d="scan'208";a="75678122" From: Jeff Fan To: edk2-devel@lists.01.org Date: Mon, 10 Apr 2017 14:19:40 +0800 Message-Id: <20170410061941.5016-3-jeff.fan@intel.com> X-Mailer: git-send-email 2.9.3.windows.2 In-Reply-To: <20170410061941.5016-1-jeff.fan@intel.com> References: <20170410061941.5016-1-jeff.fan@intel.com> Subject: [edk2] [PATCH 2/3] SecurityPkg: 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: , Cc: Jiewen Yao 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: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan Reviewed-by: jiewen.yao@intel.com --- SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.c | 4 ++-- SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c | 4 ++-- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 2 +- SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 4 ++-- SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c | 4 ++-- SecurityPkg/Tcg/TrEEPei/TrEEPei.c | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe= .c b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.c index 1e8c354..eedc439 100644 --- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.c +++ b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.c @@ -3,7 +3,7 @@ via PcdTpmInstanceGuid. Platform need make choice that which one will be= final one. At most one TPM2 instance can be finally registered, and other will retu= rn unsupported. =20 -Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2013 - 2017, 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 @@ -89,7 +89,7 @@ Tpm2RegisterTpm2DeviceLib ( ) { if (!CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &Tpm2Device->ProviderGu= id)){ - DEBUG ((EFI_D_ERROR, "WARNING: Tpm2RegisterTpm2DeviceLib - does not su= pport %g registration\n", &Tpm2Device->ProviderGuid)); + DEBUG ((DEBUG_WARN, "WARNING: Tpm2RegisterTpm2DeviceLib - does not sup= port %g registration\n", &Tpm2Device->ProviderGuid)); return EFI_UNSUPPORTED; } =20 diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei= .c b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c index 0211399..7470fe3 100644 --- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c +++ b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c @@ -3,7 +3,7 @@ via PcdTpmInstanceGuid. Platform need make choice that which one will be= final one. At most one TPM2 instance can be finally registered, and other will retu= rn unsupported. =20 -Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2013 - 2017, 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 @@ -120,7 +120,7 @@ Tpm2RegisterTpm2DeviceLib ( TPM2_DEVICE_INTERFACE *Tpm2DeviceInterface; =20 if (!CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &Tpm2Device->ProviderGu= id)){ - DEBUG ((EFI_D_ERROR, "WARNING: Tpm2RegisterTpm2DeviceLib - does not su= pport %g registration\n", &Tpm2Device->ProviderGuid)); + DEBUG ((DEBUG_WARN, "WARNING: Tpm2RegisterTpm2DeviceLib - does not sup= port %g registration\n", &Tpm2Device->ProviderGuid)); return EFI_UNSUPPORTED; } =20 diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tc= g2Dxe.c index 53de666..c2c52e3 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c @@ -2466,7 +2466,7 @@ DriverEntry ( =20 if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNo= neGuid) || CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTp= m12Guid)){ - DEBUG ((EFI_D_ERROR, "No TPM2 instance required!\n")); + DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); return EFI_UNSUPPORTED; } =20 diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tc= g2Pei.c index 209d843..69adad4 100644 --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c @@ -1,7 +1,7 @@ /** @file Initialize TPM2 device and measure FVs before handing off control to DXE. =20 -Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials=20 are licensed and made available under the terms and conditions of the BSD = License=20 which accompanies this distribution. The full text of the license may be = found at=20 @@ -736,7 +736,7 @@ PeimEntryMA ( =20 if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNo= neGuid) || CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTp= m12Guid)){ - DEBUG ((EFI_D_ERROR, "No TPM2 instance required!\n")); + DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); return EFI_UNSUPPORTED; } =20 diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c b/SecurityPkg/Tcg/TrEEDxe/Tr= EEDxe.c index fb69fa1..95e9d74 100644 --- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c +++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c @@ -1,7 +1,7 @@ /** @file This module implements TrEE Protocol. =20 -Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials=20 are licensed and made available under the terms and conditions of the BSD = License=20 which accompanies this distribution. The full text of the license may be = found at=20 @@ -1733,7 +1733,7 @@ DriverEntry ( =20 if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNo= neGuid) || CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTp= m12Guid)){ - DEBUG ((EFI_D_ERROR, "No TPM2 instance required!\n")); + DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); return EFI_UNSUPPORTED; } =20 diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c b/SecurityPkg/Tcg/TrEEPei/Tr= EEPei.c index 8d8639d..b561245 100644 --- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c +++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c @@ -1,7 +1,7 @@ /** @file Initialize TPM2 device and measure FVs before handing off control to DXE. =20 -Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials=20 are licensed and made available under the terms and conditions of the BSD = License=20 which accompanies this distribution. The full text of the license may be = found at=20 @@ -597,7 +597,7 @@ PeimEntryMA ( =20 if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNo= neGuid) || CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTp= m12Guid)){ - DEBUG ((EFI_D_ERROR, "No TPM2 instance required!\n")); + DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); return EFI_UNSUPPORTED; } =20 --=20 2.9.3.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 18 23:44:07 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 1491805198144366.5224595605033; Sun, 9 Apr 2017 23:19:58 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 91F6B219392F4; Sun, 9 Apr 2017 23:19:52 -0700 (PDT) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 D26AF21DFA7BD for ; Sun, 9 Apr 2017 23:19:50 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2017 23:19:50 -0700 Received: from jfan12-desk.ccr.corp.intel.com ([10.239.158.57]) by orsmga004.jf.intel.com with ESMTP; 09 Apr 2017 23:19:49 -0700 X-Original-To: edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491805190; x=1523341190; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=sEfs5TwVWO7quZLi2vNHsssYty1djG2fgR/jlpEf1q4=; b=mKoQZBs0ChZAvN8ANy8ujuMImmfR/NlkiR7dJqoA0vGPZ+gjqq1xc41w a2fZBa7YZMavOYMeTZmMceCSEOufEA==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,181,1488873600"; d="scan'208";a="75678130" From: Jeff Fan To: edk2-devel@lists.01.org Date: Mon, 10 Apr 2017 14:19:41 +0800 Message-Id: <20170410061941.5016-4-jeff.fan@intel.com> X-Mailer: git-send-email 2.9.3.windows.2 In-Reply-To: <20170410061941.5016-1-jeff.fan@intel.com> References: <20170410061941.5016-1-jeff.fan@intel.com> Subject: [edk2] [PATCH 3/3] UefiCpuPkg: 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: , Cc: Feng Tian , Jiewen Yao 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 Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan Reviewed-by: Feng Tian --- UefiCpuPkg/CpuDxe/CpuPageTable.c | 2 +- UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 68 +++++++++++--------= ---- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTa= ble.c index ab664b4..2c61e75 100644 --- a/UefiCpuPkg/CpuDxe/CpuPageTable.c +++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c @@ -634,10 +634,10 @@ ConvertMemoryPageAttributes ( switch(CurrentPagingContext.MachineType) { case IMAGE_FILE_MACHINE_I386: if (CurrentPagingContext.ContextData.Ia32.PageTableBase =3D=3D 0) { - DEBUG ((DEBUG_ERROR, "PageTable is 0!\n")); if (Attributes =3D=3D 0) { return EFI_SUCCESS; } else { + DEBUG ((DEBUG_ERROR, "PageTable is 0!\n")); return EFI_UNSUPPORTED; } } diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg= /Universal/Acpi/S3Resume2Pei/S3Resume.c index a9d1042..e53ed21 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c @@ -4,7 +4,7 @@ This module will execute the boot script saved during last boot and afte= r that, control is passed to OS waking up handler. =20 - Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 This program and the accompanying materials @@ -531,7 +531,7 @@ S3ResumeBootOs ( // // 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 - %x\r\n", (= UINTN)Facs->XFirmwareWakingVector)); if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { AsmEnablePaging64 ( 0x38, @@ -557,7 +557,7 @@ S3ResumeBootOs ( // // 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 - %x\r\n", (= UINTN)Facs->XFirmwareWakingVector)); SwitchStack ( (SWITCH_STACK_ENTRY_POINT) (UINTN) Facs->XFirmwareWakingVector, NULL, @@ -569,7 +569,7 @@ S3ResumeBootOs ( // // 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", (UI= NTN)Facs->FirmwareWakingVector)); AsmTransferControl (Facs->FirmwareWakingVector, 0x0); } =20 @@ -630,7 +630,7 @@ RestoreS3PageTables ( // // The assumption is : whole page table is allocated in CONTINUOUS mem= ory and CR3 points to TOP page. // - DEBUG ((EFI_D_ERROR, "S3NvsPageTableAddress - %x (%x)\n", (UINTN)S3Nvs= PageTableAddress, (UINTN)Build4GPageTableOnly)); + DEBUG ((DEBUG_INFO, "S3NvsPageTableAddress - %x (%x)\n", (UINTN)S3NvsP= ageTableAddress, (UINTN)Build4GPageTableOnly)); =20 // // By architecture only one PageMapLevel4 exists - so lets allocate st= orage for it. @@ -783,7 +783,7 @@ S3ResumeExecuteBootScript ( PEI_S3_RESUME_STATE *PeiS3ResumeState; BOOLEAN InterruptStatus; =20 - DEBUG ((EFI_D_ERROR, "S3ResumeExecuteBootScript()\n")); + DEBUG ((DEBUG_INFO, "S3ResumeExecuteBootScript()\n")); =20 // // Attempt to use content from SMRAM first @@ -810,13 +810,13 @@ S3ResumeExecuteBootScript ( (VOID **) &SmmAccess ); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Close all SMRAM regions before executing boot = script\n")); + DEBUG ((DEBUG_INFO, "Close all SMRAM regions before executing boot s= cript\n")); =20 for (Index =3D 0, Status =3D EFI_SUCCESS; !EFI_ERROR (Status); Index= ++) { Status =3D SmmAccess->Close ((EFI_PEI_SERVICES **)GetPeiServicesTa= blePointer (), SmmAccess, Index); } =20 - DEBUG ((EFI_D_ERROR, "Lock all SMRAM regions before executing boot s= cript\n")); + DEBUG ((DEBUG_INFO, "Lock all SMRAM regions before executing boot sc= ript\n")); =20 for (Index =3D 0, Status =3D EFI_SUCCESS; !EFI_ERROR (Status); Index= ++) { Status =3D SmmAccess->Lock ((EFI_PEI_SERVICES **)GetPeiServicesTab= lePointer (), SmmAccess, Index); @@ -881,7 +881,7 @@ S3ResumeExecuteBootScript ( ); ASSERT (FALSE); } - DEBUG (( EFI_D_ERROR, "PeiS3ResumeState - %x\r\n", PeiS3ResumeState)); + DEBUG ((DEBUG_INFO, "PeiS3ResumeState - %x\r\n", PeiS3ResumeState)); PeiS3ResumeState->ReturnCs =3D 0x10; PeiS3ResumeState->ReturnEntryPoint =3D (EFI_PHYSICAL_ADDRESS)(UINTN)S3= ResumeBootOs; PeiS3ResumeState->ReturnStackPointer =3D (EFI_PHYSICAL_ADDRESS)STACK_ALI= GN_DOWN (&Status); @@ -901,7 +901,7 @@ S3ResumeExecuteBootScript ( // // X64 S3 Resume // - DEBUG (( EFI_D_ERROR, "Enable X64 and transfer control to Standalone B= oot Script Executor\r\n")); + DEBUG ((DEBUG_INFO, "Enable X64 and transfer control to Standalone Boo= t Script Executor\r\n")); =20 // // Switch to long mode to complete resume. @@ -917,7 +917,7 @@ S3ResumeExecuteBootScript ( // // IA32 S3 Resume // - DEBUG (( EFI_D_ERROR, "transfer control to Standalone Boot Script Exec= utor\r\n")); + DEBUG ((DEBUG_INFO, "transfer control to Standalone Boot Script Execut= or\r\n")); SwitchStack ( (SWITCH_STACK_ENTRY_POINT) (UINTN) EfiBootScriptExecutorVariable->Bo= otScriptExecutorEntrypoint, (VOID *)AcpiS3Context, @@ -985,7 +985,7 @@ S3RestoreConfig2 ( TempAcpiS3Context =3D 0; TempEfiBootScriptExecutorVariable =3D 0; =20 - DEBUG ((EFI_D_ERROR, "Enter S3 PEIM\r\n")); + DEBUG ((DEBUG_INFO, "Enter S3 PEIM\r\n")); =20 VarSize =3D sizeof (EFI_PHYSICAL_ADDRESS); Status =3D RestoreLockBox ( @@ -1023,15 +1023,15 @@ S3RestoreConfig2 ( EfiBootScriptExecutorVariable =3D (BOOT_SCRIPT_EXECUTOR_VARIABLE *) (UIN= TN) TempEfiBootScriptExecutorVariable; ASSERT (EfiBootScriptExecutorVariable !=3D NULL); =20 - DEBUG (( EFI_D_ERROR, "AcpiS3Context =3D %x\n", AcpiS3Context)); - DEBUG (( EFI_D_ERROR, "Waking Vector =3D %x\n", ((EFI_ACPI_2_0_FIRMWARE_= ACPI_CONTROL_STRUCTURE *) ((UINTN) (AcpiS3Context->AcpiFacsTable)))->Firmwa= reWakingVector)); - DEBUG (( EFI_D_ERROR, "AcpiS3Context->AcpiFacsTable =3D %x\n", AcpiS3Con= text->AcpiFacsTable)); - DEBUG (( EFI_D_ERROR, "AcpiS3Context->IdtrProfile =3D %x\n", AcpiS3Conte= xt->IdtrProfile)); =20 - DEBUG (( EFI_D_ERROR, "AcpiS3Context->S3NvsPageTableAddress =3D %x\n", A= cpiS3Context->S3NvsPageTableAddress)); - DEBUG (( EFI_D_ERROR, "AcpiS3Context->S3DebugBufferAddress =3D %x\n", Ac= piS3Context->S3DebugBufferAddress)); - DEBUG (( EFI_D_ERROR, "AcpiS3Context->BootScriptStackBase =3D %x\n", Acp= iS3Context->BootScriptStackBase)); - DEBUG (( EFI_D_ERROR, "AcpiS3Context->BootScriptStackSize =3D %x\n", Acp= iS3Context->BootScriptStackSize)); - DEBUG (( EFI_D_ERROR, "EfiBootScriptExecutorVariable->BootScriptExecutor= Entrypoint =3D %x\n", EfiBootScriptExecutorVariable->BootScriptExecutorEntr= ypoint)); + DEBUG (( DEBUG_INFO, "AcpiS3Context =3D %x\n", AcpiS3Context)); + DEBUG (( DEBUG_INFO, "Waking Vector =3D %x\n", ((EFI_ACPI_2_0_FIRMWARE_A= CPI_CONTROL_STRUCTURE *) ((UINTN) (AcpiS3Context->AcpiFacsTable)))->Firmwar= eWakingVector)); + DEBUG (( DEBUG_INFO, "AcpiS3Context->AcpiFacsTable =3D %x\n", AcpiS3Cont= ext->AcpiFacsTable)); + DEBUG (( DEBUG_INFO, "AcpiS3Context->IdtrProfile =3D %x\n", AcpiS3Contex= t->IdtrProfile)); =20 + DEBUG (( DEBUG_INFO, "AcpiS3Context->S3NvsPageTableAddress =3D %x\n", Ac= piS3Context->S3NvsPageTableAddress)); + DEBUG (( DEBUG_INFO, "AcpiS3Context->S3DebugBufferAddress =3D %x\n", Acp= iS3Context->S3DebugBufferAddress)); + DEBUG (( DEBUG_INFO, "AcpiS3Context->BootScriptStackBase =3D %x\n", Acpi= S3Context->BootScriptStackBase)); + DEBUG (( DEBUG_INFO, "AcpiS3Context->BootScriptStackSize =3D %x\n", Acpi= S3Context->BootScriptStackSize)); + DEBUG (( DEBUG_INFO, "EfiBootScriptExecutorVariable->BootScriptExecutorE= ntrypoint =3D %x\n", EfiBootScriptExecutorVariable->BootScriptExecutorEntry= point)); =20 // // Additional step for BootScript integrity - we only handle BootScript = and BootScriptExecutor. @@ -1081,19 +1081,19 @@ S3RestoreConfig2 ( SmmS3ResumeState->ReturnContext2 =3D (EFI_PHYSICAL_ADDRESS)(UINTN)= EfiBootScriptExecutorVariable; SmmS3ResumeState->ReturnStackPointer =3D (EFI_PHYSICAL_ADDRESS)STACK_A= LIGN_DOWN (&Status); =20 - DEBUG (( EFI_D_ERROR, "SMM S3 Signature =3D %x\n", SmmS= 3ResumeState->Signature)); - DEBUG (( EFI_D_ERROR, "SMM S3 Stack Base =3D %x\n", SmmS= 3ResumeState->SmmS3StackBase)); - DEBUG (( EFI_D_ERROR, "SMM S3 Stack Size =3D %x\n", SmmS= 3ResumeState->SmmS3StackSize)); - DEBUG (( EFI_D_ERROR, "SMM S3 Resume Entry Point =3D %x\n", SmmS= 3ResumeState->SmmS3ResumeEntryPoint)); - DEBUG (( EFI_D_ERROR, "SMM S3 CR0 =3D %x\n", SmmS= 3ResumeState->SmmS3Cr0)); - DEBUG (( EFI_D_ERROR, "SMM S3 CR3 =3D %x\n", SmmS= 3ResumeState->SmmS3Cr3)); - DEBUG (( EFI_D_ERROR, "SMM S3 CR4 =3D %x\n", SmmS= 3ResumeState->SmmS3Cr4)); - DEBUG (( EFI_D_ERROR, "SMM S3 Return CS =3D %x\n", SmmS= 3ResumeState->ReturnCs)); - DEBUG (( EFI_D_ERROR, "SMM S3 Return Entry Point =3D %x\n", SmmS= 3ResumeState->ReturnEntryPoint)); - DEBUG (( EFI_D_ERROR, "SMM S3 Return Context1 =3D %x\n", SmmS= 3ResumeState->ReturnContext1)); - DEBUG (( EFI_D_ERROR, "SMM S3 Return Context2 =3D %x\n", SmmS= 3ResumeState->ReturnContext2)); - DEBUG (( EFI_D_ERROR, "SMM S3 Return Stack Pointer =3D %x\n", SmmS= 3ResumeState->ReturnStackPointer)); - DEBUG (( EFI_D_ERROR, "SMM S3 Smst =3D %x\n", SmmS= 3ResumeState->Smst)); + DEBUG (( DEBUG_INFO, "SMM S3 Signature =3D %x\n", SmmS3= ResumeState->Signature)); + DEBUG (( DEBUG_INFO, "SMM S3 Stack Base =3D %x\n", SmmS3= ResumeState->SmmS3StackBase)); + DEBUG (( DEBUG_INFO, "SMM S3 Stack Size =3D %x\n", SmmS3= ResumeState->SmmS3StackSize)); + DEBUG (( DEBUG_INFO, "SMM S3 Resume Entry Point =3D %x\n", SmmS3= ResumeState->SmmS3ResumeEntryPoint)); + DEBUG (( DEBUG_INFO, "SMM S3 CR0 =3D %x\n", SmmS3= ResumeState->SmmS3Cr0)); + DEBUG (( DEBUG_INFO, "SMM S3 CR3 =3D %x\n", SmmS3= ResumeState->SmmS3Cr3)); + DEBUG (( DEBUG_INFO, "SMM S3 CR4 =3D %x\n", SmmS3= ResumeState->SmmS3Cr4)); + DEBUG (( DEBUG_INFO, "SMM S3 Return CS =3D %x\n", SmmS3= ResumeState->ReturnCs)); + DEBUG (( DEBUG_INFO, "SMM S3 Return Entry Point =3D %x\n", SmmS3= ResumeState->ReturnEntryPoint)); + DEBUG (( DEBUG_INFO, "SMM S3 Return Context1 =3D %x\n", SmmS3= ResumeState->ReturnContext1)); + DEBUG (( DEBUG_INFO, "SMM S3 Return Context2 =3D %x\n", SmmS3= ResumeState->ReturnContext2)); + DEBUG (( DEBUG_INFO, "SMM S3 Return Stack Pointer =3D %x\n", SmmS3= ResumeState->ReturnStackPointer)); + DEBUG (( DEBUG_INFO, "SMM S3 Smst =3D %x\n", SmmS3= ResumeState->Smst)); =20 if (SmmS3ResumeState->Signature =3D=3D SMM_S3_RESUME_SMM_32) { SwitchStack ( --=20 2.9.3.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel