<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta http-equiv=Content-Type content="text/html; charset=utf-8"><meta name=Generator content="Microsoft Word 15 (filtered medium)"><style></style></head><body lang=ZH-CN link="#0563C1" vlink="#954F72" style='word-wrap:break-word'><div class=WordSection1>Pavamana:<o:p></o:p> The change should be merged after new FIT spec is published, because FitGen tool follows the public FIT spec. <o:p></o:p><o:p> </o:p>Thanks<o:p></o:p>Liming<o:p></o:p><div style='border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt'><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'>发件人: Hv, Pavamana <pavamana.hv@intel.com> 发送时间: 2022年10月26日 23:13 收件人: Holland, Michael <michael.holland@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Lohr, Paul A <paul.a.lohr@intel.com>; Feng, Bob C <bob.c.feng@intel.com> 主题: RE: [edk2-devel] [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record types support in FitGen.c<o:p></o:p></div></div><o:p> </o:p>Thanks for the review, Liming.<o:p></o:p><a id=OWAAM2B2D72B4DC524764981CF50589F91A6B href="mailto:bob.c.feng@intel.com">@Feng, Bob C</a>,<o:p></o:p>What is the next step to merge the change?<o:p></o:p>Let me know if anything is needed from me.<o:p></o:p>Thanks for your help again.<o:p></o:p>Regards,<o:p></o:p>Pavamana<o:p></o:p><o:p> </o:p><o:p> </o:p><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'>From: Holland, Michael <<a href="mailto:michael.holland@intel.com">michael.holland@intel.com</a>> Sent: Tuesday, October 25, 2022 8:36 PM To: Gao, Liming <<a href="mailto:gaoliming@byosoft.com.cn">gaoliming@byosoft.com.cn</a>>; <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>; Hv, Pavamana <<a href="mailto:pavamana.hv@intel.com">pavamana.hv@intel.com</a>>; Chaganty, Rangasai V <<a href="mailto:rangasai.v.chaganty@intel.com">rangasai.v.chaganty@intel.com</a>>; Lohr, Paul A <<a href="mailto:paul.a.lohr@intel.com">paul.a.lohr@intel.com</a>> Cc: Feng, Bob C <<a href="mailto:bob.c.feng@intel.com">bob.c.feng@intel.com</a>> Subject: RE: [edk2-devel] [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record types support in FitGen.c<o:p></o:p></div></div><o:p> </o:p>Hi Liming,<o:p></o:p><o:p> </o:p>The spec is in process of being published.<o:p></o:p><o:p> </o:p><a id=OWAAM7814C4BF382C4703A1D8EC51BDC69E0A href="mailto:rangasai.v.chaganty@intel.com">@Chaganty, Rangasai V</a> <a id=OWAAM94A69DEA018D432FA9FF46DAFE154793 href="mailto:paul.a.lohr@intel.com">@Lohr, Paul A</a><o:p></o:p><o:p> </o:p>Any update on FIT spec being published?<o:p></o:p><o:p> </o:p>Thanks,<o:p></o:p>Michael<o:p></o:p><o:p> </o:p><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'>From: gaoliming <<a href="mailto:gaoliming@byosoft.com.cn">gaoliming@byosoft.com.cn</a>> Sent: Tuesday, October 25, 2022 09:18 PM To: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>; Hv, Pavamana <<a href="mailto:pavamana.hv@intel.com">pavamana.hv@intel.com</a>> Cc: Feng, Bob C <<a href="mailto:bob.c.feng@intel.com">bob.c.feng@intel.com</a>>; Holland, Michael <<a href="mailto:michael.holland@intel.com">michael.holland@intel.com</a>> Subject: 回复: [edk2-devel] [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record types support in FitGen.c<o:p></o:p></div></div><o:p> </o:p>Pavamana:<o:p></o:p> The code change looks good. Now, is FIT spec 1.4 public to be downloaded?<o:p></o:p><o:p> </o:p>Thanks<o:p></o:p>Liming<o:p></o:p><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'>发件人: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> <<a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>> 代表 Hv, Pavamana 发送时间: 2022年10月26日 5:50 收件人: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>; Gao, Liming <<a href="mailto:gaoliming@byosoft.com.cn">gaoliming@byosoft.com.cn</a>> 抄送: Feng, Bob C <<a href="mailto:bob.c.feng@intel.com">bob.c.feng@intel.com</a>>; Holland, Michael <<a href="mailto:michael.holland@intel.com">michael.holland@intel.com</a>> 主题: Re: [edk2-devel] [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record types support in FitGen.c 重要性: 高<o:p></o:p></div></div><o:p> </o:p>Hi Liming,<o:p></o:p>Any update on this? Please treat this with urgency as we have a release coming up and needs this change.<o:p></o:p><o:p> </o:p>-Pavamana<o:p></o:p><o:p> </o:p><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'>From: Hv, Pavamana Sent: Monday, October 24, 2022 10:05 AM To: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>; Gao, Liming <<a href="mailto:gaoliming@byosoft.com.cn">gaoliming@byosoft.com.cn</a>> Subject: RE: [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record types support in FitGen.c<o:p></o:p></div></div><o:p> </o:p><a id=OWAAM062ABC43A9384C26A14B4E08D59DAE8B href="mailto:gaoliming@byosoft.com.cn">@Gao, Liming</a>,<o:p></o:p>Can you please review the patch and let me know if this can be merged?<o:p></o:p>Thanks in advance for your help.<o:p></o:p>Regards,<o:p></o:p>Pavamana<o:p></o:p><o:p> </o:p>-----Original Message----- From: Hv, Pavamana <<a href="mailto:pavamana.hv@intel.com">pavamana.hv@intel.com</a>> Sent: Wednesday, October 19, 2022 8:57 PM To: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> Cc: Hv, Pavamana <<a href="mailto:pavamana.hv@intel.com">pavamana.hv@intel.com</a>> Subject: [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record types support in FitGen.c<o:p></o:p><o:p> </o:p>REF: <a href="https://bugzilla.tianocore.org/show_bug.cgi?id=4086">https://bugzilla.tianocore.org/show_bug.cgi?id=4086</a><o:p></o:p><o:p> </o:p>This commit adds support for new FIT record type for Vendor Authorized Boot (VAB) security technology(FIT spec revision 1.4).<o:p></o:p>VAB defines 3 new following types<o:p></o:p>Vendor Authorized Boot Provisioning Table (Type 0x1A) Vendor Authorized Boot Image Manifest (Type 0x1B) Vendor Authorized Boot Key Manifest (Type 0x1C) The code has been updated to align these binaries on 64 byte boundary and not to overlap with other regions, similar to Key manifest, Boot Policy manifest and other optional types.<o:p></o:p><o:p> </o:p>Also added macros to define FIT spec Major and Minor version numbers and print the same instead of hardcoded string.<o:p></o:p><o:p> </o:p>Signed-off-by: Pavamana Holavanahalli <<a href="mailto:pavamana.hv@intel.com">pavamana.hv@intel.com</a>><o:p></o:p>---<o:p></o:p>Silicon/Intel/Tools/FitGen/FitGen.c | 61 +++++++++++++++++++---------- Silicon/Intel/Tools/FitGen/FitGen.h | 5 ++-<o:p></o:p>2 files changed, 44 insertions(+), 22 deletions(-)<o:p></o:p><o:p> </o:p>diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c<o:p></o:p>index 21dfcf1ebb..87123f9922 100644<o:p></o:p>--- a/Silicon/Intel/Tools/FitGen/FitGen.c<o:p></o:p>+++ b/Silicon/Intel/Tools/FitGen/FitGen.c<o:p></o:p>@@ -234,20 +234,24 @@ typedef struct {<o:p></o:p>#define FLASH_TO_MEMORY(Address, FvBuffer, FvSize) \ (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) - (TOP_FLASH_ADDRESS - (UINTN)(Address))) -#define FIT_TABLE_TYPE_HEADER 0-#define FIT_TABLE_TYPE_MICROCODE 1-#define FIT_TABLE_TYPE_STARTUP_ACM 2-#define FIT_TABLE_TYPE_DIAGNST_ACM 3-#define FIT_TABLE_TYPE_BIOS_MODULE 7-#define FIT_TABLE_TYPE_TPM_POLICY 8-#define FIT_TABLE_TYPE_BIOS_POLICY 9-#define FIT_TABLE_TYPE_TXT_POLICY 10-#define FIT_TABLE_TYPE_KEY_MANIFEST 11-#define FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST 12-#define FIT_TABLE_TYPE_BIOS_DATA_AREA 13-#define FIT_TABLE_TYPE_CSE_SECURE_BOOT 16-#define FIT_TABLE_SUBTYPE_FIT_PATCH_MANIFEST 12-#define FIT_TABLE_SUBTYPE_ACM_MANIFEST 13+#define FIT_TABLE_TYPE_HEADER 0+#define FIT_TABLE_TYPE_MICROCODE 1+#define FIT_TABLE_TYPE_STARTUP_ACM 2+#define FIT_TABLE_TYPE_DIAGNST_ACM 3+#define FIT_TABLE_TYPE_BIOS_MODULE 7+#define FIT_TABLE_TYPE_TPM_POLICY 8+#define FIT_TABLE_TYPE_BIOS_POLICY 9+#define FIT_TABLE_TYPE_TXT_POLICY 10+#define FIT_TABLE_TYPE_KEY_MANIFEST 11+#define FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST 12+#define FIT_TABLE_TYPE_BIOS_DATA_AREA 13+#define FIT_TABLE_TYPE_CSE_SECURE_BOOT 16+#define FIT_TABLE_SUBTYPE_FIT_PATCH_MANIFEST 12+#define FIT_TABLE_SUBTYPE_ACM_MANIFEST 13+#define FIT_TABLE_TYPE_VAB_PROVISION_TABLE 26+#define FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST 27+#define FIT_TABLE_TYPE_VAB_BOOT_KEY_MANIFEST 28+ // // With OptionalModule Address isn't known until free space has been@@ -322,8 +326,10 @@ Returns:<o:p></o:p>--*/ { printf (- "%s - Tiano IA32/X64 FIT table generation Utility for FIT spec revision 1.2."" Version %i.%i\n\n",+ "%s - Tiano IA32/X64 FIT table generation Utility for FIT spec revision %i.%i."" Version %i.%i\n\n", UTILITY_NAME,+ FIT_SPEC_VERSION_MAJOR,+ FIT_SPEC_VERSION_MINOR, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION );@@ -1956,7 +1962,10 @@ Returns:<o:p></o:p> (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_KEY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_DATA_AREA) ||- (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT)) {+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_PROVISION_TABLE) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_BOOT_KEY_MANIFEST)) { // NOTE: It might be virtual address now. Just put a place holder. FitEntryNumber ++; }@@ -2154,8 +2163,11 @@ Returns:<o:p></o:p> (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_KEY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_DATA_AREA) ||- (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT)) {- // Let it 64 byte align+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_PROVISION_TABLE) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_BOOT_KEY_MANIFEST)) {+ // Let it 64 byte align AlignedSize += BIOS_MODULE_ALIGNMENT; AlignedSize &= ~BIOS_MODULE_ALIGNMENT; }@@ -2166,8 +2178,11 @@ Returns:<o:p></o:p> (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_KEY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_DATA_AREA) ||- (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT)) {- // Let it 64 byte align+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_PROVISION_TABLE) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_BOOT_KEY_MANIFEST)) {+ // Let it 64 byte align OptionalModuleAddress = (UINT8 *)((UINTN)OptionalModuleAddress & ~BIOS_MODULE_ALIGNMENT); } @@ -2201,7 +2216,11 @@ Returns:<o:p></o:p> (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_KEY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_DATA_AREA) ||- (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT)) {+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_PROVISION_TABLE) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST) ||+ (gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_VAB_BOOT_KEY_MANIFEST)) {+ CheckOverlap (gFitTableContext.OptionalModule[Index].Address, AlignedSize); } }diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h b/Silicon/Intel/Tools/FitGen/FitGen.h<o:p></o:p>index 80a1423ceb..511ab652ab 100644<o:p></o:p>--- a/Silicon/Intel/Tools/FitGen/FitGen.h<o:p></o:p>+++ b/Silicon/Intel/Tools/FitGen/FitGen.h<o:p></o:p>@@ -31,9 +31,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent<o:p></o:p>// Utility version information // #define UTILITY_MAJOR_VERSION 0-#define UTILITY_MINOR_VERSION 66+#define UTILITY_MINOR_VERSION 67 #define UTILITY_DATE __DATE__ +#define FIT_SPEC_VERSION_MAJOR 1+#define FIT_SPEC_VERSION_MINOR 4+ // // The minimum number of arguments accepted from the command line. //-- <o:p></o:p>2.26.2.windows.1<o:p></o:p><o:p> </o:p><div></o:p></div></div></div></body></html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/95624">View/Reply Online (#95624)</a> | | <a target="_blank" href="https://groups.io/mt/94595307/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>