From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.33294.1628835484838514937 for ; Thu, 12 Aug 2021 23:18:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=HVyn0OzU; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10074"; a="215503438" X-IronPort-AV: E=Sophos;i="5.84,318,1620716400"; d="scan'208";a="215503438" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2021 23:18:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,318,1620716400"; d="scan'208";a="508036692" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP; 12 Aug 2021 23:18:02 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Thu, 12 Aug 2021 23:18:01 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Thu, 12 Aug 2021 23:18:01 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Thu, 12 Aug 2021 23:18:01 -0700 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.48) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Thu, 12 Aug 2021 23:18:01 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ORVcHOycox414Me/gzIsOUCyCl4V46/wfrrtZNNEJh7xZZidcuAYVZPhoHyceNYM1+xYA4r3GufTF5lHi+EG+9w/YcxxKnEC9kuII09EwbW5o+xgUSPQAFds7Bkc1FsY/A3skREiyhNioPsSGp0lzsvFRNDIoc2sytsCk57K6xqEOYcIBhpyKrZb2XEYHOuNHkL47b3o0quPQjl8WDrYyX18u7S//ZFOvOq9d5xGr1dRiF8fzZb4pKn6J6kuEkONhlEkZUi4u2ebSUpT8uI1l7nDPNbl6fF8CeEHkUJbEogNn9k8kwr18aJMY4W92EnhubeQAEHXYJOyM3FCyLdSNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZZ7Pmu8XfLKPhgJWoS1DlMxgagLGxNjp7n8SBccmJfg=; b=OHW1b7JdiKxTIUV1byl/Dt7OFDNs1b854/y2RIeejjS1yJ8Ej6gLlONtdqVsZ6vbmuuF+Whsg5Fx4/icbD8/nlbbNfrnziVr8hQaW4aX8xpfg08WMe80IgzTJosCxeRbWvHxMD1Kdb9JyhnGUPNSd7P+vXkwmCk8AfU0czQwHJRbfWfFKVAhN88Ek7N2KX26gJOf0J9sPmbFSqoIrG+hQe8FCTZE1uhv37TXUzu4UbMO/BDKBVAxvk6YMKlP6s7kOAhPXN321t/31QmtltNrcOAinawyUASlJz9cNvmjiF1vgSbD9XUKoPfFaddBxK7G2uvk6JPK9iAQfR99t1hRWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZZ7Pmu8XfLKPhgJWoS1DlMxgagLGxNjp7n8SBccmJfg=; b=HVyn0OzUMqNI1dUWMz9OZ6QhxiAx8+gVT400/W003og7QcER7LIasGyMpTiSRNAvqPR6qrpnz6OcduzT0n9vaCHpZKoig/Ymy2DtLEz/JUjuepoI/0vlufPsMGCtDPtrbSpg5fLRjR+lejEjkLv0y7nv/UPhSUYh8gIfIk2IOWE= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by CO1PR11MB4836.namprd11.prod.outlook.com (2603:10b6:303:9d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.18; Fri, 13 Aug 2021 06:17:59 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::546c:f20e:35d2:65a7]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::546c:f20e:35d2:65a7%5]) with mapi id 15.20.4415.016; Fri, 13 Aug 2021 06:17:59 +0000 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "benjamin.doron00@gmail.com" CC: "Dong, Eric" , Liming Gao Subject: Re: [edk2-devel] [edk2-platforms][PATCH v2] BoardModulePkg/BoardBdsHookLib: Register UiApp as boot option Thread-Topic: [edk2-devel] [edk2-platforms][PATCH v2] BoardModulePkg/BoardBdsHookLib: Register UiApp as boot option Thread-Index: AQHXg+lvW/SN+vPgdkyJGFMz7ypny6txBAKA Date: Fri, 13 Aug 2021 06:17:59 +0000 Message-ID: References: <20210728194616.6047-1-benjamin.doron00@gmail.com> In-Reply-To: <20210728194616.6047-1-benjamin.doron00@gmail.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4b91cbb7-9e48-49f6-3a0d-08d95e22197b x-ms-traffictypediagnostic: CO1PR11MB4836: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: G0TJJy2EW5+2emaL1J+6n0VhMqYAi9cF5P3dU4f1y4Xmy/C2OlCIxOTjBOp2XrBin5ozMxXDNDeMmEScoB01UZKeE99Sx+PQD7MDZZq2YnuDY9Sbno20eH9/LHh2PHrJ/KCaLH/6j0F05Ku+OKLzXUgFTnnHYk5HhQAVo7r9mcWFrpLinOCJTtpr3gMzKNbGYOx/SQJY4QuQutyRZJqiPSXXdoMGnIcLA3ECMvNTKkAb1oRFTPtGmnggkVCUb+XpblkM9oeWoDZ5pGAHiczjNaapNqihGbAxbbFsJR6OkRP2Wwv1FRBiTiUE5Vok5XlunDXMk56NubxLTeZ8FziS6htGVsIi8lekWuoiRSc5GZ3Ar4hPFbpoC2sOQYfzf9qwCCfGlzqgC0uyLFC/oN1ZB0sgtY+OrGNBKLX9MQ4omIVuqaIHMq7MqRO6acTN265tM3j6+nTCyfI3nijShWKz/cAcG1kCMVy5BJjrfRlIwdUEVEhEHzEYQS0vWS2/32RGCzuJxelE0Ta3wfI78ke/3pS/udo59yEcf5piz10IeKPu8zl67TlgCIZ2TFLYA9A2L/oQ9WxR+p22cBN+1nKQW3ThxuBe0xoN3pIVYcslUy5kaR9KLEf4Hwp+fRfvPam1cKlBE6+nAJ0Xrdx+DC+O37d+uU3cMANuLXKvxGYkkcaCJBvFa92b1D0aV+X5r2fThY3CZORzQzc1BYc/b5snKxVckIt/QsM7RP5Ey35H1H43uSl1lmTOjCQY9W7CQBJrbBNna7ayWyFA5gyGKh3+0jT/knp+X4RDqQTQKIUoSX9dwkYZ0PpfiQ+NBETXOWkz4fAmhhZEd9SghX4NkzqFMw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(6029001)(4636009)(136003)(346002)(366004)(376002)(396003)(39860400002)(4326008)(71200400001)(38100700002)(122000001)(8936002)(186003)(316002)(8676002)(5660300002)(66946007)(66446008)(64756008)(66476007)(66556008)(76116006)(86362001)(52536014)(33656002)(2906002)(38070700005)(9686003)(55016002)(53546011)(6506007)(7696005)(966005)(478600001)(110136005)(54906003)(83380400001)(26005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?cR5h8WPt12NvW1EXJxmKVcUs0S5L6WstnSfIeqiACgNnV0WePSvvrAi4Qbpc?= =?us-ascii?Q?yGswbcu/VTUAB1dXWes45u7fqmXIrqF2uwcsD9Li1rpkoetWvVI+FU/S5K5i?= =?us-ascii?Q?1p7M10qy5b5GftwFLiYVupoTeCkBShrJ+qC7cLT2/YlAtCfKCccf9pp5ITld?= =?us-ascii?Q?Upk/VueStf+ry6zw6TQGZqO+Cl+tfUmpVkOkIea3PibCYB+H9IqA8T9U8Xe/?= =?us-ascii?Q?j+AgTFjCSrAg7itde4NdF6ItS1in+bFNNWZJaGACNXgZuyh66tNhhZHi6q40?= =?us-ascii?Q?w/LSaVUE1A7oVrTT1qcLYnDzI3KbMlfVjakDAxcuAUWtBlzLcgqNMrEMxYZg?= =?us-ascii?Q?WP6fDWH0F4NeARQxq5A9NLrHO0/GucLSCpASIGyUubWa9CVBuAgdscHeVdsa?= =?us-ascii?Q?Q8+Or3liUIsaJPltJ5hP6aNBPO5AZhpCrBF0rbxILZSU44oLkSUB+Rgu3Xa1?= =?us-ascii?Q?J+d2/OO6Rq0AtLzT3CZtOP+F7Im6E0HUMcmOGfGmEGpvuBOTy4VRto+MZcMx?= =?us-ascii?Q?GaEGERLBSIMQWnDu2tCqRM+4KO3oxIbFKWk0yKdel1qWu5nZ5mQolbm+32D5?= =?us-ascii?Q?ZPaA8AzedzSOsVJNaB1Bof/j0kOjYLbhK3xxYBkkKBt31A3wsb7N15ptFWGS?= =?us-ascii?Q?Yio+KBZa227voTZu0FXKMHI6AiOVHfZjskovlJTUJrVJRzcVw/GD+CYC1bWo?= =?us-ascii?Q?r3tyrf09TIN8vLCZmwnHOOsd6sB9QaSwvR5hL3Ofqz3ZmaKAxnGpx3qWMwOS?= =?us-ascii?Q?efextGm0d+jkZHuUlNy8Ssg0E70nIICHQicmrQsJkXSgLXcm7argELONVC19?= =?us-ascii?Q?wONsQU4Shgc/Q9GDrPIQ+OvnaqbtQnvRrifjKS4W9/79CH8NpXkJjV16gmg8?= =?us-ascii?Q?UBWlf2rR8FSYzdD1+ADF1mSa9DHN69ivKnV/0b61703g1GVAJM+Vme/3AN15?= =?us-ascii?Q?GZYPUCcXwsioGuzF6tNNaeu8fay9ZoZf7bcsq6ElnAqCRe/dXbuog0b4xwvC?= =?us-ascii?Q?RX4961jvUfTOnakl4W2hmfRanOCPx3hyqXBE/jx4eo4hq5H0O+rAcYLruB59?= =?us-ascii?Q?a4pWle2KtLJJFY0qXMsFnGJnCe+i3eJp1LZaNFmxfp48iI4lnjCmi9QY4cil?= =?us-ascii?Q?VH5sI+JNqsAGFNp/wyTwj5vSuus8yRZkEvjpVF7n+ffale7KPBvxk9i/RrZT?= =?us-ascii?Q?H0Y7qYiLSPBWzR7PZgMgmEdrzM0EozPdr5t6N0YSEUZZZ+YP0w796xhd7BVM?= =?us-ascii?Q?i6nxQBNp7NlKf99W6RtAxYGEv2BH5z1H5nFowZ1hZoQzWR0SlQ2ya8oX8KZT?= =?us-ascii?Q?rumNto6mSGZj+L9dOLkl9pVr?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b91cbb7-9e48-49f6-3a0d-08d95e22197b X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Aug 2021 06:17:59.7501 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oJPOFDATsh92WMoAL/fDFghiPCRVN7SCmiLnLftZs1FscPe9bRKVLBhK3Yx7pTHzK6Il/Lq3vP8igjkaWxlvsVKNhqpzKw8iAxPYz94r5rI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4836 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Benjamin, The implementation logic looks good. We do have to consider the case of a s= ystem without BIOS setup, in which case UiApp will not be present in the im= age. However, that appears to be well handled by new implementation. If UiA= pp does not exist in the FV that contains BdsDxe then the file will not be = found and the new boot option will not be added. I do have two comments however. First, if UiApp does exist in the FV, could you change the F2 hot key to go= straight into the setup menu? The hot key is registered here: https://gith= ub.com/tianocore/edk2-platforms/blob/c9fff3e9efd2d5daab76b703cc94fd7cbf2ac0= b2/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c#= L472 Normally F2 is used to enter setup but the current implementation is design= ed to handle the case of a system not having setup rather lazily... it just= routes both F2 and F7 to the boot option menu 100% of the time. Could you = modify this implementation so that if UiApp exists in the FV, then F2 goes = straight into setup instead? My second comment is kind of a nitpick, we generally use the string L"Enter= Setup" for UiApp instead of L"Platform Configuration" and sadly some of th= e old code has special handling of that string. For example: https://github= .com/tianocore/edk2-platforms/blob/c9fff3e9efd2d5daab76b703cc94fd7cbf2ac0b2= /Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/B= ds/Library/DxePlatformBootManagerLib/BdsPlatform.c#L1244 Could you please change that string to L"Enter Setup"? Thanks, Nate -----Original Message----- From: devel@edk2.groups.io On Behalf Of Benjamin Dor= on Sent: Wednesday, July 28, 2021 12:46 PM To: devel@edk2.groups.io Cc: Dong, Eric ; Liming Gao Subject: [edk2-devel] [edk2-platforms][PATCH v2] BoardModulePkg/BoardBdsHoo= kLib: Register UiApp as boot option BootManagerMenuApp is the default PcdBootManagerMenuFile. It allows choosin= g a boot device, but system configuration is performed in UiApp. Therefore, un-comment and fix UiApp boot option registration. Tested, UiApp can be entered through the new boot option. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Benjamin Doron --- Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c | = 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoo= tOption.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoot= Option.c index 87138bdd79ff..2dd0b250d44e 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOpt +++ ion.c @@ -361,20 +361,11 @@ RegisterDefaultBootOption ( if (mBootMenuOptionNumber =3D=3D LoadOptionNumberUnassigned) { DEBUG= ((DEBUG_INFO, "BootMenuOptionNumber (%d) should not be same to LoadOptionN= umberUnassigned(%d).\n", mBootMenuOptionNumber, LoadOptionNumberUnassigned)= ); }-#if 0+ // // Boot Manager Menu //- EfiInitializeFwVolDevicepa= thNode (&FileNode, &mUiFile);-- gBS->HandleProtocol (- gImageHandl= e,- &gEfiLoadedImageProtocolGuid,- (VOID **) &LoadedImage- = );- DevicePath =3D AppendDevicePathNode (DevicePathFromHandle (Loa= dedImage->DeviceHandle), (EFI_DEVICE_PATH_PROTOCOL *) &FileNode);-#endif-+ = RegisterFvBootOption (&mUiFile, L"Platform Configuration", (UINTN) -1, LOA= D_OPTION_ACTIVE, NULL, 0); } /**--=20 2.31.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#78309): https://edk2.groups.io/g/devel/message/78309 Mute This Topic: https://groups.io/mt/84469836/1767664 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [nathaniel.l.desimone@int= el.com] -=3D-=3D-=3D-=3D-=3D-=3D