From nobody Sun May 5 17:08:19 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+59380+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+59380+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589321189; cv=none; d=zohomail.com; s=zohoarc; b=B5OkE55W5cEC4WVggyMWq7Okf45suw+/cD9kaBkDf5ZKsgLUc1ZTll6s5wxzq2uvdAqBzxTffQsI8mlUuYegvMfvf6oc9ZzwMNFL0LRRNSajUY1cZcqxuq599HqvXHehW6bi8DZDyhEL/dtYISf/pt+fvFzoakrlBvRwO226vG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589321189; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=55NiEuQZCHpWwBI22KMiUkgkxO2r3QC28+TVSAN/dFk=; b=R3fq2P1asn58aUNkKF1oMWybcj9GjsUhmknXP/2r1ZhaLSlb9P2SunmSMuAdCtlrWzFgYTmA8cGc5d/6E27YcTJhFDHdEXP28oCUWNva2ad2eQbgwPGxYc4oPpPfQgPGdkXNH+xXr8w5NMMz74RUvTKuq8bAVETqy3uLl5y+DUU= 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+59380+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589321189471794.4895719231107; Tue, 12 May 2020 15:06:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id nz2FYY1788612xPwlAOhduvV; Tue, 12 May 2020 15:06:29 -0700 X-Received: from atlmailgw1.ami.com (atlmailgw1.ami.com [63.147.10.40]) by mx.groups.io with SMTP id smtpd.web12.257.1589321186492124074 for ; Tue, 12 May 2020 15:06:26 -0700 X-AuditID: ac1060b2-0e1ff700000018d4-53-5ebb1de1dfda 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 F0.73.06356.1ED1BBE5; Tue, 12 May 2020 18:06:25 -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; Tue, 12 May 2020 18:05:45 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V4 1/6] MdePkg: Add new CPER Notification types Date: Tue, 12 May 2020 18:05:38 -0400 Message-ID: <20200512220543.40008-2-oleksiyy@ami.com> In-Reply-To: <20200512220543.40008-1-oleksiyy@ami.com> References: <20200512220543.40008-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsWyRiBhgu5D2d1xBv+/K1nMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZkxc18He8FE kYo9u/+wNDBeEuhi5OSQEDCR2PxqCWMXIxeHkMAuJonuF09YQBJCAlsYJWZd8QWx2QQ0JQ4c m8IIYosISElMOTCTCcRmFjjMKNHxCSwuLGAvcePqI2YQm0VAVWLZg2usIDavgKnE456ZzBDL NCSmrbkL1sspYCbx7ekpRohdphJHHt2AqheUODkT4gZmAQmJgy9eMEPUyEq0HX/OPoGRfxaS sllIyhYwMq1iFEosyclNzMxJLzfUS8zN1EvOz93ECIm/TTsYWy6aH2Jk4mA8xCjBwawkwtuS uTNOiDclsbIqtSg/vqg0J7X4EKMT0AMTmaW4QQEIjJF4YwMDKVEYx9DEzMTcyNzQ0sTc2FhJ nHfy2jVxQgLpwJjNTk0tSC2CGcLEwSnVwNh8Y3E3/5WNe/UqOnYsm/wmI+iMEN8WpRneFxc3 nfHnmODt1sXSrCOvkBxXfDro0eWsJv1inv5feVaxu3/0v763UiYt/9Ui6b0iC9YzJC3e6Zm/ xa3o0vKj+f8MmRp/p+rfKBS4c0mu59nC3Fv1q5Mv1e6Ua1zNMfNsn+aWrqt7buxkbbD6tlaJ pTgj0VCLuag4EQBB7pzw1AIAAA== 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: O0wlYF7HRSDC4IHAVICadAfQx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589321189; bh=3E4qbdYwpMMxSo1UNm8dEKvK1zC2WvWFQ4n1iFcioCg=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=l4CATYik3Y6a9Q4epDcMARLduNdn3MVLMQZdAj9qTy2LM5hZizSQy3nZArezTO7n0qM 6wL24466d0wfwYglGJIRrjgZ1mBwQFvlaX6baYhgsZ7BWG52i98/H5EPGi8X1t3e/2PuL arNMkGm7bEtLf5Fpg2wV1dNd4HfixlW92RM= 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 0b9c4bc..ecd7822 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 (#59380): https://edk2.groups.io/g/devel/message/59380 Mute This Topic: https://groups.io/mt/74169592/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 Sun May 5 17:08:19 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+59381+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+59381+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589321189; cv=none; d=zohomail.com; s=zohoarc; b=eWKsc2A5PjfTQ8nKMfTh06WUuk1KJA/pZLecnnssCIge2sgovTJJ5MgApTsyvcA++dwdOccsiC/7RU4oTOe37hqoNftCz2+Q9J+Ye5lTPIfk9rFEmsOxM75DNHG1P61DPrpF7O54DMIbJflry7l6nRXvqViVaDbjxEhGCpNk2lk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589321189; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=krj3i5NbRfrtPkoQzK/wd44Om4S+vWg8Pc0A1wWIzh4=; b=XOvFGu1qbu/Rae63Tgx9+oavQrBTs+amItNcUeBnp2I2DnikL6b5HEEGD+9WVWuVgUHUXOLlbFguGj/PCOYqOL+hdlyCA3Dh3MF2Uj6lQrG4uejz2Of51nFMS2SZ4ZFTPdBNyJwIFFzPTiVXOE00YhhnJENWGJhaFJXMrnLoGA0= 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+59381+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589321189824396.56760015821726; Tue, 12 May 2020 15:06:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id xh9MYY1788612xMxXuCeJ9Um; Tue, 12 May 2020 15:06:29 -0700 X-Received: from atlmailgw2.ami.com (atlmailgw2.ami.com []) by mx.groups.io with SMTP id smtpd.web10.280.1589321185430648927 for ; Tue, 12 May 2020 15:06:27 -0700 X-AuditID: ac10606f-049ff70000001b62-62-5ebb1de19a7c 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 33.82.07010.1ED1BBE5; Tue, 12 May 2020 18:06:26 -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; Tue, 12 May 2020 18:05:46 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V4 2/6] MdePkg: Fix OUT parameters marked as IN OUT Date: Tue, 12 May 2020 18:05:39 -0400 Message-ID: <20200512220543.40008-3-oleksiyy@ami.com> In-Reply-To: <20200512220543.40008-1-oleksiyy@ami.com> References: <20200512220543.40008-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsWyRiBhgu4j2d1xBq0ruC3mv622aJ8wm83i 6q1fTBbzvs1gtVj30cNixb0N7BYdHf+YHNg9tn+/wOixeM9LpgCmqAZGm8S8vPySxJJUhZTU 4mRbpYCizLLE5EolhcwUWyVDJYWCnMTk1NzUvBJbpcSCgtS8FCU7LgUMYANUlpmnkJqXnJ+S mZduq+QZ7K9rYWFqqWuoZBeSkaqQmZeWX5SbWJKZn6eQnJ9XAlSdmgIUVUjo5sy4e/EUY8G+ iIqOnXUNjO22XYycHBICJhJ7nq5g6WLk4hAS2MUkcXLvX2YIZwujxJqj/xhBqtgENCUOHJsC ZosISElMOTCTCcRmFjjMKNHxCSwuLOAssaHvLVicRUBVYsuqpawgNq+AqcTUSw+YIbZpSExb cxeshlPATOLb01NgvUJANUce3YCqF5Q4OfMJC8R8CYmDL14wQ9TISrQdf84+gZF/FpKyWUjK FjAyrWIUSizJyU3MzEkvN9JLzM3US87P3cQIib/8HYwfP5ofYmTiYDzEKMHBrCTC25K5M06I NyWxsiq1KD++qDQntfgQoxPQAxOZpbhBAQiMkXhjAwMpURjH0MTMxNzI3NDSxNzYWEmcd9La NXFCAunAmM1OTS1ILYIZwsTBKdXAWHbKr4jbaWXs4q82Cx1FGFztV830Vwx4K8K9ymXWmfVX m6abSFQ99Npd9XFFyBExtXMzrZ59DNfl4vukFX38r8ndwE/KyttOfymfon3F7ePST1lLhBfJ 3Z0g1inG1PPsb4K+me+hync+J/6Ex0n+9TAUusx4Ofbg/KLIU9Z5D1R6b/Aq9BydpcRSnJFo qMVcVJwIAIym7DTUAgAA 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: 210FGqvT0HWNIHU6Xt3iTJbqx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589321189; bh=4SpMRO7zBq4EJzwHR+RWlor0IvQ9PjWU9YcdSAW7c+I=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=DEhaAoh3fLDiUdkuMBH9dnkCN2mvdkijK3TANDYbtnBZ8Wxzfqi5YVVKDTtEKPeTLGP BKgQcCMotdfYnMcehcPnEzlE1GcqbzXL0nTg1nXu+O6TepiCq9DAb45hW/fJ9Lta1lSYI CR/jKkVoNrjPwOOSt3+Np9+uNTqB+tO52ps= 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 (#59381): https://edk2.groups.io/g/devel/message/59381 Mute This Topic: https://groups.io/mt/74169593/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 Sun May 5 17:08:19 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+59382+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+59382+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589321190; cv=none; d=zohomail.com; s=zohoarc; b=VTqbm9GEsosY/0uG4g031rO5qySOnUuF8JeNt4Jq9+XM7tdPcmnYgEya0JTnwfPHy/H07ZZRhwtHg6eg3PCXON8LkwrHcAMjRqwLU3yoDcqCcyPqjI9B2q4KRbke42QhHPiwRrr/IWFX//yXly56iv58O3XOvOh2/vQub5Z8Fqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589321190; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=E2k98L4exKT6CMMrqfTPX32fct4qa87cYilmncqebc0=; b=et29frXA7XRYwpzDNuufE4e9WkCAlxaUqADvRNX0PT15Dom7TsBCDsaCs/oTym+FkEtPNrCtqGA8Ub1uDZWU1FheB8Cs1eU1/QrP84kgvGtfkoDFgGIHXU3J002Y4w26mHSxH0L9GVRAYFEBpJqSZl6tg3zJNvw4We7UZl891Lc= 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+59382+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589321190522157.6284327117428; Tue, 12 May 2020 15:06:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id eVYLYY1788612xjjU8ntV9WC; Tue, 12 May 2020 15:06:30 -0700 X-Received: from atlmailgw1.ami.com (atlmailgw1.ami.com []) by mx.groups.io with SMTP id smtpd.web12.257.1589321186492124074 for ; Tue, 12 May 2020 15:06:27 -0700 X-AuditID: ac1060b2-0f7ff700000018d4-56-5ebb1de282e2 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 71.73.06356.2ED1BBE5; Tue, 12 May 2020 18:06:27 -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; Tue, 12 May 2020 18:05:47 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V4 3/6] MdePkg: Add EFI_RT_PROPERTIES_TABLE Date: Tue, 12 May 2020 18:05:40 -0400 Message-ID: <20200512220543.40008-4-oleksiyy@ami.com> In-Reply-To: <20200512220543.40008-1-oleksiyy@ami.com> References: <20200512220543.40008-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsWyRiBhgu5j2d1xBn9ecljMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZnxYu4kpoIe uYoTdz+yNTBeF+9i5OSQEDCR+LdpPmMXIxeHkMAuJonfc56zQjhbGCUOvT/PCFLFJqApceDY FDBbREBKYsqBmUwgNrPAYUaJjk9gcWEBa4kpO+axgdgsAqoSs/b9YQexeQVMJT5ffMAIsU1D Ytqau2C9nAJmEt+engKLCwHVHHl0gxWiXlDi5MwnLBDzJSQOvnjBDFEjK9F2/Dn7BEb+WUjK ZiEpW8DItIpRKLEkJzcxMye93FAvMTdTLzk/dxMjJAI37WBsuWh+iJGJg/EQowQHs5IIb0vm zjgh3pTEyqrUovz4otKc1OJDjE5AD0xkluIGhSAwSuKNDQykRGEcQxMzE3Mjc0NLE3NjYyVx 3slr18QJCaQDozY7NbUgtQhmCBMHp1QD49RJ5YcnLPxrsuWnksDHAu3ZDhzzbZ8cKHWev0dq yd2Zdc997zjXO/S8ezI5+cGUSQ8754UKMlsIJl06H+32846bc858xfrDdVmH5y3e3dLpfKAq ItRj/5QYNbWa5vPneuV1mq9bCPMZ3z4m8PLI65vry1e+mJ+63nVZ+Vkbjup7DYv9NiZmsCix FGckGmoxFxUnAgCnDc1u1QIAAA== 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: 6Z4HYiwfwC9hfOqoDVNsZQdhx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589321190; bh=kv5Oh2rotkhbF2Cw8fiOv6iFU88VA+47zSM744m4NfE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=G/KyxRnImOr5pNhtTVVtY55ddoBkmJ9qLfpEr/9s9eSN2dXhHtagSCKbxNPIu/Lw6tg MQtjBkFn4DTpxPeeoB9P06+6TA4RBp/0BsqFb8imsH1RyfhE1tmqOaqYvNizg5NHrrk4C v9OKO0lAs4ljbql06JDufRsddn65mwjuIew= 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..1b07bf2 --- /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 ecd7822..0dd20ad 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 (#59382): https://edk2.groups.io/g/devel/message/59382 Mute This Topic: https://groups.io/mt/74169594/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 Sun May 5 17:08:19 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+59383+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+59383+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589321191; cv=none; d=zohomail.com; s=zohoarc; b=m/M2UOXYm+HXcAjcOEq5JdNmhewX/fOXWE1HN/cCAL7ygBX0knv5W998LfBqqQZ+uftHaIY6ocAUrUZH3g/OEGQGMd72H6D4Br1xZ9ClZLrF6LN4EaH35tOz+WSwgy5i1V0EQhDqfeb60QFJ+xu0GMAPoZxZG8ucCqC2OFiYr6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589321191; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=7aD81bWHDx9cS1yBnCy55p/XvuUJgySD33gyTHSEW2c=; b=gAG29gWqW3ePQdpCJlgKqQP/ztlGZk+SwVNhIbORBjL6a7fBs1kQvsr0LVsblNqIc8pMPYdW8uPXw49vU4t9EXorJX7ZJ0Lmi0X3ptKfxNLjNgmKBPgcPoLC6zWD1+snTY5GtsigaImjtAgY/byB19XeaBscq/nz0oCEv+qSNlM= 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+59383+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589321191085459.2444382707114; Tue, 12 May 2020 15:06:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tyFlYY1788612xO0YIyURDjf; Tue, 12 May 2020 15:06:30 -0700 X-Received: from atlmailgw2.ami.com (atlmailgw2.ami.com []) by mx.groups.io with SMTP id smtpd.web10.280.1589321185430648927 for ; Tue, 12 May 2020 15:06:28 -0700 X-AuditID: ac10606f-049ff70000001b62-66-5ebb1de34c06 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 C3.82.07010.3ED1BBE5; Tue, 12 May 2020 18:06:27 -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; Tue, 12 May 2020 18:05:48 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V4 4/6] MdePkg: Add FMP Capsule Image Header extension Date: Tue, 12 May 2020 18:05:41 -0400 Message-ID: <20200512220543.40008-5-oleksiyy@ami.com> In-Reply-To: <20200512220543.40008-1-oleksiyy@ami.com> References: <20200512220543.40008-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsWyRiBhgu5j2d1xBtuXG1nMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZlxectWxoLH 3BXzW56yNTD+5uxi5OSQEDCR+PzoG3sXIxeHkMAuJolNT7cxQThbGCVW/7nKBlLFJqApceDY FEYQW0RASmLKgZlMIDazwGFGiY5PYHFhATeJd6tWs4DYLAKqEpf/zATr5RUwlTj16QgjxDYN iWlr7oL1cgqYSXx7egosLgRUc+TRDVaIekGJkzOfsEDMl5A4+OIFM0SNrETb8efsExj5ZyEp m4WkbAEj0ypGocSSnNzEzJz0ciO9xNxMveT83E2MkAjM38H48aP5IUYmDsZDjBIczEoivC2Z O+OEeFMSK6tSi/Lji0pzUosPMToBPTCRWYobFILAKIk3NjCQEoVxDE3MTMyNzA0tTcyNjZXE eSetXRMnJJAOjNrs1NSC1CKYIUwcnFINjBsV33TefV/+9VPu+RiJp+dvyDlrHVj0XiYxks9/ +XkvlqQpp0MFou6u8dOcEF/r2nT7x+bfG2+9+euqHrd0429/4cylRt+/TropxCWzt/u2S7ij vcWeee96J256UxRr8ev7gb4nWy7Jm9tzXlEs+3NBP8IktVKKg5+zcuuauv+PXNa95Dn3RkCJ pTgj0VCLuag4EQD0YIK11QIAAA== 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: Tp050TwGWgg6YU8auqGbYFJvx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589321190; bh=380DpZoCSiN4L6L4Nw6nJhKg2dZJ7qxiSz/LPHZFqIc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=PR1S6HOjiphMaWNMFf/p+Ey0EEp22nX8Ydh8yDSfTLG6UzV1lrkof3zLBaIOoHA74Sq +OeE7qQbkvk0ijiPjyiYicNJD5kx14qJLBdUF0Gwm2HZM3Cct4iFJpEZDlFy5Pgd4rFfy SnzctEYgnhuqyEcsY2om1r4mYtkFLFcHQgA= 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 (#59383): https://edk2.groups.io/g/devel/message/59383 Mute This Topic: https://groups.io/mt/74169595/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 Sun May 5 17:08:19 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+59384+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+59384+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589321191; cv=none; d=zohomail.com; s=zohoarc; b=RJ33P8vLsUgkaji4FlKSngajUFhW45oX7s0X37dvczTtJg7Zsl/uErHRaHSU+eQYzix5GVxwfPE/xdSwA0sW66DIaR/E1iKSHpYevOymI4apRZv46JypdZ9/g8gGMPsoEoVEcQb8fpQ9YrLC0/jJTmiJVm3sDaHZ4W0ALb86mJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589321191; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=y5ZWSDpdXf28fCUgALH8liHQr20mxkiaW7P0ELRKq0E=; b=dscPHIA0aiCxmOVBFsmYl1Ygoou5Fds4+l8pVJfpS21ucPx6bOu+RJ1nJIBzm82LgQGlk8bYk/AVJMP6r/oTG8J3md2/cerKWBrqxRaVjtgFPQiNvxHHnfvdiquCeQhUcFbDG7EtY0PwduXJcayQ262eGeRlRn/xZhq6f6UiyC4= 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+59384+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589321191264947.9065465228153; Tue, 12 May 2020 15:06:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Wi3CYY1788612xkMCuXApsKz; Tue, 12 May 2020 15:06:30 -0700 X-Received: from atlmailgw1.ami.com (atlmailgw1.ami.com []) by mx.groups.io with SMTP id smtpd.web12.257.1589321186492124074 for ; Tue, 12 May 2020 15:06:29 -0700 X-AuditID: ac1060b2-0f7ff700000018d4-58-5ebb1de4d971 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 12.73.06356.4ED1BBE5; Tue, 12 May 2020 18:06:28 -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; Tue, 12 May 2020 18:05:49 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V4 5/6] MdeModulePkg: Add FMP Capsule Image Header extension Date: Tue, 12 May 2020 18:05:42 -0400 Message-ID: <20200512220543.40008-6-oleksiyy@ami.com> In-Reply-To: <20200512220543.40008-1-oleksiyy@ami.com> References: <20200512220543.40008-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsWyRiBhgu4T2d1xBqcumVrMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZkx59wzpoIm pYqmT3tYGhgPyXQxcnJICJhItDx6ytjFyMUhJLCLSWLlrp9QzhZGiZ6tp5hAqtgENCUOHJvC CGKLCEhJTDkwEyzOLHCYUaLjE1hcWMBHYufTLvYuRg4OFgFViZ3PU0HCvAKmEte6rrNDLNOQ mLbmLlgrp4CZxLenp8BahYBqjjy6wQpRLyhxcuYTFojxEhIHX7xghqiRlWg7/px9AiP/LCRl s5CULWBkWsUolFiSk5uYmZNebqiXmJupl5yfu4kREn+bdjC2XDQ/xMjEwXiIUYKDWUmEtyVz Z5wQb0piZVVqUX58UWlOavEhRieg+ycyS3GDAhAYI/HGBgZSojCOoYmZibmRuaGlibmxsZI4 7+S1a+KEBNKBMZudmlqQWgQzhImDU6qBce2mz063rL9X8QcH9oQs8Lzh/alvu+7KKxZqjuEC h3W4fqhu3MvHqbjUMszSWWji4rZJLnwK6epZfdsrXhsxuUYEvmG7L/k++XqQaPMz6TOySivF 089E+Kqk9HCYpz8TjvsS/rj34TWP422+IWFfdmmoWex3yTLumLkme3bY2cqpk+91u4QpsRRn JBpqMRcVJwIAfTySjNQCAAA= 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: hsAF7n0feQJxnR8Of8mAWkaix1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589321190; bh=RhN/MmO7+iSyzfzJyRCex6ZHy79LTL9FUaCTqV3Bt4I=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=c5yxlwQFXTNwg1ZdQdZ+ZC3L39qdWoSKv2Fzum4y5wCoI3aB0kMFwXqbp0/VUK1piyj LhiVTHKZVUrHKpnbKjUAtUEABTs7kGVK2SYZ+Madvu2+l0m8XIWAZ5y6KaEVd+f1knEP/ fwy4nwvdeCKehnzOQ5qRwahJ6sHa+effjT4= 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 (#59384): https://edk2.groups.io/g/devel/message/59384 Mute This Topic: https://groups.io/mt/74169596/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 Sun May 5 17:08:19 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+59385+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+59385+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589321191; cv=none; d=zohomail.com; s=zohoarc; b=Di7xVl6TUnMK6GBd9qmqEXpThMAUqMoRMWFfYxfjhYejhnrJnQ5WaiZPY1VaAssZ5nkh1fuHy0UT3JVn+RBX2btDdbqrlqphsLbSpnuqwXsEpPsUJ2rIlZI0CYayiVfM8zO64+iBJLK0+efG3NKCAzJQawLht3h6s2Ct3V4oNDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589321191; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=hykjawlFNOtfMSq0ExLzZa1wKF2VOfLf1dS8mtNPdrw=; b=So5mD44dwvNg3LDadkQ6v9gkGZwH28kDMG0DLmve/sPW6e05IVfg7PpioSUh8+njwe7DzzAD4mltsTeNS6owzIYBYyU0j1540n6qKMRbaF2aDpSd2SqpbxjU7Wg2rgZp0RtAyMqLI0SwH6R09Nd+fuQGc3nOfeEG73Yf37a/5HM= 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+59385+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589321191983810.6120751558493; Tue, 12 May 2020 15:06:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1yP9YY1788612x5bFgVQAGl9; Tue, 12 May 2020 15:06:31 -0700 X-Received: from atlmailgw2.ami.com (atlmailgw2.ami.com []) by mx.groups.io with SMTP id smtpd.web10.280.1589321185430648927 for ; Tue, 12 May 2020 15:06:29 -0700 X-AuditID: ac10606f-049ff70000001b62-68-5ebb1de4d504 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 A4.82.07010.4ED1BBE5; Tue, 12 May 2020 18:06:29 -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; Tue, 12 May 2020 18:05:49 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V4 6/6] SignedCapsulePkg: Add FMP Capsule Image Header extension Date: Tue, 12 May 2020 18:05:43 -0400 Message-ID: <20200512220543.40008-7-oleksiyy@ami.com> In-Reply-To: <20200512220543.40008-1-oleksiyy@ami.com> References: <20200512220543.40008-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsWyRiBhgu5T2d1xBkt+cVvMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZmxa1kfW0Gr SMXBZVNZGxifCXQxcnJICJhIbJ+xm6WLkYtDSGAXk8Sz1dfYIJwtjBI9W08xgVSxCWhKHDg2 hRHEFhGQkphyYCZYnFngMKNExyewuLBAkMS0Pe9ZQWwWAVWJhdOXsoPYvAKmEg+v9zNBbNOQ mLbmLpjNKWAm8e3pKbBeIaCaI49usELUC0qcnPmEBWK+hMTBFy+YIWpkJdqOP2efwMg/C0nZ LCRlCxiZVjEKJZbk5CZm5qSXG+kl5mbqJefnbmKERGD+DsaPH80PMTJxMB5ilOBgVhLhbcnc GSfEm5JYWZValB9fVJqTWnyI0QnogYnMUtygEARGSbyxgYGUKIxjaGJmYm5kbmhpYm5srCTO O2ntmjghgXRg1GanphakFsEMYeLglGpg9LLiP6pnHB1W8T/kfsVNuXzJG2zy3Ic82QO/FpSX d95edrfuiH1x1O1jnu1LIu/N3fnX1XCZgEHeZJuKrxJfP738LbA2ul775ApV5sOtomdfJ6h/ dVvOUv27lzVlbfIOBp/cvfbn2hOrfYVfZq7dvaIk4uGltXGVtncOTY5f8b80KIZv2cmPSizF GYmGWsxFxYkAoSGkWtUCAAA= 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: dvHrhP7WzpITwIVY1wLaQ8xYx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589321191; bh=zMT6m9TAn2V0EOVr9aztyyK4dEzNRpkBHY6WjEUvEmk=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=lRtILk2yYD2rTjQvFd3NkmUUyGepq8r+Q/+nOfJJdC8yVD2TA1jJaM/mYYzKfKwGEYS ZStkrZcdEiwdYrZvxwfGbqu0sjHTx90ovfTAkA3hJeHihlkOzj0ldboW/PT2oKplD/Wgk JBV8higXW5wNUJFs6M/LclbEVNKR7CcoAC0= 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: Wei6 Xu --- .../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 (#59385): https://edk2.groups.io/g/devel/message/59385 Mute This Topic: https://groups.io/mt/74169598/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-