From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=kelly.steele@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 13AA820349D90 for ; Mon, 13 Nov 2017 14:51:42 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2017 14:55:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,389,1505804400"; d="scan'208";a="2260766" Received: from orsmsx107.amr.corp.intel.com ([10.22.240.5]) by fmsmga001.fm.intel.com with ESMTP; 13 Nov 2017 14:55:48 -0800 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.129]) by ORSMSX107.amr.corp.intel.com ([169.254.1.228]) with mapi id 14.03.0319.002; Mon, 13 Nov 2017 14:55:11 -0800 From: "Steele, Kelly" To: "Kinney, Michael D" , "edk2-devel@lists.01.org" CC: "Yao, Jiewen" Thread-Topic: [Patch] QuarkPlatformPkg/PlatformBootManagerLib: Update boot mode handling Thread-Index: AQHTWOOxMcMin8o/O06Xox4ZQOMnOqMS8t7A Date: Mon, 13 Nov 2017 22:55:10 +0000 Message-ID: References: <20171108224816.1952-1-michael.d.kinney@intel.com> In-Reply-To: <20171108224816.1952-1-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMDY2ZmI4NjAtMzc2ZC00ZTRmLWJjNzEtYjBjN2ZlYWE3ZDRiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX1BVQkxJQyJ9XX1dfSwiU3ViamVjdExhYmVscyI6W10sIlRNQ1ZlcnNpb24iOiIxNy4yLjUuMTgiLCJUcnVzdGVkTGFiZWxIYXNoIjoidmZGdmlybWV5TDg5clY0cGt5RjdqcWp0a2JyOVlxSHpyaDF1Ulc1UTcxTjV1WlNWQnQ2SW01d094cmdlR1ZKaSJ9 x-ctpclassification: CTP_PUBLIC dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Subject: Re: [Patch] QuarkPlatformPkg/PlatformBootManagerLib: Update boot mode handling 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: Mon, 13 Nov 2017 22:51:43 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Steele, Kelly -----Original Message----- From: Kinney, Michael D=20 Sent: November 08, 2017 14:48 To: edk2-devel@lists.01.org Cc: Steele, Kelly ; Yao, Jiewen Subject: [Patch] QuarkPlatformPkg/PlatformBootManagerLib: Update boot mode = handling https://bugzilla.tianocore.org/show_bug.cgi?id=3D768 Update and simplify boot mode handling logic. This includes performing min= imum connects for the following boot modes: BOOT_ASSUMING_NO_CONFIGURATION_CHANGES BOOT_WITH_MINIMAL_CONFIGURATION BOOT_ON_S4_RESUME Cc: Kelly Steele Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- .../PlatformBootManagerLib/PlatformBootManager.c | 30 +++++++++---------= ---- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootMa= nager.c b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManag= er.c index 3c21318069..53391c6077 100644 --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManage +++ r.c @@ -2,7 +2,7 @@ This file include all platform action which can be customized by IBV/OEM. =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 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 @@ -354,9 +35= 4,17 @@ PlatformBootManagerAfterConsole ( } =20 BootMode =3D GetBootModeHob(); + + DEBUG((DEBUG_INFO, "PlatformBootManagerAfterConsole(): BootMode =3D=20 + %02x\n", BootMode)); + switch (BootMode) { + case BOOT_ASSUMING_NO_CONFIGURATION_CHANGES: + case BOOT_WITH_MINIMAL_CONFIGURATION: + case BOOT_ON_S4_RESUME: + EfiBootManagerRefreshAllBootOption (); + break; + case BOOT_ON_FLASH_UPDATE: - DEBUG((DEBUG_INFO, "Capsule Mode detected\n")); if (FeaturePcdGet(PcdSupportUpdateCapsuleReset)) { EfiBootManagerConnectAll (); EfiBootManagerRefreshAllBootOption (); @@ -374,15 +382,6 @@ Platform= BootManagerAfterConsole ( } break; =20 - case BOOT_IN_RECOVERY_MODE: - DEBUG((DEBUG_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 (); @@ -390,14 +389,9 @@ PlatformBo= otManagerAfterConsole ( // // Sync ESRT Cache from FMP Instance on demand after Connect All // - if ((BootMode !=3D BOOT_ASSUMING_NO_CONFIGURATION_CHANGES) && - (BootMode !=3D BOOT_WITH_MINIMAL_CONFIGURATION) && - (BootMode !=3D BOOT_ON_S4_RESUME)) { - if (EsrtManagement !=3D NULL) { - EsrtManagement->SyncEsrtFmp(); - } + if (EsrtManagement !=3D NULL) { + EsrtManagement->SyncEsrtFmp(); } - break; } =20 -- 2.14.2.windows.3