From nobody Wed May 8 23:06:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59460+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59460+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589403362; cv=none; d=zohomail.com; s=zohoarc; b=MOAW/6JSsKxvRjGqHVyH+W7LIJ3clQNs3icxx4mwNxKdypXcRsL1K5Goe3IW6JRdGuKNP/gDtpLnnjvl1bhCeUypU64cPImhkc3JRYXNTxTeGOSCvQLqiBe8AaZ35ue5p1WK8BO+4dRLOysF25CQAsxFh+Nli9Xw/pzuWBao/e8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589403362; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=43xfrYt8m/EwPRVKF5KiRO0ue6P/EllB9N9/pTqqj2Y=; b=PMFb+TE7XwdjqKu/IsD4tU8C9f9hNDIqC2GJzlVH5MICnWqsGjFFWjKcSJtVaos6GXqktjKFuI6dk9pKzVr1Z6XvJJwjmfOfi6jgPbWnd0Jn3D6T+CAhEZIW/HmiHZ6JiwduK9jHv1s+1iSciGp6a2ORRROtepmbSN9rglfpcOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59460+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589403362608512.8572815508232; Wed, 13 May 2020 13:56:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id I1kKYY1788612x21ZAdCTXDQ; Wed, 13 May 2020 13:56:02 -0700 X-Received: from atlmailgw1.ami.com (atlmailgw1.ami.com [63.147.10.40]) by mx.groups.io with SMTP id smtpd.web10.101.1589403361526785822 for ; Wed, 13 May 2020 13:56:01 -0700 X-AuditID: ac1060b2-0e1ff700000018d4-d3-5ebc5edf832d X-Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw1.ami.com (Symantec Messaging Gateway) with SMTP id 41.25.06356.0EE5CBE5; Wed, 13 May 2020 16:56:00 -0400 (EDT) X-Received: from Oleksiy77.us.megatrends.com (172.16.97.158) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server id 14.3.468.0; Wed, 13 May 2020 16:55:16 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V5 1/6] MdePkg: Add new CPER Notification types Date: Wed, 13 May 2020 16:55:10 -0400 Message-ID: <20200513205515.56044-2-oleksiyy@ami.com> In-Reply-To: <20200513205515.56044-1-oleksiyy@ami.com> References: <20200513205515.56044-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsWyRiBhgu6DuD1xBuc3iFrMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZkx98Ec5oKJ IhUHFi5kbmC8JNDFyMkhIWAican/MXsXIxeHkMAuJolpi2ayQjhbGCUm/37KBlLFJqApceDY FEYQW0RASmLKgZlMIDazwGFGiY5PYHFhAXuJt6cnsIPYLAKqEgceTWMBsXkFTCWmHn7PBLFN Q2LamrtANgcHp4CZxNTVpiBhIaCSU6/mMUGUC0qcnPmEBWK8hMTBFy+YIWpkJdqOP2efwMg/ C0nZLCRlCxiZVjEKJZbk5CZm5qSXG+ol5mbqJefnbmKExN+mHYwtF80PMTJxMB5ilOBgVhLh 9Vu/O06INyWxsiq1KD++qDQntfgQoxPQ/ROZpbhBAQiMkXhjAwMpURjH0MTMxNzI3NDSxNzY WEmcd/LaNXFCAunAmM1OTS1ILYIZwsTBKdXAOH33Z/fDU2STO1jMpmfPWruF7/FC+YXytsax R2f0/Gws0/mZcZp1pcKfkG3rT/EdN5y060o+l3PGmnkii45KH9iqI9m4ftvPqcn6l+KeyG2w ndpauk708Wq2fumbCXcnZIaJnZ2j+qZh/+d9+5OOS5fua2SavvST/qK0ggCF8hbRl2EpHbXt 15VYijMSDbWYi4oTAWM1SEvUAgAA Precedence: Bulk List-Unsubscribe: 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,oleksiyy@ami.com X-Gm-Message-State: HIsfitalMTH3QeeYmkZXhkT4x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589403362; bh=UTWRP22bXURZWeJTvDiMkdexg0Sm73+w8c2PahjVMZE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=xJakAyuTwn9CMIpwPagNqj7fVJocG4N14arNj9LaXfLEXxYbUDO/E2tBzMhVqteyr+S 6+ShM0HNY90o/y9Ru83nUMUuuHSgeO1kfQ+J2stvghUvtxzcUWMH+AaZ9pD5q0KeX97Um X7vAjnAPA6zoxz/8LiLUGibcC+Fin7OpSOM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add SEA, SEI, and PEI CPER Notification types defined in UEFI 2.8 errata a. (UEFI 2.8 errata a, mantis 2026) Signed-off-by: Oleksiy Yakovlev Reviewed-by: Liming Gao --- MdePkg/Include/Guid/Cper.h | 15 +++++++++++++++ MdePkg/MdePkg.dec | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/MdePkg/Include/Guid/Cper.h b/MdePkg/Include/Guid/Cper.h index 0cacd30..948f586 100644 --- a/MdePkg/Include/Guid/Cper.h +++ b/MdePkg/Include/Guid/Cper.h @@ -95,6 +95,18 @@ typedef struct { { \ 0x667DD791, 0xC6B3, 0x4c27, { 0x8A, 0x6B, 0x0F, 0x8E, 0x72, 0x2D, 0xEB= , 0x41 } \ } +#define EFI_EVENT_NOTIFICATION_TYPE_DMAR_SEA \ + { \ + 0x9A78788A, 0xBBE8, 0x11E4, { 0x80, 0x9E, 0x67, 0x61, 0x1E, 0x5D, 0x46= , 0xB0 } \ + } +#define EFI_EVENT_NOTIFICATION_TYPE_DMAR_SEI \ + { \ + 0x5C284C81, 0xB0AE, 0x4E87, { 0xA3, 0x22, 0xB0, 0x4C, 0x85, 0x62, 0x43= , 0x23 } \ + } +#define EFI_EVENT_NOTIFICATION_TYPE_DMAR_PEI \ + { \ + 0x09A9D5AC, 0x5204, 0x4214, { 0x96, 0xE5, 0x94, 0x99, 0x2E, 0x75, 0x2B= , 0xCD } \ + } ///@} =20 /// @@ -1207,6 +1219,9 @@ extern EFI_GUID gEfiEventNotificationTypeInitGuid; extern EFI_GUID gEfiEventNotificationTypeNmiGuid; extern EFI_GUID gEfiEventNotificationTypeBootGuid; extern EFI_GUID gEfiEventNotificationTypeDmarGuid; +extern EFI_GUID gEfiEventNotificationTypeSeaGuid; +extern EFI_GUID gEfiEventNotificationTypeSeiGuid; +extern EFI_GUID gEfiEventNotificationTypePeiGuid; =20 extern EFI_GUID gEfiProcessorGenericErrorSectionGuid; extern EFI_GUID gEfiProcessorSpecificErrorSectionGuid; diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 86545ac..5ac1189 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -437,6 +437,15 @@ gEfiEventNotificationTypeDmarGuid =3D { 0x667DD791, 0xC6B3, 0x4c27, { 0= x8A, 0x6B, 0x0F, 0x8E, 0x72, 0x2D, 0xEB, 0x41 }} =20 ## Include/Guid/Cper.h + gEfiEventNotificationTypeSeaGuid =3D { 0x9A78788A, 0xBBE8, 0x11E4, { 0= x80, 0x9E, 0x67, 0x61, 0x1E, 0x5D, 0x46, 0xB0 }} + + ## Include/Guid/Cper.h + gEfiEventNotificationTypeSeiGuid =3D { 0x5C284C81, 0xB0AE, 0x4E87, { 0= xA3, 0x22, 0xB0, 0x4C, 0x85, 0x62, 0x43, 0x23 }} + + ## Include/Guid/Cper.h + gEfiEventNotificationTypePeiGuid =3D { 0x09A9D5AC, 0x5204, 0x4214, { 0= x96, 0xE5, 0x94, 0x99, 0x2E, 0x75, 0x2B, 0xCD }} + + ## Include/Guid/Cper.h gEfiProcessorGenericErrorSectionGuid =3D { 0x9876ccad, 0x47b4, 0x4bdb, = { 0xb6, 0x5e, 0x16, 0xf1, 0x93, 0xc4, 0xf3, 0xdb }} =20 ## Include/Guid/Cper.h --=20 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprieta= ry 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 telephon= e at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=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 (#59460): https://edk2.groups.io/g/devel/message/59460 Mute This Topic: https://groups.io/mt/74191738/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- From nobody Wed May 8 23:06:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59461+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59461+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589403363; cv=none; d=zohomail.com; s=zohoarc; b=CmdUN1mFsP8V2rC6HGzqEYM+jKfCVsxZLHEG+YK+bZtfDJIKkadVFemlXNfnfZ6EGW7m0V7/VNjXzGxUXBr2RjS4RCZJT3KHaB5jzFKS7J1c54XpkUpSUrikVBJ9IqY+AFYBjJVYyKQxEARACkrSuADu/JTLuEFFmiH8UlezqXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589403363; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=+KFwollZA4Yuy21FlDDrKhgwMF9/GR7MG+xPDDx2OiQ=; b=VYdsZvWix2STuvmwhyjQ+F9NPobnGvWPCBGFm7cTVTD+htufn67qP8yUOQzl3nXeNv22OA79Hxke9se8+iWnwRB0VoPIvtaGlBb+G5lvDF5MTQecL6L2x4JE2HGp9fUxsLxPTcklYXUTKBP+/viPBHd4oB7T5mXEZGSHO1GMo+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59461+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589403363219382.96614612717553; Wed, 13 May 2020 13:56:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id R4zaYY1788612xBfifhLnSRo; Wed, 13 May 2020 13:56:02 -0700 X-Received: from atlmailgw2.ami.com (atlmailgw2.ami.com []) by mx.groups.io with SMTP id smtpd.web12.94.1589403360768430673 for ; Wed, 13 May 2020 13:56:02 -0700 X-AuditID: ac10606f-05fff70000001b62-1e-5ebc5ee0b9e1 X-Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw2.ami.com (Symantec Messaging Gateway) with SMTP id 7C.24.07010.0EE5CBE5; Wed, 13 May 2020 16:56:00 -0400 (EDT) X-Received: from Oleksiy77.us.megatrends.com (172.16.97.158) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server id 14.3.468.0; Wed, 13 May 2020 16:55:18 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V5 2/6] MdePkg: Fix OUT parameters marked as IN OUT Date: Wed, 13 May 2020 16:55:11 -0400 Message-ID: <20200513205515.56044-3-oleksiyy@ami.com> In-Reply-To: <20200513205515.56044-1-oleksiyy@ami.com> References: <20200513205515.56044-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAIsWRmVeSWpSXmKPExsWyRiBhgu6DuD1xBq/uWFnMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZlx9+IpxoJ9 ERUdO+saGNttuxg5OSQETCRub7/N2MXIxSEksItJYvXZPihnC6PEvnNrmEGq2AQ0JQ4cm8II YosISElMOTCTCcRmFjjMKNHxCSwuLOAsMaHnMDuIzSKgKtF74TaYzStgKjHt1g8miG0aEtPW 3AWyOTg4Bcwkpq42BQkLAZWcejWPCaJcUOLkzCcsEOMlJA6+eMEMUSMr0Xb8OfsERv5ZSMpm ISlbwMi0ilEosSQnNzEzJ73cSC8xN1MvOT93EyMk+vJ3MH78aH6IkYmD8RCjBAezkgiv3/rd cUK8KYmVValF+fFFpTmpxYcYnYDun8gsxQ0KP2CExBsbGEiJwjiGJmYm5kbmhpYm5sbGSuK8 k9auiRMSSAdGbHZqakFqEcwQJg5OqQbGmHphy9B+dc41drXmGUdPL09dXst9+82N6yU6b+Yw z/gtsGiaW7o245ozpxYv2/d+XdnWHuN3h2/kzJ0bsvXGBj5XN9mTLSXn5ysctenhu5CbzdoR 7nONa2bSqn+GT6NDzY49XDRpp9j097UpzdNWdk2ab3FuTewfhcnLuQKTHrs/PFz+LoNlphJL cUaioRZzUXEiAPRBVlHTAgAA Precedence: Bulk List-Unsubscribe: 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,oleksiyy@ami.com X-Gm-Message-State: TUlSFUoYRN14UfcnwAvL5lTix1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589403362; bh=6Rl04QBjMnfs++eK4oxiPlutRPyWWIIZ5Ix0/Q8tP4Y=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=qdLFkGq9rPweyAcJn7JCWbPMDExPNIdH+lOiY1f9DVLRGIcdM5ziezl3GoPpVjNzsno S+s95ZpE52tUkLRpuXVEnXE/ApTRCesnTrXZN/AjkDDob8Y3xxXUj0LJuZNmDmvd8P6cH pllUEcuuZW4wzD67127QMlnmmJY1qdGzt8k= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some OUT parameters in the specification were mistakenly marked as IN OUT. "IN OUT" replaced with "OUT" in the following interfaces EFI_BOOT_SERVICES.GetMemoryMap():MemoryMap EFI_BOOT_SERVICES.LocateHandleBuffer():NoHandles EFI_SIMPLE_POINTER_PROTOCOL.GetState():State EFI_ABSOLUTE_POINTER_PROTOCOL.GetState():State EFI_EDID_OVERRIDE_PROTOCOL.GetEdid():EdidSize and Edid EFI_ATA_PASS_THRU_PROTOCOL.BuildDevicePath():DevicePath EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL.BuildDevicePath():DevicePath EFI_SD_MMC_PASS_THRU_PROTOCOL.BuildDevicePath():DevicePath EFI_EXT_SCSI_PASS_THRU_PROTOCOL.BuildDevicePath():DevicePath EFI_FIRMWARE_MANAGEMENT_PROTOCOL.GetImage():Image (UEFI 2.8 errata a, mantis 2035) Signed-off-by: Oleksiy Yakovlev Reviewed-by: Liming Gao --- MdePkg/Include/Protocol/AbsolutePointer.h | 2 +- MdePkg/Include/Protocol/AtaPassThru.h | 4 ++-- MdePkg/Include/Protocol/EdidOverride.h | 4 ++-- MdePkg/Include/Protocol/FirmwareManagement.h | 4 ++-- MdePkg/Include/Protocol/NvmExpressPassthru.h | 4 ++-- MdePkg/Include/Protocol/ScsiPassThruExt.h | 2 +- MdePkg/Include/Protocol/SdMmcPassThru.h | 4 ++-- MdePkg/Include/Protocol/SimplePointer.h | 2 +- MdePkg/Include/Uefi/UefiSpec.h | 8 ++++---- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MdePkg/Include/Protocol/AbsolutePointer.h b/MdePkg/Include/Pro= tocol/AbsolutePointer.h index 77d34ae..d59ac97 100644 --- a/MdePkg/Include/Protocol/AbsolutePointer.h +++ b/MdePkg/Include/Protocol/AbsolutePointer.h @@ -169,7 +169,7 @@ typedef EFI_STATUS (EFIAPI *EFI_ABSOLUTE_POINTER_GET_STATE)( IN EFI_ABSOLUTE_POINTER_PROTOCOL *This, - IN OUT EFI_ABSOLUTE_POINTER_STATE *State + OUT EFI_ABSOLUTE_POINTER_STATE *State ); =20 =20 diff --git a/MdePkg/Include/Protocol/AtaPassThru.h b/MdePkg/Include/Protoco= l/AtaPassThru.h index ce6f57f..888dff2 100644 --- a/MdePkg/Include/Protocol/AtaPassThru.h +++ b/MdePkg/Include/Protocol/AtaPassThru.h @@ -315,7 +315,7 @@ EFI_STATUS @param[in] PortMultiplierPort The port multiplier port number of th= e ATA device for which a device path node is to be allocated a= nd built. If there is no port multiplier, then specify 0xFFFF. - @param[in,out] DevicePath A pointer to a single device path nod= e that describes the ATA + @param[out] DevicePath A pointer to a single device path nod= e that describes the ATA device specified by Port and PortMult= iplierPort. This function is responsible for allocating the buf= fer DevicePath with the boot service AllocatePool(). It is th= e caller's responsibility @@ -334,7 +334,7 @@ EFI_STATUS IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN UINT16 PortMultiplierPort, - IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath ); =20 /** diff --git a/MdePkg/Include/Protocol/EdidOverride.h b/MdePkg/Include/Protoc= ol/EdidOverride.h index 9036f8b..709ee48 100644 --- a/MdePkg/Include/Protocol/EdidOverride.h +++ b/MdePkg/Include/Protocol/EdidOverride.h @@ -44,8 +44,8 @@ EFI_STATUS IN EFI_EDID_OVERRIDE_PROTOCOL *This, IN EFI_HANDLE *ChildHandle, OUT UINT32 *Attributes, - IN OUT UINTN *EdidSize, - IN OUT UINT8 **Edid + OUT UINTN *EdidSize, + OUT UINT8 **Edid ); =20 /// diff --git a/MdePkg/Include/Protocol/FirmwareManagement.h b/MdePkg/Include/= Protocol/FirmwareManagement.h index 297bb5f..b501261 100644 --- a/MdePkg/Include/Protocol/FirmwareManagement.h +++ b/MdePkg/Include/Protocol/FirmwareManagement.h @@ -345,7 +345,7 @@ EFI_STATUS @param[in] This A pointer to the EFI_FIRMWARE_MANAGEMENT_= PROTOCOL instance. @param[in] ImageIndex A unique number identifying the firmware = image(s) within the device. The number is between 1 and DescriptorCou= nt. - @param[in, out] Image Points to the buffer where the current im= age is copied to. + @param[out] Image Points to the buffer where the current im= age is copied to. @param[in, out] ImageSize On entry, points to the size of the buffe= r pointed to by Image, in bytes. On return, points to the length of the im= age, in bytes. =20 @@ -364,7 +364,7 @@ EFI_STATUS (EFIAPI *EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_IMAGE)( IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *This, IN UINT8 ImageIndex, - IN OUT VOID *Image, + OUT VOID *Image, IN OUT UINTN *ImageSize ); =20 diff --git a/MdePkg/Include/Protocol/NvmExpressPassthru.h b/MdePkg/Include/= Protocol/NvmExpressPassthru.h index 7420924..870b9b5 100644 --- a/MdePkg/Include/Protocol/NvmExpressPassthru.h +++ b/MdePkg/Include/Protocol/NvmExpressPassthru.h @@ -214,7 +214,7 @@ EFI_STATUS @param[in] NamespaceId The NVM Express namespace ID for whi= ch a device path node is to be allocated and built. Caller must set = the NamespaceId to zero if the device path node will contain a valid= UUID. - @param[in,out] DevicePath A pointer to a single device path nod= e that describes the NVM Express + @param[out] DevicePath A pointer to a single device path nod= e that describes the NVM Express namespace specified by NamespaceId. T= his function is responsible for allocating the buffer DevicePath with= the boot service AllocatePool(). It is the caller's responsibility to = free DevicePath when the caller @@ -231,7 +231,7 @@ EFI_STATUS (EFIAPI *EFI_NVM_EXPRESS_PASS_THRU_BUILD_DEVICE_PATH)( IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This, IN UINT32 NamespaceId, - IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath ); =20 /** diff --git a/MdePkg/Include/Protocol/ScsiPassThruExt.h b/MdePkg/Include/Pro= tocol/ScsiPassThruExt.h index c83da26..994fbba 100644 --- a/MdePkg/Include/Protocol/ScsiPassThruExt.h +++ b/MdePkg/Include/Protocol/ScsiPassThruExt.h @@ -259,7 +259,7 @@ EFI_STATUS IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This, IN UINT8 *Target, IN UINT64 Lun, - IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath ); =20 /** diff --git a/MdePkg/Include/Protocol/SdMmcPassThru.h b/MdePkg/Include/Proto= col/SdMmcPassThru.h index 3db6a3e..ac5470b 100644 --- a/MdePkg/Include/Protocol/SdMmcPassThru.h +++ b/MdePkg/Include/Protocol/SdMmcPassThru.h @@ -164,7 +164,7 @@ EFI_STATUS @param[in] This A pointer to the EFI_SD_MMMC_PASS_THRU_PRO= TOCOL instance. @param[in] Slot Specifies the slot number of the SD card f= or which a device path node is to be allocated and built. - @param[in,out] DevicePath A pointer to a single device path node tha= t describes the SD + @param[out] DevicePath A pointer to a single device path node tha= t describes the SD card specified by Slot. This function is r= esponsible for allocating the buffer DevicePath with the = boot service AllocatePool(). It is the caller's respons= ibility to free @@ -182,7 +182,7 @@ EFI_STATUS (EFIAPI *EFI_SD_MMC_PASS_THRU_BUILD_DEVICE_PATH) ( IN EFI_SD_MMC_PASS_THRU_PROTOCOL *This, IN UINT8 Slot, - IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath ); =20 /** diff --git a/MdePkg/Include/Protocol/SimplePointer.h b/MdePkg/Include/Proto= col/SimplePointer.h index 2f5a940..c631414 100644 --- a/MdePkg/Include/Protocol/SimplePointer.h +++ b/MdePkg/Include/Protocol/SimplePointer.h @@ -109,7 +109,7 @@ typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_POINTER_GET_STATE)( IN EFI_SIMPLE_POINTER_PROTOCOL *This, - IN OUT EFI_SIMPLE_POINTER_STATE *State + OUT EFI_SIMPLE_POINTER_STATE *State ); =20 /// diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h index 8ffaf97..455123f 100644 --- a/MdePkg/Include/Uefi/UefiSpec.h +++ b/MdePkg/Include/Uefi/UefiSpec.h @@ -211,7 +211,7 @@ EFI_STATUS On output, it is the size of the = buffer returned by the firmware if the buffer was large enough, or t= he size of the buffer needed to contain the map if the buffer was too sma= ll. - @param[in, out] MemoryMap A pointer to the buffer in which = firmware places the current memory + @param[out] MemoryMap A pointer to the buffer in which = firmware places the current memory map. @param[out] MapKey A pointer to the location in whic= h firmware returns the key for the current memory map. @@ -232,7 +232,7 @@ typedef EFI_STATUS (EFIAPI *EFI_GET_MEMORY_MAP)( IN OUT UINTN *MemoryMapSize, - IN OUT EFI_MEMORY_DESCRIPTOR *MemoryMap, + OUT EFI_MEMORY_DESCRIPTOR *MemoryMap, OUT UINTN *MapKey, OUT UINTN *DescriptorSize, OUT UINT32 *DescriptorVersion @@ -1556,7 +1556,7 @@ EFI_STATUS @param[in] Protocol Provides the protocol to search by. This parameter is only valid for a SearchT= ype of ByProtocol. @param[in] SearchKey Supplies the search key depending on the S= earchType. - @param[in, out] NoHandles The number of handles returned in Buffer. + @param[out] NoHandles The number of handles returned in Buffer. @param[out] Buffer A pointer to the buffer to return the requ= ested array of handles that support Protocol. =20 @@ -1574,7 +1574,7 @@ EFI_STATUS IN EFI_LOCATE_SEARCH_TYPE SearchType, IN EFI_GUID *Protocol, OPTIONAL IN VOID *SearchKey, OPTIONAL - IN OUT UINTN *NoHandles, + OUT UINTN *NoHandles, OUT EFI_HANDLE **Buffer ); =20 --=20 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprieta= ry 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 telephon= e at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=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 (#59461): https://edk2.groups.io/g/devel/message/59461 Mute This Topic: https://groups.io/mt/74191739/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- From nobody Wed May 8 23:06:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59462+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59462+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589403363; cv=none; d=zohomail.com; s=zohoarc; b=FqVgVsRM2fsa2Hg7FhzQrxqLOLG5VeDBn/ixnO9OwO9LDZYQ3bgu6XZvYEaGo1daBr3r+LMJyyWGvJB/woJQLuNJtBLh9W1wvAX20/05vyIYZhcuosA07aSFhqjfuKgJeeSd0ulpvn/Ymfd5u881DyrF1u7yljAEHLEk76gGNpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589403363; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=LIZAHammyXg7El4NxF882sc3FRYvQQdb4+KcK8CSr5E=; b=Mn9fIg4Qjuf6/ll2XYv3AxPoeWvLAnwXnSee/gF5wHPsbmOo4xakeXRbKSs5WlNyQthx6xnLiQs9OxjZ3tFxbX4ZDFWbOqHOPxsgmKOcVnx4NrKGolgfj23t+FFjshpWIheY0t6M+fL25wdAu/pY2R4Wk/qlYYKa5aVwRt4CVMw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59462+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589403363942210.78371480182318; Wed, 13 May 2020 13:56:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id evosYY1788612xVV16RynCvJ; Wed, 13 May 2020 13:56:03 -0700 X-Received: from atlmailgw1.ami.com (atlmailgw1.ami.com []) by mx.groups.io with SMTP id smtpd.web10.101.1589403361526785822 for ; Wed, 13 May 2020 13:56:03 -0700 X-AuditID: ac1060b2-0f7ff700000018d4-d4-5ebc5ee2e364 X-Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw1.ami.com (Symantec Messaging Gateway) with SMTP id C1.25.06356.2EE5CBE5; Wed, 13 May 2020 16:56:02 -0400 (EDT) X-Received: from Oleksiy77.us.megatrends.com (172.16.97.158) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server id 14.3.468.0; Wed, 13 May 2020 16:55:19 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V5 3/6] MdePkg: Add EFI_RT_PROPERTIES_TABLE Date: Wed, 13 May 2020 16:55:12 -0400 Message-ID: <20200513205515.56044-4-oleksiyy@ami.com> In-Reply-To: <20200513205515.56044-1-oleksiyy@ami.com> References: <20200513205515.56044-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsWyRiBhgu6juD1xBuseaVnMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZnRNO8WS8Ee uYonj3exNDA2SXQxcnJICJhI3HzylrmLkYtDSGAXk8Sh42tYIZwtjBI3+1eygVSxCWhKHDg2 hRHEFhGQkphyYCYTiM0scJhRouMTWFxYwFpi7853zCA2i4CqxK3tHWA2r4CpxM2GHlaIbRoS 09bcBerl4OAUMJOYutoUJCwEVHLq1TwmiHJBiZMzn7BAjJeQOPjiBTNEjaxE2/Hn7BMY+Wch KZuFpGwBI9MqRqHEkpzcxMyc9HJDvcTcTL3k/NxNjJD427SDseWi+SFGJg7GQ4wSHMxKIrx+ 63fHCfGmJFZWpRblxxeV5qQWH2J0Arp/IrMUNygAgTESb2xgICUK4xiamJmYG5kbWpqYGxsr ifNOXrsmTkggHRiz2ampBalFMEOYODilGhjtVNVldu42WN+zsTZ72/sy20d/fc969+z3EKhW dfFzDJ08IW+WJ0dM6/SZv/p+/f9k9lt96RX3ImXGbyafz4jf8d21RrV4a5L0Y9tpD0Sln+/n ZPq82vT98pYd/wJOJOdrn5zvoSnF2eRYGlV8+fWzHYu2Xz9Zybdi4uTlcoK+ytXaE2anhG9X YinOSDTUYi4qTgQA6uAyr9QCAAA= Precedence: Bulk List-Unsubscribe: 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,oleksiyy@ami.com X-Gm-Message-State: 6o3NcyGHARqhaUbDzkU3Zq5yx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589403363; bh=w+WvJEQ+J/hjNT26CUVIY+yEG7m5nSVo58qDw8o1PQo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=eGaHgScuMJravLgWXhVBkdVv70YXdMZR3O3XiU/P0UrmgCbo5y2sEX3hVNLuvTie4Xa D/xmyoG5p+8KusDO/zXrCDncc2FtUQEuLcnO8d+xpAoJ5caxi8bo0SbUt3xE3PNam+UHk dTqKhTZQX6I1T8nLi+YgIq1wnwYUBjB2qIY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Define Guid & data structure for EFI_RT_PROPERTIES_TABLE, designed to be published by a platform if it no longer supports all EFI runtime services once ExitBootServices() has been called by the OS. (UEFI 2.8 errata a, mantis 2049) Signed-off-by: Oleksiy Yakovlev Reviewed-by: Liming Gao --- MdePkg/Include/Guid/RtPropertiesTable.h | 69 +++++++++++++++++++++++++++++= ++++ MdePkg/MdePkg.dec | 5 +++ 2 files changed, 74 insertions(+) create mode 100644 MdePkg/Include/Guid/RtPropertiesTable.h diff --git a/MdePkg/Include/Guid/RtPropertiesTable.h b/MdePkg/Include/Guid/= RtPropertiesTable.h new file mode 100644 index 0000000..6b6a1a1 --- /dev/null +++ b/MdePkg/Include/Guid/RtPropertiesTable.h @@ -0,0 +1,69 @@ +/** @file +Guid & data structure for EFI_RT _PROPERTIES_TABLE, designed to be publish= ed by a +platform if it no longer supports all EFI runtime services once ExitBootS= ervices() +has been called by the OS. Introduced in UEFI 2.8a. + + +Copyright (c) 2020, American Megatrends International LLC. All rights rese= rved.
+SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef __RT_PROPERTIES_TABLE_GUID_H__ +#define __RT_PROPERTIES_TABLE_GUID_H__ + +// +// Table, defined here, should be published by a platform if it no longer = supports all EFI runtime +// services once ExitBootServices() has been called by the OS. Note that t= his is merely a hint +// to the OS, which it is free to ignore, and so the platform is still req= uired to provide callable +// implementations of unsupported runtime services that simply return EFI_= UNSUPPORTED. +// +#define EFI_RT_PROPERTIES_TABLE_GUID \ + { 0xeb66918a, 0x7eef, 0x402a, \ + { 0x84, 0x2e, 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9 }} + + + + +#pragma pack(1) + +typedef struct { + /// + /// Version of the structure, must be 0x1. + /// + UINT16 Version; + + /// + /// Size in bytes of the entire EFI_RT_PROPERTIES_TABLE, must be 8. + /// + UINT16 Length; + + /// + /// Bitmask of which calls are or are not supported, where a bit set to = 1 indicates + /// that the call is supported, and 0 indicates that it is not. + /// + UINT32 RuntimeServicesSupported; +} EFI_RT_PROPERTIES_TABLE; + +#pragma pack() + +#define EFI_RT_PROPERTIES_TABLE_VERSION 0x1 + +#define EFI_RT_SUPPORTED_GET_TIME 0x0001 +#define EFI_RT_SUPPORTED_SET_TIME 0x0002 +#define EFI_RT_SUPPORTED_GET_WAKEUP_TIME 0x0004 +#define EFI_RT_SUPPORTED_SET_WAKEUP_TIME 0x0008 +#define EFI_RT_SUPPORTED_GET_VARIABLE 0x0010 +#define EFI_RT_SUPPORTED_GET_NEXT_VARIABLE_NAME 0x0020 +#define EFI_RT_SUPPORTED_SET_VARIABLE 0x0040 +#define EFI_RT_SUPPORTED_SET_VIRTUAL_ADDRESS_MAP 0x0080 +#define EFI_RT_SUPPORTED_CONVERT_POINTER 0x0100 +#define EFI_RT_SUPPORTED_GET_NEXT_HIGH_MONOTONIC_COUNT 0x0200 +#define EFI_RT_SUPPORTED_RESET_SYSTEM 0x0400 +#define EFI_RT_SUPPORTED_UPDATE_CAPSULE 0x0800 +#define EFI_RT_SUPPORTED_QUERY_CAPSULE_CAPABILITIES 0x1000 +#define EFI_RT_SUPPORTED_QUERY_VARIABLE_INFO 0x2000 + +extern EFI_GUID gEfiRtPropertiesTableGuid; + +#endif diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 5ac1189..2bbf387 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -654,6 +654,11 @@ ## Include/Guid/Btt.h gEfiBttAbstractionGuid =3D { 0x18633bfc, 0x1735, 0x4217, { 0x8a,= 0xc9, 0x17, 0x23, 0x92, 0x82, 0xd3, 0xf8 }} =20 + # GUIDs defined in UEFI2.8a + # + ## Include/Guid/RtPropertiesTable.h + gEfiRtPropertiesTableGuid =3D { 0xeb66918a, 0x7eef, 0x402a, { 0x84,= 0x2e, 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9 }} + # # GUID defined in PI1.0 # --=20 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprieta= ry 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 telephon= e at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=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 (#59462): https://edk2.groups.io/g/devel/message/59462 Mute This Topic: https://groups.io/mt/74191740/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- From nobody Wed May 8 23:06:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59463+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59463+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589403365; cv=none; d=zohomail.com; s=zohoarc; b=V593jLClh9rF6tcE9EydLK3RndvS0IEI4ZI4evmD5Ucun+cHSO/Ru2FbxWTmfJ4MgDAhvT2RHdLPrHBxKdKfl5y9tHUR5YfDd50NJLfVnYojvFWSd4gi8poOflwJw30O6A1/b4aE4/wBm7CboDsAKTFuWDrlph3MxOfMzL5uCpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589403365; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=irHNwEaXBYIQGYlWbLSOTgTmFZVjUptl+qxZYpo86Ao=; b=iOsq4O1hgtIGNU3reTh4Z9NqfrKNQlmLFglsf5Lmo5Ichv4vNc5n+pUaE23Ewn1wggwkwEok3Z/+JazvSUccBv8jpLC3SaPU3eDoAPuQveDWK+jh37oJS7DzxYefV/G+f2bbutOLBY5SMqFDjaCyaGVmG3Rlty6dXj9XTEwAZCk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59463+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589403365115681.5419489739176; Wed, 13 May 2020 13:56:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id vSyMYY1788612x9pnc7kflyB; Wed, 13 May 2020 13:56:04 -0700 X-Received: from atlmailgw2.ami.com (atlmailgw2.ami.com []) by mx.groups.io with SMTP id smtpd.web12.94.1589403360768430673 for ; Wed, 13 May 2020 13:56:04 -0700 X-AuditID: ac10606f-049ff70000001b62-21-5ebc5ee27245 X-Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw2.ami.com (Symantec Messaging Gateway) with SMTP id 1D.24.07010.3EE5CBE5; Wed, 13 May 2020 16:56:03 -0400 (EDT) X-Received: from Oleksiy77.us.megatrends.com (172.16.97.158) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server id 14.3.468.0; Wed, 13 May 2020 16:55:20 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V5 4/6] MdePkg: Add FMP Capsule Image Header extension Date: Wed, 13 May 2020 16:55:13 -0400 Message-ID: <20200513205515.56044-5-oleksiyy@ami.com> In-Reply-To: <20200513205515.56044-1-oleksiyy@ami.com> References: <20200513205515.56044-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsWyRiBhgu7juD1xBu82iljMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZlxectWxoLH 3BXzW56yNTD+5uxi5OSQEDCR+Ld3PmMXIxeHkMAuJolvG5ezgiSEBLYwSjSvyQCx2QQ0JQ4c m8IIYosISElMOTCTCcRmFjjMKNHxCSwuLOAm8WTlL5YuRg4OFgFVifYzcSBhXgFTiUlHHrJA 7NKQmLbmLhNICaeAmcTU1aYQm0wlTr2axwRRLihxcuYTFojpEhIHX7xghqiRlWg7/px9AiP/ LCRls5CULWBkWsUolFiSk5uYmZNebqSXmJupl5yfu4kREnv5Oxg/fjQ/xMjEwXiIUYKDWUmE 12/97jgh3pTEyqrUovz4otKc1OJDjE5A509kluIGBR8wPuKNDQykRGEcQxMzE3Mjc0NLE3Nj YyVx3klr18QJCaQD4zU7NbUgtQhmCBMHp1QDYyHbo/ess5fMfZK1acFS4QT/SWoCyy79Djq4 clb26uKVy9ln5ve9LJ+1Q9D467JVJrnaf9Q3rc/OtVHg2XQqYmnunM/X+77XvDwq3VP/5G4I W+6Dsp7tVzXPcZz8//FaitiRS6Vx25bEBSvVG7vUmU+73XaPe/+xKK4Th8xONKnN5jyjxHO8 nlmJpTgj0VCLuag4EQBclh8C0gIAAA== Precedence: Bulk List-Unsubscribe: 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,oleksiyy@ami.com X-Gm-Message-State: UqBlSxj9Ajh6abixKDagwWFHx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589403364; bh=cD7X3VItbLWzQ7unwsKOnVJVuTpDhfk3bht31TOz7hY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=hOnqPrzYH0hnKd8sNxISkaa+fYW0i0c+5hk945vo/ItryNRqppQVrjQRVlxWxgsKEje 6o8mIxsG58kpNh7XLEGobWbkSLwe6+I68S7Yp+t/hm++s/Djc8y7iFK6uMYPyMEDLG2Xu G8LtjlJD7xUeupqDFXKZF7AmvL/HGgx5RN0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add bitmask to structure which gives a binary-inspectable mechanism to determine if a capsule contains an authentication section or depex section. (UEFI 2.8 errata a, mantis 2026) Signed-off-by: Oleksiy Yakovlev Reviewed-by: Liming Gao --- MdePkg/Include/Guid/FmpCapsule.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/MdePkg/Include/Guid/FmpCapsule.h b/MdePkg/Include/Guid/FmpCaps= ule.h index fb8c346..bd5cb77 100644 --- a/MdePkg/Include/Guid/FmpCapsule.h +++ b/MdePkg/Include/Guid/FmpCapsule.h @@ -79,13 +79,22 @@ typedef struct { /// therefore can be modified without changing the Auth data. /// UINT64 UpdateHardwareInstance; + + /// + /// A 64-bit bitmask that determines what sections are added to the payl= oad. + /// #define CAPSULE_SUPPORT_AUTHENTICATION 0x0000000000000001 + /// #define CAPSULE_SUPPORT_DEPENDENCY 0x0000000000000002 + /// + UINT64 ImageCapsuleSupport; } EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER; =20 #pragma pack() =20 =20 #define EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION 0x000000= 01 -#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION 0x000000= 02 +#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION 0x000000= 03 +#define CAPSULE_SUPPORT_AUTHENTICATION 0x0000000000000001 +#define CAPSULE_SUPPORT_DEPENDENCY 0x0000000000000002 =20 extern EFI_GUID gEfiFmpCapsuleGuid; =20 --=20 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprieta= ry 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 telephon= e at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=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 (#59463): https://edk2.groups.io/g/devel/message/59463 Mute This Topic: https://groups.io/mt/74191741/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- From nobody Wed May 8 23:06:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59465+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59465+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589403368; cv=none; d=zohomail.com; s=zohoarc; b=BeY809lbHeTgXY9Rty4yez195UAaQYS5M/RMIuCMTuVO7HWLxGIfUa/4B0rFH4N523Owar/3Wa7zPxtMiHegkU8XXJC4iH/T7CnFg012lrhcIaQlEHv7bCqVI+hSyIb4BFBD7pA3AxlsIzQuOs3XgfzQ8q7+5wim7W9L9VWbLuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589403368; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=v/k69zfz41MusTxEEQRf8rP0YjWNJCgQZSuftLfzNi8=; b=CojjgMk0uMnnSHwB9jGe8zeeOJk+j0FqT/YE4227gNusypiWPtJHTk32PRtzT/UNFNNoMIkpG+UXuQxBPMHfQnaLqIopteVNmvmWSjaIgdO4jkv1Ge2OgWx57K8il3ayxHOFzgOCevOecP7soQn7novNtp8vlJLwnvQcpJIJVlI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59465+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589403368924414.10833347461516; Wed, 13 May 2020 13:56:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id bqOhYY1788612xdVFfxk9yda; Wed, 13 May 2020 13:56:08 -0700 X-Received: from atlmailgw1.ami.com (atlmailgw1.ami.com []) by mx.groups.io with SMTP id smtpd.web10.101.1589403361526785822 for ; Wed, 13 May 2020 13:56:07 -0700 X-AuditID: ac1060b2-0f7ff700000018d4-d6-5ebc5ee48a03 X-Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw1.ami.com (Symantec Messaging Gateway) with SMTP id 52.25.06356.4EE5CBE5; Wed, 13 May 2020 16:56:05 -0400 (EDT) X-Received: from Oleksiy77.us.megatrends.com (172.16.97.158) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server id 14.3.468.0; Wed, 13 May 2020 16:55:21 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V5 5/6] MdeModulePkg: Add FMP Capsule Image Header extension Date: Wed, 13 May 2020 16:55:14 -0400 Message-ID: <20200513205515.56044-6-oleksiyy@ami.com> In-Reply-To: <20200513205515.56044-1-oleksiyy@ami.com> References: <20200513205515.56044-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsWyRiBhgu7TuD1xBotWGFnMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZkx59wzpoIm pYqmT3tYGhgPyXQxcnJICJhITOjtZe1i5OIQEtjFJHHn9VkmCGcLo8ShH4uZQarYBDQlDhyb wghiiwhISUw5MJMJxGYWOMwo0fEJLC4s4CNxd+pDVhCbRUBV4uDzVywgNq+AqcTLbe+ZILZp SExbcxfI5uDgFDCTmLraFCQsBFRy6tU8JohyQYmTM5+wQIyXkDj44gUzRI2sRNvx5+wTGPln ISmbhaRsASPTKkahxJKc3MTMnPRyQ73E3Ey95PzcTYyQ+Nu0g7HlovkhRiYOxkOMEhzMSiK8 fut3xwnxpiRWVqUW5ccXleakFh9idAK6fyKzFDcoAIExEm9sYCAlCuMYmpiZmBuZG1qamBsb K4nzTl67Jk5IIB0Ys9mpqQWpRTBDmDg4pRoYJfxvzbt8cOYjxieNj5fIhPKomXzSys02WHDB 5mDPTJfDjLoxbhPO/H5Zfphh30ttk18fFnV/F3lypT9NUOB8/qwjmtoKv9erB564nDj/5LRW bhVf9aq3Kdf+SH1kcosOMqrY/mmn/gNmS/GD+R+2OVh+NHa/fi+WU2Bpb4tJh8pevafvmZbP VGIpzkg01GIuKk4EAP1j3mnUAgAA Precedence: Bulk List-Unsubscribe: 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,oleksiyy@ami.com X-Gm-Message-State: T8pRnsKb3xLub2alOzTEIa7rx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589403368; bh=mY4Gd+Q1tMS8bDx1M+nMpHK3yDY/TopBULxJhched/Y=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=c4hPy16IYJVE8fECnIP1KVoICe1EzPsB2LsE1s31q3fP1UKAhosuexz44kBwonsMV4u YxVaonZEJgT3Uh0XFqJhyc9grSzc1mt8ZFjgrJPJh5m29C9VQBdwEMbPsOY64IoESVZlk DRln3WbtyN/rS5t97G2CzER5t7uG39XohX4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add bitmask to structure which gives a binary-inspectable mechanism to determine if a capsule contains an authentication section or depex section. (UEFI 2.8 errata a, mantis 2026) Signed-off-by: Oleksiy Yakovlev --- MdeModulePkg/Application/CapsuleApp/CapsuleDump.c | 1 + .../Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 20 ++++++++++++++++= ---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c b/MdeModuleP= kg/Application/CapsuleApp/CapsuleDump.c index 7e3e072..e3ab199 100644 --- a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c @@ -98,6 +98,7 @@ DumpFmpCapsule ( Print(L" UpdateVendorCodeSize - 0x%x\n", FmpImageHeader->UpdateVend= orCodeSize); if (FmpImageHeader->Version >=3D EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE= _HEADER_INIT_VERSION) { Print(L" UpdateHardwareInstance - 0x%lx\n", FmpImageHeader->UpdateH= ardwareInstance); + Print(L" ImageCapsuleSupport - 0x%lx\n", FmpImageHeader->ImageCapsu= leSupport); } } } diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeMod= ulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c index 5dda561..f9819a7 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c @@ -285,8 +285,10 @@ ValidateFmpCapsule ( DEBUG((DEBUG_ERROR, "ImageHeader->Version(0x%x) Unknown\n", ImageHea= der->Version)); return EFI_INVALID_PARAMETER; } - if (ImageHeader->Version < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADE= R_INIT_VERSION) { + if (ImageHeader->Version =3D=3D 1) { FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMA= GE_HEADER, UpdateHardwareInstance); + } else { + FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMA= GE_HEADER, ImageCapsuleSupport); } if (FmpImageSize < FmpImageHeaderSize) { DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) < FmpImageHeaderSize(0x%x)\= n", FmpImageSize, FmpImageHeaderSize)); @@ -521,6 +523,7 @@ DumpFmpCapsule ( DEBUG((DEBUG_VERBOSE, " UpdateVendorCodeSize - 0x%x\n", ImageHead= er->UpdateVendorCodeSize)); if (ImageHeader->Version >=3D EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HE= ADER_INIT_VERSION) { DEBUG((DEBUG_VERBOSE, " UpdateHardwareInstance - 0x%lx\n", ImageH= eader->UpdateHardwareInstance)); + DEBUG((DEBUG_VERBOSE, " ImageCapsuleSupport - 0x%lx\n", ImageHead= er->ImageCapsuleSupport)); } } } @@ -928,9 +931,14 @@ SetFmpImageData ( } else { // // If the EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER is version 1, - // Header should exclude UpdateHardwareInstance field + // Header should exclude UpdateHardwareInstance field, and + // ImageCapsuleSupport field if version is 2. // - Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAP= SULE_IMAGE_HEADER, UpdateHardwareInstance); + if (ImageHeader->Version =3D=3D 1) { + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_C= APSULE_IMAGE_HEADER, UpdateHardwareInstance); + } else { + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_C= APSULE_IMAGE_HEADER, ImageCapsuleSupport); + } } =20 if (ImageHeader->UpdateVendorCodeSize =3D=3D 0) { @@ -945,6 +953,7 @@ SetFmpImageData ( DEBUG((DEBUG_INFO, "ImageIndex - 0x%x ", ImageHeader->UpdateImageIndex)); if (ImageHeader->Version >=3D EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEAD= ER_INIT_VERSION) { DEBUG((DEBUG_INFO, "(UpdateHardwareInstance - 0x%x)", ImageHeader->Upd= ateHardwareInstance)); + DEBUG((DEBUG_INFO, "(ImageCapsuleSupport - 0x%x)", ImageHeader->ImageC= apsuleSupport)); } DEBUG((DEBUG_INFO, "\n")); =20 @@ -1239,7 +1248,10 @@ ProcessFmpCapsuleImage ( ImageHeader =3D (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UIN= T8 *)FmpCapsuleHeader + ItemOffsetList[Index]); =20 UpdateHardwareInstance =3D 0; - if (ImageHeader->Version >=3D EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HE= ADER_INIT_VERSION) { + /// + /// UpdateHardwareInstance field was added in Version 2 + /// + if (ImageHeader->Version >=3D 2) { UpdateHardwareInstance =3D ImageHeader->UpdateHardwareInstance; } =20 --=20 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprieta= ry 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 telephon= e at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=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 (#59465): https://edk2.groups.io/g/devel/message/59465 Mute This Topic: https://groups.io/mt/74191744/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- From nobody Wed May 8 23:06:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59464+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59464+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589403368; cv=none; d=zohomail.com; s=zohoarc; b=Vzwy1SdGIMBLL1/Tj3OYV03SfeFg+LqnnbetbQBCF4Y7BYvxrkrXmSacnpwLapAFjmocHvRkXTBw1GNk1OzgSLb4kVVLUaX5rx4wizL3ku9Vw32K8O68W0McclZNW3EXsi379SuaVAg4BpzuBs5SSA+hMOkOSMiem/xDTS642pI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589403368; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=gIW7fSUMzAuate/fW7LLSGajxkumPmb2a1EjqJzjv28=; b=ZN2IZxOcpUI+zjebSb5HCGMHBLuVVupErdcww1W/+kc5W7Y8KmY8sfV/bRAxbda558owRQGwsb/BLBL6/EC9VcVQSgec2yeBEAlki+1PIv+ygtLDAhF/A4jq6xOtQ/TPzTCb18OB5GEvtBQeSrGqozTM+sM1zsNTJoAQJ6O4Vpg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59464+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589403368053177.64118134364162; Wed, 13 May 2020 13:56:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ev2bYY1788612xiYcQ6s1LVS; Wed, 13 May 2020 13:56:07 -0700 X-Received: from atlmailgw2.ami.com (atlmailgw2.ami.com []) by mx.groups.io with SMTP id smtpd.web12.94.1589403360768430673 for ; Wed, 13 May 2020 13:56:07 -0700 X-AuditID: ac10606f-05fff70000001b62-24-5ebc5ee5af79 X-Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw2.ami.com (Symantec Messaging Gateway) with SMTP id ED.24.07010.5EE5CBE5; Wed, 13 May 2020 16:56:06 -0400 (EDT) X-Received: from Oleksiy77.us.megatrends.com (172.16.97.158) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server id 14.3.468.0; Wed, 13 May 2020 16:55:23 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V5 6/6] SignedCapsulePkg: Add FMP Capsule Image Header extension Date: Wed, 13 May 2020 16:55:15 -0400 Message-ID: <20200513205515.56044-7-oleksiyy@ami.com> In-Reply-To: <20200513205515.56044-1-oleksiyy@ami.com> References: <20200513205515.56044-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsWyRiBhgu6zuD1xBqtOMlnMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZmxa1kfW0Gr SMXBZVNZGxifCXQxcnJICJhILD/ZywZiCwnsYpK4d023i5ELyN7CKLHmxwdmkASbgKbEgWNT GEFsEQEpiSkHZjKB2MwChxklOj6BxYUFgiQO3fsFNIiDg0VAVaJpZwFImFfAVOLb/T+MELs0 JKatucsEUsIpYCYxdbUpxFpTiVOv5jFBlAtKnJz5hAViuoTEwRcvmCFqZCXajj9nn8DIPwtJ 2SwkZQsYmVYxCiWW5OQmZuaklxvpJeZm6iXn525ihMRe/g7Gjx/NDzEycTAeYpTgYFYS4fVb vztOiDclsbIqtSg/vqg0J7X4EKMT0PkTmaW4QcEHjI94YwMDKVEYx9DEzMTcyNzQ0sTc2FhJ nHfS2jVxQgLpwHjNTk0tSC2CGcLEwSnVwHhbe0GPSuLu/y3W3poPo9ZN1GwxmuNd8aYs4ERQ 2JRZOTYzU2vYtTcK3TgoeWMq/8mgRA+VSocNheXit/wnFZ4xN3zIOLf71jnxFjemZCcmT632 9LuG+UlG/SzTO++/rpzz6tfByYlvl82cWPCq483ML8musleKvWa71NpUbXzoF2k8471CsBJL cUaioRZzUXEiAL5iZJXSAgAA Precedence: Bulk List-Unsubscribe: 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,oleksiyy@ami.com X-Gm-Message-State: ualNQq7wCpROfEaC2CHl4fhox1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589403367; bh=nS58jNAXtRKmOFTE9+4MpmFyU0vJehygZ6OgA5HtxIM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=FnUSqhKqJhmO4N+fERSTNxT5pGkjJ5lDaEDZ3sJLcCzIb2Cf71QgZ2dIG8DMxvkgAL3 aih82tbcVHJNuW3CiiYu2Z9vIhX1HL7aWMp/H8T/P+upn9wEu837YntkyXeU8mcpZmsjU jWtUzffWUyFEJ70r4f8tJm1Yxw1kmMRBF9I= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add bitmask to structure which gives a binary-inspectable mechanism to determine if a capsule contains an authentication section or depex section. (UEFI 2.8 errata a, mantis 2026) Signed-off-by: Oleksiy Yakovlev --- .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 14 ++++++++++= ---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c index 53b821c..307060b 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c @@ -328,10 +328,11 @@ ValidateFmpCapsule ( DEBUG((DEBUG_ERROR, "ImageHeader->Version(0x%x) Unknown\n", ImageHea= der->Version)); return EFI_INVALID_PARAMETER; } - if (ImageHeader->Version < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADE= R_INIT_VERSION) { + if (ImageHeader->Version =3D=3D 1) { FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMA= GE_HEADER, UpdateHardwareInstance); + } else { + FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMA= GE_HEADER, ImageCapsuleSupport); } - // No overflow if (FmpImageSize !=3D (UINT64)FmpImageHeaderSize + (UINT64)ImageHeader= ->UpdateImageSize + (UINT64)ImageHeader->UpdateVendorCodeSize) { DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) mismatch, UpdateImageSize(0= x%x) UpdateVendorCodeSize(0x%x)\n", FmpImageSize, ImageHeader->UpdateImageS= ize, ImageHeader->UpdateVendorCodeSize)); @@ -639,9 +640,14 @@ ProcessFmpCapsuleImage ( } else { // // If the EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER is version 1,= only match ImageTypeId. - // Header should exclude UpdateHardwareInstance field + // Header should exclude UpdateHardwareInstance field. + // If version is 2 Header should exclude ImageCapsuleSupport field. // - Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_C= APSULE_IMAGE_HEADER, UpdateHardwareInstance); + if (ImageHeader->Version =3D=3D 1) { + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT= _CAPSULE_IMAGE_HEADER, UpdateHardwareInstance); + } else { + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT= _CAPSULE_IMAGE_HEADER, ImageCapsuleSupport); + } } =20 Status =3D ProcessRecoveryImage (Image, ImageHeader->UpdateImageSize); --=20 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprieta= ry 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 telephon= e at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=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 (#59464): https://edk2.groups.io/g/devel/message/59464 Mute This Topic: https://groups.io/mt/74191743/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-