From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A40E51A1EF0 for ; Sat, 22 Oct 2016 19:32:06 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 22 Oct 2016 19:32:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,386,1473145200"; d="scan'208";a="892909007" Received: from jyao1-mobl.ccr.corp.intel.com ([10.254.213.190]) by orsmga003.jf.intel.com with ESMTP; 22 Oct 2016 19:32:05 -0700 From: Jiewen Yao To: edk2-devel@lists.01.org Cc: Michael D Kinney , Kelly Steele , Feng Tian , Star Zeng , Liming Gao , Chao Zhang Date: Sun, 23 Oct 2016 10:31:45 +0800 Message-Id: <1477189908-8336-7-git-send-email-jiewen.yao@intel.com> X-Mailer: git-send-email 2.7.4.windows.1 In-Reply-To: <1477189908-8336-1-git-send-email-jiewen.yao@intel.com> References: <1477189908-8336-1-git-send-email-jiewen.yao@intel.com> Subject: [PATCH V4 6/8] QuarkPlatformPkg/PlatformBootManager: Add capsule/recovery handling. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Oct 2016 02:32:06 -0000 1) Add capsule and recovery boot path handling in platform BDS. 2) Add check if the platform is using default test key for recovery or update. Produce PcdTestKeyUsed to indicate if there is any test key used in current BIOS, such as recovery key, or capsule update key. Then the generic UI may consume this PCD to show warning information. Cc: Michael D Kinney Cc: Kelly Steele Cc: Feng Tian Cc: Star Zeng Cc: Liming Gao Cc: Chao Zhang Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao --- QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 131 +++++++++++++++++++- QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h | 9 +- QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 16 ++- 3 files changed, 151 insertions(+), 5 deletions(-) diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index 19ff3d0..f327c89 100644 --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -2,7 +2,7 @@ This file include all platform action which can be customized by IBV/OEM. -Copyright (c) 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2016, 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 @@ -205,6 +205,8 @@ PlatformBootManagerBeforeConsole ( EFI_INPUT_KEY Enter; EFI_INPUT_KEY F2; EFI_BOOT_MANAGER_LOAD_OPTION BootOption; + ESRT_MANAGEMENT_PROTOCOL *EsrtManagement; + EFI_BOOT_MODE BootMode; EFI_ACPI_S3_SAVE_PROTOCOL *AcpiS3Save; EFI_HANDLE Handle; EFI_EVENT EndOfDxeEvent; @@ -246,6 +248,40 @@ PlatformBootManagerBeforeConsole ( // PlatformRegisterFvBootOption (&mUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE); + Status = gBS->LocateProtocol(&gEsrtManagementProtocolGuid, NULL, (VOID **)&EsrtManagement); + if (EFI_ERROR(Status)) { + EsrtManagement = NULL; + } + + BootMode = GetBootModeHob(); + switch (BootMode) { + case BOOT_ON_FLASH_UPDATE: + DEBUG((EFI_D_INFO, "ProcessCapsules Before EndOfDxe ......\n")); + Status = ProcessCapsules (); + DEBUG((EFI_D_INFO, "ProcessCapsules %r\n", Status)); + break; + case BOOT_IN_RECOVERY_MODE: + break; + case BOOT_ASSUMING_NO_CONFIGURATION_CHANGES: + case BOOT_WITH_MINIMAL_CONFIGURATION: + case BOOT_ON_S4_RESUME: + if (EsrtManagement != NULL) { + // + // Lock ESRT cache repository before EndofDxe if ESRT sync is not needed + // + EsrtManagement->LockEsrtRepository(); + } + break; + default: + // + // Require to sync ESRT from FMP in a new boot + // + if (EsrtManagement != NULL) { + EsrtManagement->SyncEsrtFmp(); + } + break; + } + // // Prepare for S3 // @@ -303,7 +339,64 @@ PlatformBootManagerAfterConsole ( VOID ) { - EFI_STATUS Status; + EFI_STATUS Status; + EFI_BOOT_MODE BootMode; + ESRT_MANAGEMENT_PROTOCOL *EsrtManagement; + VOID *Buffer; + UINTN Size; + + Status = gBS->LocateProtocol(&gEsrtManagementProtocolGuid, NULL, (VOID **)&EsrtManagement); + if (EFI_ERROR(Status)) { + EsrtManagement = NULL; + } + + BootMode = GetBootModeHob(); + switch (BootMode) { + case BOOT_ON_FLASH_UPDATE: + DEBUG((EFI_D_INFO, "Capsule Mode detected\n")); + if (FeaturePcdGet(PcdSupportUpdateCapsuleReset)) { + EfiBootManagerConnectAll (); + EfiBootManagerRefreshAllBootOption (); + + // + // Always sync ESRT Cache from FMP Instances after connect all and before capsule process + // + if (EsrtManagement != NULL) { + EsrtManagement->SyncEsrtFmp(); + } + + DEBUG((EFI_D_INFO, "ProcessCapsules After ConnectAll ......\n")); + Status = ProcessCapsules(); + DEBUG((EFI_D_INFO, "ProcessCapsules %r\n", Status)); + } + break; + + case BOOT_IN_RECOVERY_MODE: + DEBUG((EFI_D_INFO, "Recovery Mode detected\n")); + // Passthrough + + case BOOT_ASSUMING_NO_CONFIGURATION_CHANGES: + case BOOT_WITH_MINIMAL_CONFIGURATION: + case BOOT_WITH_FULL_CONFIGURATION: + case BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS: + case BOOT_WITH_DEFAULT_SETTINGS: + default: + EfiBootManagerConnectAll (); + EfiBootManagerRefreshAllBootOption (); + + // + // Sync ESRT Cache from FMP Instance on demand after Connect All + // + if ((BootMode != BOOT_ASSUMING_NO_CONFIGURATION_CHANGES) && + (BootMode != BOOT_WITH_MINIMAL_CONFIGURATION) && + (BootMode != BOOT_ON_S4_RESUME)) { + if (EsrtManagement != NULL) { + EsrtManagement->SyncEsrtFmp(); + } + } + + break; + } Print ( L"\n" @@ -313,6 +406,40 @@ PlatformBootManagerAfterConsole ( ); // + // Check if the platform is using test key. + // + Status = GetSectionFromAnyFv( + PcdGetPtr(PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid), + EFI_SECTION_RAW, + 0, + &Buffer, + &Size + ); + if (!EFI_ERROR(Status)) { + if ((Size == PcdGetSize(PcdRsa2048Sha256PublicKeyBuffer)) && + (CompareMem(Buffer, PcdGetPtr(PcdRsa2048Sha256PublicKeyBuffer), Size) == 0)) { + Print(L"WARNING: Recovery Test Key is used.\n"); + PcdSetBoolS(PcdTestKeyUsed, TRUE); + } + FreePool(Buffer); + } + Status = GetSectionFromAnyFv( + PcdGetPtr(PcdEdkiiPkcs7TestPublicKeyFileGuid), + EFI_SECTION_RAW, + 0, + &Buffer, + &Size + ); + if (!EFI_ERROR(Status)) { + if ((Size == PcdGetSize(PcdPkcs7CertBuffer)) && + (CompareMem(Buffer, PcdGetPtr(PcdPkcs7CertBuffer), Size) == 0)) { + Print(L"WARNING: Capsule Test Key is used.\n"); + PcdSetBoolS(PcdTestKeyUsed, TRUE); + } + FreePool(Buffer); + } + + // // Use a DynamicHii type pcd to save the boot status, which is used to // control configuration mode, such as FULL/MINIMAL/NO_CHANGES configuration. // diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h index 7413883..395f78b 100644 --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h @@ -1,7 +1,7 @@ /** @file Head file for BDS Platform specific code -Copyright (c) 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2016, 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 @@ -21,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #include #include @@ -32,9 +33,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #include - +#include +#include +#include +#include typedef struct { EFI_DEVICE_PATH_PROTOCOL *DevicePath; diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index d59f14a..eadf1fe 100644 --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -1,7 +1,7 @@ ## @file # Include all platform action which can be customized by IBV/OEM. # -# Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2016, 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 @@ -38,6 +38,8 @@ IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec SourceLevelDebugPkg/SourceLevelDebugPkg.dec + QuarkPlatformPkg/QuarkPlatformPkg.dec + SecurityPkg/SecurityPkg.dec [LibraryClasses] BaseLib @@ -49,11 +51,16 @@ UefiBootServicesTableLib UefiLib UefiBootManagerLib + PrintLib + HobLib + CapsuleLib + DxeServicesLib [Protocols] gEfiFirmwareVolume2ProtocolGuid gEfiAcpiS3SaveProtocolGuid gEfiDxeSmmReadyToLockProtocolGuid + gEsrtManagementProtocolGuid [Guids] gEfiPcAnsiGuid @@ -70,3 +77,10 @@ gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState + gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset + gQuarkPlatformTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid + gQuarkPlatformTokenSpaceGuid.PcdEdkiiPkcs7TestPublicKeyFileGuid + gEfiSecurityPkgTokenSpaceGuid.PcdRsa2048Sha256PublicKeyBuffer + gEfiSecurityPkgTokenSpaceGuid.PcdPkcs7CertBuffer + gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed + -- 2.7.4.windows.1