From nobody Sun May 5 01:25:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+90722+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+90722+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1655992738460570.9221552458326; Thu, 23 Jun 2022 06:58:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id s3G9YY1788612xSp9M8Bm1xm; Thu, 23 Jun 2022 06:58:58 -0700 X-Received: from NAM04-BN8-obe.outbound.protection.outlook.com (NAM04-BN8-obe.outbound.protection.outlook.com [40.107.100.72]) by mx.groups.io with SMTP id smtpd.web11.4513.1655967538116932180 for ; Wed, 22 Jun 2022 23:58:58 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e4hjHlpaRXFNNARvjFPxMh5yneuo1010CCMiXHdHoOCQ7eFkZ7EvDGFpZRH0ZHU1JPOzvkAQfFWbsEBL2JD3navFi2kUMabpvCLwVQt09Uh+ac2cebcTkwZ8mgFxdQVso0/uBHDPPjfmlFAjK87BoL6JnvdytNpoWS/n1k1TG5B3AYMprl553rCZvc/0iwXrnprYdOBSElZx/pOiHjdI83p2RjJi1g1tGfqcrgF7ypmQtyvElXevx0o5l8pm29mA9KWXaiTdZzc1rENRnhCPMt6K/kpInAZVl3fyY+jB+A7uVzPWooc8EpaBFr7hYDzDMKMYrM7Wvgs2nAp1Tp6rpQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=y567JDPFeJOM5RmttCHrv8YY9QcWrfaI3DoHrQH+aHs=; b=bX6LM+IeTeunn71H3RQLc74HDZE0dzae9ZfDPJTj1MFZFTR0Z6VRZ/ZxcZ5v2WGrH4HrepW6jLD+xmrw+ZXEgKUYoSDRbnJMMUGk0O5GaUCryxyHL9OwrSVOXTu5zfSRiOcZ7Qew30BXvd7zDYwsb7IFF6M5Sxd8JFA0RIi5VSfckTSgkPAO7P7URivABdBYdGMVuBtWymjacg829U13pcViDX79P7VQCjAyG0MMPAf0emlNWAAbqkeQbqug0A4TmAxwajH1rarLVVAOB8GgO+ncPN/btmLuTpxSCL08KlFZ5maKGZof6biyZF56BIUR3zWDcFkfBIg/TSvme0pN0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ami.com; dmarc=pass action=none header.from=ami.com; dkim=pass header.d=ami.com; arc=none X-Received: from SJ0PR10MB5742.namprd10.prod.outlook.com (2603:10b6:a03:3ed::20) by SJ0PR10MB5488.namprd10.prod.outlook.com (2603:10b6:a03:37e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Thu, 23 Jun 2022 06:58:55 +0000 X-Received: from SJ0PR10MB5742.namprd10.prod.outlook.com ([fe80::d4b1:cc02:d78d:a9e7]) by SJ0PR10MB5742.namprd10.prod.outlook.com ([fe80::d4b1:cc02:d78d:a9e7%7]) with mapi id 15.20.5373.015; Thu, 23 Jun 2022 06:58:55 +0000 From: =?UTF-8?B?SmFtZXNXYW5nIFvnjovlrrbmmI5dIHZpYSBncm91cHMuaW8=?= To: "devel@edk2.groups.io" CC: Eric Dong , Isaac Oram , Liming Gao Subject: [edk2-devel] [PATCH v1 1/1] BoardModulePkg: Fix Boot0000 got overwritten Thread-Topic: [PATCH v1 1/1] BoardModulePkg: Fix Boot0000 got overwritten Thread-Index: AQHYhs602gnU7ZVkhU6x2sHMBGEY4g== Date: Thu, 23 Jun 2022 06:58:55 +0000 Message-ID: <20220623065844.1608-2-jameswang@ami.com> References: <20220623065844.1608-1-jameswang@ami.com> In-Reply-To: <20220623065844.1608-1-jameswang@ami.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 204487fa-f9e1-48a0-f32b-08da54e5d6a6 x-ms-traffictypediagnostic: SJ0PR10MB5488:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: 9KqVJOF7PdFnCJSniTk2QTvhwlchmpzwFIIPMjn5TWurtbrs9XDv+dRxDMQDqqlQC0PqB//EAnz6SdJb1Q9CeTaG8k1hJ7dXE37iCNO+CWja7wmIayqqCg14enz9pFAdAZLCIvt8ZpbWjIBn9zteOR2o5ArP7RNxV7f7+M+6vWnDHzeGHmqRsHVoVijEe8nebwNSpcM4mvB62DvMFKguuAZZiOJgupDa5Yym3Av3OxfYz9bFjzpd+426mpYtrdV2aeWcjvK3vNPBlnbYW9tFawIU0+1j3zSZr57SQ9uP3Yf/JjwuABAJics1Z/qVl/FFYgdEv320qkwR4xNrI6VuztMk2bh9foCr2mOSQgGYvfdQXZOQhI+2SIWnYSLiH24TvCxLqrP7EPfJskgVlsSSnlzux5WS65DhBDVbsKSd7SkBFTHawvNEEjxXPtwG4l4MT5KBLe229Omd3J4e3E50AyPemLeC9ubTi6YpfopAt9Vb5NC+PNrsQY9duCene6nav1XE4pjl+xP49NhiWvKN6q+1riqeoMULuYYobMQUXbRknhfEpzUJcCTCYUELVc+eUu0AdouJP6c3snj1mfOc0L4zqbrNLQ3FlBxnzQAmfoSYEyFWKtif2O61bd9MFfr+99VBS0VUnB8l1ZOeIjeziNMlcRob5bQPBZRI8KiRX4PlzelZShfrMTEpdr1x1TqTCp29XBoKjgtC0Zqv2fMbmAR+Ifxk1r21ImWyw00DKTDvD8Vpputs0RHhzr5PZ7dP1AwcuneohrMRU1rk5pOJWRVsFBVl59LNjP7UnuIYJww= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?B?ZlZFdkZCVWtRQXh6cit2Yk5TK3YzVnhUVVhJSExYdTh4elRkVkgrcDR6?= =?iso-2022-jp?B?eTBkNEZSSEZ0d0w0dXY0aHRDUFBkQjJISHlGUGM4KzQ3RlJ3M3hWMWkz?= =?iso-2022-jp?B?VVNvaVhnTEZVc3kyRHF6dVhNNlZzRnYyYUZUaGFhbXpzSmVFQWkwYm14?= =?iso-2022-jp?B?R1dUTTdLSFBQU2x6QXR6WDV6SzdDMkg0TXRhVUNtLzZkRzdiNGxRNmpM?= =?iso-2022-jp?B?UG82a3ZSN2wrL1JHbmV0eGNNNWUzcjRaUUFObVd2ZFI3bUkvN0tsSnpk?= =?iso-2022-jp?B?Yk8wT1ZFV3ZpUG13c0tnSHZ0bHlMZ3BxYlFxdzgrODl1QTVUS3kvbk9y?= =?iso-2022-jp?B?ZnFkU2VCdkU0cm5aWTF2RU5VaVBudll2ZVBGQmRXRlRJdXpDSVJLR3lT?= =?iso-2022-jp?B?MWtUNEhRcURiTHlleFJzdE5HL1JsOVpzNndwWGxOV2hNSGlMWmNtekY2?= =?iso-2022-jp?B?YXpaS012Y1RGRkYybTNNOGV4VlJOSVdFS1BWOU0zRTJNRHI2N0RQVkdS?= =?iso-2022-jp?B?bE1ZL01tWUFLdnJTSGhUako4WGxKbDFlM1JGNnJhNjJOOXNDZHpCalo5?= =?iso-2022-jp?B?dWMyeFUrclJhdXFQc3dCbjdYazN5SzFXQ3BnQm1Qc2N6cFJDVnBaRDJu?= =?iso-2022-jp?B?eEE3Vi9lNkptdDVxOWlzbzN3U016STZCR0pEYjRUa3BtQmJ2N2ZvNEJv?= =?iso-2022-jp?B?RkRPdlRPZ0hBdE9FbFR4U3hpRVcrcU9mRzZ2THBwb2d1NnFHOTNnM1Ix?= =?iso-2022-jp?B?T0pLMlBPRGx2cE1JTFlIMFBOOHFFV3NEN0JDcW80eVgxVmFPODM0cmhm?= =?iso-2022-jp?B?K0Uya1dmY0NMR1hPVU9ITUVWT2RCOEdJYVIyeXlKNkhFTkw4VGhFREE2?= =?iso-2022-jp?B?ZjZmZUV5UCtreTd0S3FWaDlLOXVTUjZKeDVnNTR5RnY5Uy91VTZ5ZVFL?= =?iso-2022-jp?B?TksrVi9xVzlxRWJPemJtenplY2VQOWZLM2dJeTU2Z01HekFBWHRhWFdK?= =?iso-2022-jp?B?Sy8xdVMxSTcvMFZ3eWVZUG5OSzVpSjRuUU02eHJ5OEVKK0NzVnRGSHZI?= =?iso-2022-jp?B?SGljeU1MWlUzMXl6NEJFVC92Si9KRnpWbFFtR2ZkUTNzTEMwUmc0a2tz?= =?iso-2022-jp?B?NjRUSUhpOHNXK0thZWxYMmJvRlpBSFg3c04xWDN3S2JSOVFFZURmakds?= =?iso-2022-jp?B?R2FnRjVYZnE3VzlhQjVSVFM2OU5CSWpMNmNlbEFKOHdqdmlZZGN1eC95?= =?iso-2022-jp?B?UC93MWhNRlkzRUhhT2l4RG1sQzJlbzlnL3NaajZGU0d1a3lHWGJNWjZX?= =?iso-2022-jp?B?K1A4cktXZlhqS3MrOUU4SWFsWm1aSnZrcnBNbHZEUld1cENOTkZPRW1I?= =?iso-2022-jp?B?UEozSi9EVW02dGhLSmxnbHgwKzJGZzEzRWRaSWlnSlZ0MFpwZFdVVUc0?= =?iso-2022-jp?B?NENxc0FsVldSdDYvQXdMS1VkU1FyR3diQlFxNG1xbjExS25iR0Uyckc2?= =?iso-2022-jp?B?U3hVTCsrUGJMb0V3Vi8yd05rdHphYUZyUDFLcU9kTWpBTzBValZWY2li?= =?iso-2022-jp?B?by9sWmpPeG5aY0d2TW54QjVJOTZHNndldnhFclhTTGx1UWsvRGM5ZHc3?= =?iso-2022-jp?B?V09YcmJkeUZwSHIrYVUwMlNyZExWam5FSllCZzlIckVLeSttaDBaM1lY?= =?iso-2022-jp?B?YjZSU1psaWpuQktyMkFFWWJFcWNpN1JpYmhjWHBGSUNZQTBJZGRNcnJl?= =?iso-2022-jp?B?eXhVRjFVanc2OTRHd2JVMXl5UlV0T0JQS2NxUHpBTFpJRFg1TzJiSkRE?= =?iso-2022-jp?B?MXZIWDFReVd2Q244UEdDenRiSXZxbXdFNUFldyszeUc0dU5mRXUyOXVI?= =?iso-2022-jp?B?Z0JZakxYNVZTNng2M2MzZjhENzE2aFBKS01icUdCZ21OS0dvSm9Ib3J1?= =?iso-2022-jp?B?eDg4c2YxYVpBK25ZYUMyUmhNQmpmbDZSUkhrQnBtTzZqU1ErbG4rSzR6?= =?iso-2022-jp?B?ZUNzTGkwVThlNTlER3Niblk3SUNwRlcwbHVnUGxZMkU0V2xSc1hXSFMy?= =?iso-2022-jp?B?ck5HbDlrLzkzTHN6U1hMTXFTUzlHV3ZkUEhXaGZDcmxRUHRKTkJXUTJN?= =?iso-2022-jp?B?RUNpc1UzUDZHcnlqN0lmKzZWR3JiMzhVZmtqN3MySkhxMXhrc1ZVVjRX?= =?iso-2022-jp?B?QUUrcEdkd3V4RjJNdWJ2MHBBREJsU2lLOUx4VWxQZGtyZSthc0c3ak1O?= =?iso-2022-jp?B?SWJpK0xha3lMSGt2THZwbUEzZmZiOHBFd3AxdkpPTlFod2x3RVJKMXh1?= =?iso-2022-jp?B?T0hpaitNU2g1OG50RkdxakFCdTBNUjV0UW5OQUY2RkJHT3pvVTVKeFl5?= =?iso-2022-jp?B?SkFRaDR3QjZUc1d2amJJMjlEdkZSVy9zb3ZHSUJoY1pNaVhpWDhLMFAy?= =?iso-2022-jp?B?WEFlKzN0MVNlZWxqVG9samcyM0JNWE00YW5xbkFycGlscFdLbWxxdU54?= =?iso-2022-jp?B?M2h3SnFmVGsvWWZ2N1F0U2VuQW9PYjRpWjdpc1FHQ21TWWtNMFM5MFY1?= =?iso-2022-jp?B?NlFBbk5vND0=?= MIME-Version: 1.0 X-OriginatorOrg: ami.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5742.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 204487fa-f9e1-48a0-f32b-08da54e5d6a6 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jun 2022 06:58:55.0449 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 27e97857-e15f-486c-b58e-86c2b3040f93 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: N5ga1WRxYRib4IScGe8dk6sDpHNeJHoYUXcYtN0YakSa7v988vpA4dAjg+uywteoelrd1zEAlp1cnR01naCI1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5488 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jameswang@ami.com X-Gm-Message-State: FxUPBJdYBQiBHmi0k0q9xtaNx1787277AA= Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1655992738; bh=W23GCdB14uqDXg0PJOSjvn0kD8eBPSo8TUZazFroM44=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=OSTKfSquXa5jVK8ZaY1eIIMOuGPvveoD4TmApINVB2lhqijRH9OFersCTaZz9GKGFpx pxbKNqbZfkIjHBoentyOxUgulOMezf3Co/Sykkmgg6Q0EODrr+M8pXe/9o1r0b3YCA7Zi waooBlqzZcjW6FJUnat1Ibp0pIEhObzOraA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1655992740464100018 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3522 Boot0000 will be overwritten when F7 is pressed and Boot Menu is not found. Check if mBootMenuOptionNumber is valid or not before calling RegisterBootOptionHotkey Cc: Eric Dong Cc: Isaac Oram Cc: Liming Gao Signed-off-by: James Wang --- Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c | = 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoo= tOption.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoot= Option.c index 6e3c21f4f052..8807d9425e50 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c @@ -461,12 +461,18 @@ RegisterStaticHotkey ( RegisterBootOptionHotkey ((UINT16) mSetupOptionNumber, &F2.Key, TRUE); } - F7.Key.ScanCode =3D SCAN_F7; - F7.Key.UnicodeChar =3D CHAR_NULL; - F7.KeyState.KeyShiftState =3D EFI_SHIFT_STATE_VALID; - F7.KeyState.KeyToggleState =3D 0; - mBootMenuBoot =3D !EnterSetup; - RegisterBootOptionHotkey ((UINT16) mBootMenuOptionNumber, &F7.Key, mBoot= MenuBoot); + // + // Register F7 only when the mBootMenuOptionNumber is valid + // + if (mBootMenuOptionNumber !=3D LoadOptionNumberUnassigned) + { + F7.Key.ScanCode =3D SCAN_F7; + F7.Key.UnicodeChar =3D CHAR_NULL; + F7.KeyState.KeyShiftState =3D EFI_SHIFT_STATE_VALID; + F7.KeyState.KeyToggleState =3D 0; + mBootMenuBoot =3D !EnterSetup; + RegisterBootOptionHotkey ((UINT16) mBootMenuOptionNumber, &F7.Key, mBo= otMenuBoot); + } } -- 2.13.2.windows.1 -The information contained in this message may be confidential and propriet= ary to American Megatrends (AMI). This communication is intended to be read= only by the individual or entity to whom it is addressed or by their desig= nee. If the reader of this message is not the intended recipient, you are o= n notice that any distribution of this message, in any form, is strictly pr= ohibited. Please promptly notify the sender by reply e-mail or by telephone= at 770-246-8600, and then delete or destroy all copies of the transmission. -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90722): https://edk2.groups.io/g/devel/message/90722 Mute This Topic: https://groups.io/mt/91943416/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-