From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.16699.1591198276928154737 for ; Wed, 03 Jun 2020 08:31:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=KYmVqMG5; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: paul.a.lohr@intel.com) IronPort-SDR: itqGf0VuOVb8tDJN9YvUB8YYdwg0ePgqIg8do8UJtyb9otaa8TgFy7lCiejigd3JG8wdlIWP76 cbKXO3W1F8gw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 08:31:15 -0700 IronPort-SDR: 2lbpWIqO3H2dt7Lr3ezdhJKOM0b54WaUZahiqSKCwCoFGd859wmHVLjTyt903OnAfnCBToc4bu HNFVaPxx5EkA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,467,1583222400"; d="scan'208";a="445148954" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 03 Jun 2020 08:31:14 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 3 Jun 2020 08:31:08 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 3 Jun 2020 08:31:07 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 3 Jun 2020 08:31:07 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.168) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 3 Jun 2020 08:31:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kZEoGGPUQ/kPdOO6JkC9GQHa7LxzAYe68XEGFtKH33xqww8vYuoQPsaEuCrNvx8ZOKUpXMKQEzuctXlJg37Gj+WueUJFj+gS1MXixJpSobvifnr1+slf5yv4c9Hl1bYGqhCQh5MfPJ+0RtEW6UGLCmO9S1edZgcoLn2dqmbegMb1ORasG5OV/DgyAxIYjukiYVKiAqOuzdiQBYZmdSnT2K7KrdJbytVN5CS2LwpHWZ+2qNNmzzFC171am+t4zlWFfihV9hQUpIQj/J2zV35b3JeOMBdzuaKGekElLKGz/eUl2Wz/gBKHWdYqclQqevHRZWYK69CmjGqPr2vXaFHm2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CEVkpdg0o3N8RRExoGHeQASSmvbe1thSnINwdqsbFZA=; b=eIf1hV0JLBLVXcONkUixJGiyaXbyqhGPmuNPM88xuFlQIqSyk436Pd49ln/OQuwDvHrvfJRh6nasAJRFg9p1NJ/q3hlTKsJQbrYutNVRmLP9wPlYzBZ+sAEeKprcKQF4lkDxkGgzRNQ4KUaDWu6gZA/jiZacVlCSjI/tOzmWaI8r27cPqQ8oRRUPkim1GXnWr6Db6GN0IWi9SG/qLFHwxJYspY2XAS/3IQ4JsNIREu8fJoy2GBT2W+sUcC6FKlBS+n8SMqQrwgDn+UJtXIG8tY7uJqobKQCutSxFl7Us/1XKs0uW/nIf1RkbVn7kO0jmoOgx2b0fxwbD+NTomFQgsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CEVkpdg0o3N8RRExoGHeQASSmvbe1thSnINwdqsbFZA=; b=KYmVqMG5dmGTLWHkeOJQFH9Fd38rtNH+7x7bKFx8TJyYuprdXCyYnKW9TB4TVutHFjrArtlrkjZ53scm7TctkKLCJWeRAZVsFZaFLKbgorlnS085N0XUNXqy6yn7y918Oaf033qtVpe8loZmQqsyH6I8FLiCRfoJwCI0dOVgL50= Received: from SA0PR11MB4590.namprd11.prod.outlook.com (2603:10b6:806:96::17) by SA0PR11MB4638.namprd11.prod.outlook.com (2603:10b6:806:73::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18; Wed, 3 Jun 2020 15:31:01 +0000 Received: from SA0PR11MB4590.namprd11.prod.outlook.com ([fe80::84ec:a394:90c3:77e]) by SA0PR11MB4590.namprd11.prod.outlook.com ([fe80::84ec:a394:90c3:77e%6]) with mapi id 15.20.3066.018; Wed, 3 Jun 2020 15:31:01 +0000 From: "Lohr, Paul A" To: "Gao, Liming" , "Hernandez Beltran, Jorge" , "devel@edk2.groups.io" Subject: Re: [Patch 1/1] [Edk2Platforms] FitGen: Update FitGen tool to be compliance with the FIT specification revision 1.2 Thread-Topic: [Patch 1/1] [Edk2Platforms] FitGen: Update FitGen tool to be compliance with the FIT specification revision 1.2 Thread-Index: AQHWNQ7dzHnTprhwP06kAxy/lE/dBajG/KcAgAARAdA= Date: Wed, 3 Jun 2020 15:31:01 +0000 Message-ID: References: <20200528164102.31576-1-jorge.hernandez.beltran@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.2.0.6 authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.52.201] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c7f74176-7105-422c-a660-08d807d31f10 x-ms-traffictypediagnostic: SA0PR11MB4638: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:82; x-forefront-prvs: 04238CD941 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: J4q/5zeFwpB4zjLCmanTy5wsbqRK/o2k10sIPSyctIv+LLNJRADjtc/s5XfJ8fFdjuj326j1KL+o3Yul65us/xaDCHlUSLiSOBfQR8wrlNQwB9BysGW+NMro/r/5lPkF2ppeZk+e3G+NIk0ebr0PC90gf82nmD4W5qsmkTAEAjsciJMV1FsUTTm6Q2V6FBOKA5egYGXWAuvgUJx+uEdDpasKEciBAhKkd7HgbEneJQ4fU4f3idcXhs6Koh3zPcc81RfHmaiNyo83xLCtMCBR394n7sJcieruvGGbEqDfokGewwi1d899RQ+0gR/HXKw61SZ2sTXHaUffgRjtA9Hhd37wvOQYRJOW7mYTwQ4QYNFeGbfCQW4gjUnHAXzcKM/m1XD21YhNQX+YlzCGh2gOdg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA0PR11MB4590.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(346002)(39860400002)(366004)(376002)(136003)(110136005)(15650500001)(26005)(186003)(55016002)(6506007)(76116006)(8676002)(316002)(53546011)(9686003)(83380400001)(8936002)(478600001)(52536014)(5660300002)(966005)(30864003)(7696005)(64756008)(2906002)(33656002)(66946007)(66476007)(66446008)(71200400001)(66556008)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: OEtEhBIdxOtHNV9lK5a9vhWhIQmjdgDsBgZO6jvO74ZLlm8j/nN1E92Axf6pB9eVIoFHKoMMG5WaXUuTCAvtKOY8WXVOOot+zGufpb/Vn1zzLvVC1Anz4zT+Tu34wSYlMyX4XlHRjSQCi/WmyalvNmulkQy9e/Eluq3ERMGfxJEXaa9DvZghGww5GDZ1DRKIaWTlkHt+HMVOyShL4aeEefwvu+SaFZ9pkV0MeEfUa4+fGe5yaXoBf6ZG9n1sUPl9ZCUTPnRr9Btl+L70sRpaTM4UlMyQjEDLd3RPAkvhlqI8GIPi8x6ZJX5csWVlzR89ub780hbSyDArfOtRvVFj0D2Ivhb8ClIZzniftMpGInTaXOfj/PkaWMBFiIXEPyw3OLHITZ/49EHx1zMK4aEhnCpmjekl40FDKMP3E6J213fSRb/aNetN/cA2EOlGZ3tRnGEBsplbrcyuzaUbD3uqCB555MbOd2tgoBXtJdXuXM5r6ptE++wWYPapnOv5EwXV MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: c7f74176-7105-422c-a660-08d807d31f10 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Jun 2020 15:31:01.1881 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lY+S/GY6iD038TxNRNbF/o9F2ysCH1TihzKzp0jD9jyOJJOzF3bnBLijEQ+ovW9HxNG6ZN8uVPWDkiNfm7o8bQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4638 Return-Path: paul.a.lohr@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks Liming. I agree the code changes look good. Paul A. Lohr - Server Firmware Enabling 512.239.9073 (cell) 512.794.5044 (work) -----Original Message----- From: Gao, Liming =20 Sent: Wednesday, June 3, 2020 9:31 AM To: Hernandez Beltran, Jorge ; devel@edk= 2.groups.io Cc: Lohr, Paul A Subject: RE: [Patch 1/1] [Edk2Platforms] FitGen: Update FitGen tool to be c= ompliance with the FIT specification revision 1.2 Jorge: The patch is good. But, the commit message is too long than 80. Please up= date the commit message to be short. You can use edk2\BaseTools\Scripts\PatchCheck.py tool to check the patch = format. =20 =20 With the commit message change, Reviewed-by: Liming Gao Thanks Liming > -----Original Message----- > From: Hernandez Beltran, Jorge > Sent: Friday, May 29, 2020 12:41 AM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Lohr, Paul A=20 > ; Hernandez Beltran, Jorge=20 > > Subject: [Patch 1/1] [Edk2Platforms] FitGen: Update FitGen tool to be=20 > compliance with the FIT specification revision 1.2 >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2687 >=20 > FIT specification revision 1.2 was recently released to the open commun= ity. > Revision 1.2 updates CSE Secure Boot Rules in section 4.12, and adds 2 = new entry > sub-types used to distinguish the CSE entries. >=20 > Signed-off-by: Jorge Hernandez Beltran=20 > > --- > Silicon/Intel/Tools/FitGen/FitGen.c | 152 +++++++++++++++++++++++++++---= ------ > Silicon/Intel/Tools/FitGen/FitGen.h | 2 +- > 2 files changed, 114 insertions(+), 40 deletions(-) >=20 > diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c=20 > b/Silicon/Intel/Tools/FitGen/FitGen.c > index 75d8932d90ac..c4006e69c822 100644 > --- a/Silicon/Intel/Tools/FitGen/FitGen.c > +++ b/Silicon/Intel/Tools/FitGen/FitGen.c > @@ -226,6 +226,8 @@ typedef struct { > #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 >=20 > // > // With OptionalModule Address isn't known until free space has been=20 > @@ -236,6 +238,7 @@ typedef struct { // typedef struct { > UINT32 Type; > + UINT32 SubType; // Used by OptionalModule only > UINT32 Address; > UINT8 *Buffer; // Used by OptionalModule only > UINT32 Size; > @@ -295,7 +298,7 @@ Returns: > --*/ > { > printf ( > - "%s - Tiano IA32/X64 FIT table generation Utility for FIT spec revis= ion 1.1."" Version %i.%i\n\n", > + "%s - Tiano IA32/X64 FIT table generation Utility for FIT spec=20 > + revision 1.2."" Version %i.%i\n\n", > UTILITY_NAME, > UTILITY_MAJOR_VERSION, > UTILITY_MINOR_VERSION > @@ -334,7 +337,7 @@ Returns: > "\t[-U |]\n" > "\t[-B ] [-B ...] [-V ]\n" > "\t[-M ] [-M ...]|[-U=20 > | MicrocodeRegionSize>|] [-V ]\n" > - "\t[-O RecordType ||| [-V > ]] [-O ... [-V ...]]\n" > + "\t[-O RecordType + RecordDataSize>| RecordDataSize>||| [-V ]] [-O ... [-V ...]]\n" > "\t[-P RecordType [-V ]] [-P ... [-V ...]]\n" > , UTILITY_NAME); > printf (" Where:\n"); > @@ -366,6 +369,7 @@ Returns: > printf ("\tRecordDataSize - FIT entry record data size.\n"); > printf ("\tRecordDataGuid - FIT entry record data GUID.\n"); > printf ("\tRecordBinFile - FIT entry record data binary file.= \n"); > + printf ("\tCseRecordSubType - FIT entry record subtype. Use to f= urther distinguish CSE entries (see FIT spec revision 1.2 chapter > 4.12).\n"); > printf ("\tFitEntryDefaultVersion - The default version for all FIT=20 > table entries. 0x%04x is used if this is not specified.\n", DEFAULT_FIT_E= NTRY_VERSION); > printf ("\tFitHeaderVersion - The version for FIT header. (Overr= ide default version)\n"); > printf ("\tStartupAcmVersion - The version for StartupAcm. (Overr= ide default version)\n"); > @@ -857,6 +861,7 @@ Returns: > UINT8 *FileBuffer; > UINT32 FileSize; > UINT32 Type; > + UINT32 SubType; > UINT8 *MicrocodeFileBuffer; > UINT8 *MicrocodeFileBufferRaw; > UINT32 MicrocodeFileSize; > @@ -1608,26 +1613,22 @@ Returns: > } > Type =3D xtoi (argv[Index + 1]); > // > - // 1st, try GUID > + // 1st, try CSE entry sub-type > // > - if (IsGuidData (argv[Index + 2], &Guid)) { > - FileBuffer =3D FindFileFromFvByGuid (FdBuffer, FdSize, &Guid, &Fil= eSize); > - if (FileBuffer =3D=3D NULL) { > - Error (NULL, 0, 0, "-O Parameter incorrect, GUID not found!", "%= s", argv[Index + 2]); > - // not found > - return 0; > - } > - if (FileSize >=3D 0x80000000) { > - Error (NULL, 0, 0, "-O Parameter incorrect, FileSize too large!"= , NULL); > - return 0; > + SubType =3D 0; > + if (Type =3D=3D FIT_TABLE_TYPE_CSE_SECURE_BOOT) { > + if (Index + 3 >=3D argc) { > + break; > } > - FileBuffer =3D (UINT8 *)MEMORY_TO_FLASH (FileBuffer, FdBuffer, FdS= ize); > - Index +=3D 3; > - } else { > + SubType =3D xtoi (argv[Index + 2]); > // > - // 2nd, try file > + // try file > // > - Status =3D ReadInputFile (argv[Index + 2], &FileBuffer, &FileSize,= NULL); > + if (SubType !=3D FIT_TABLE_SUBTYPE_FIT_PATCH_MANIFEST && SubType != =3D FIT_TABLE_SUBTYPE_ACM_MANIFEST) { > + Error (NULL, 0, 0, "-O Parameter incorrect, SubType unsupported!= ", NULL); > + return 0; > + } > + Status =3D ReadInputFile (argv[Index + 3], &FileBuffer,=20 > + &FileSize, NULL); > if (Status =3D=3D STATUS_SUCCESS) { > if (FileSize >=3D 0x80000000) { > Error (NULL, 0, 0, "-O Parameter incorrect, FileSize too=20 > large!", NULL); @@ -1640,48 +1641,90 @@ Returns: > // Assume the file size should < 2G. > // > FileSize |=3D 0x80000000; > + Index +=3D 4; > + } else { > + if (Status =3D=3D STATUS_WARNING) { > + Error (NULL, 0, 0, "-O Parameter incorrect, Unable to open fil= e", argv[Index + 3]); > + } > + return 0; > + } > + } else { > + // > + // 2nd, try GUID > + // > + if (IsGuidData (argv[Index + 2], &Guid)) { > + FileBuffer =3D FindFileFromFvByGuid (FdBuffer, FdSize, &Guid, &F= ileSize); > + if (FileBuffer =3D=3D NULL) { > + Error (NULL, 0, 0, "-O Parameter incorrect, GUID not found!", = "%s", argv[Index + 2]); > + // not found > + return 0; > + } > + if (FileSize >=3D 0x80000000) { > + Error (NULL, 0, 0, "-O Parameter incorrect, FileSize too large= !", NULL); > + return 0; > + } > + FileBuffer =3D (UINT8 *)MEMORY_TO_FLASH (FileBuffer, FdBuffer,=20 > + FdSize); > Index +=3D 3; > } else { > // > - // 3rd, try > + // 3rd, try file > // > - if (Index + 3 >=3D argc) { > - break; > - } > - if ((strcmp (argv[Index + 2], "RESERVE") =3D=3D 0) || > - (strcmp (argv[Index + 2], "reserve") =3D=3D 0)) { > - FileSize =3D xtoi (argv[Index + 3]); > + Status =3D ReadInputFile (argv[Index + 2], &FileBuffer, &FileSiz= e, NULL); > + if (Status =3D=3D STATUS_SUCCESS) { > if (FileSize >=3D 0x80000000) { > Error (NULL, 0, 0, "-O Parameter incorrect, FileSize too=20 > large!", NULL); > + free (FileBuffer); > return 0; > } > - FileBuffer =3D malloc (FileSize); > - if (FileBuffer =3D=3D NULL) { > - Error (NULL, 0, 0, "No sufficient memory to allocate!", NULL= ); > - return 0; > - } > - SetMem (FileBuffer, FileSize, 0xFF); > // > // Set the most significant bit > // It means the data in memory, not in flash yet. > // Assume the file size should < 2G. > // > FileSize |=3D 0x80000000; > - Index +=3D 4; > + Index +=3D 3; > } else { > // > - // 4th, try > + // 4th, try > // > if (Index + 3 >=3D argc) { > break; > } > - FileBuffer =3D (UINT8 *) (UINTN) xtoi (argv[Index + 2]); > - FileSize =3D xtoi (argv[Index + 3]); > - if (FileSize >=3D 0x80000000) { > - Error (NULL, 0, 0, "-O Parameter incorrect, FileSize too lar= ge!", NULL); > - return 0; > + if ((strcmp (argv[Index + 2], "RESERVE") =3D=3D 0) || > + (strcmp (argv[Index + 2], "reserve") =3D=3D 0)) { > + FileSize =3D xtoi (argv[Index + 3]); > + if (FileSize >=3D 0x80000000) { > + Error (NULL, 0, 0, "-O Parameter incorrect, FileSize too l= arge!", NULL); > + return 0; > + } > + FileBuffer =3D malloc (FileSize); > + if (FileBuffer =3D=3D NULL) { > + Error (NULL, 0, 0, "No sufficient memory to allocate!", NU= LL); > + return 0; > + } > + SetMem (FileBuffer, FileSize, 0xFF); > + // > + // Set the most significant bit > + // It means the data in memory, not in flash yet. > + // Assume the file size should < 2G. > + // > + FileSize |=3D 0x80000000; > + Index +=3D 4; > + } else { > + // > + // 5th, try > + // > + if (Index + 3 >=3D argc) { > + break; > + } > + FileBuffer =3D (UINT8 *) (UINTN) xtoi (argv[Index + 2]); > + FileSize =3D xtoi (argv[Index + 3]); > + if (FileSize >=3D 0x80000000) { > + Error (NULL, 0, 0, "-O Parameter incorrect, FileSize too l= arge!", NULL); > + return 0; > + } > + Index +=3D 4; > } > - Index +=3D 4; > } > } > } > @@ -1691,6 +1734,9 @@ Returns: > return 0; > } > =20 > gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber] > .Type =3D Type; > + if (gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleN= umber].Type =3D=3D FIT_TABLE_TYPE_CSE_SECURE_BOOT) { > + gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNum= ber].SubType =3D SubType; > + } > gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumbe= r].Address =3D (UINT32) (UINTN) FileBuffer; > gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumbe= r].Buffer =3D FileBuffer; > =20 > gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Si= ze =3D FileSize; @@ -2055,6 +2101,23 @@ Returns: > return ; > } >=20 > +CHAR8 *mFitCseSubTypeStr[] =3D { > + "CSE_RSVD ", > + "CSE_K_HASH1", > + "CSE_M_HASH ", > + "CSE_BPOLICY", > + "CSE_OTHR_BP", > + "CSE_OEMSMIP", > + "CSE_MRCDATA", > + "CSE_IBBL_H ", > + "CSE_IBB_H ", > + "CSE_OEM_ID ", > + "CSEOEMSKUID", > + "CSE_BD_IND ", > + "CSE_FPM ", > + "CSE_ACMM " > +}; > + > CHAR8 *mFitTypeStr[] =3D { > " ", > "MICROCODE ", > @@ -2103,6 +2166,14 @@ Returns: > return mFitSignatureInHeader; > } > if (FitEntry->Type < sizeof (mFitTypeStr)/sizeof(mFitTypeStr[0])) { > + if (FitEntry->Type =3D=3D FIT_TABLE_TYPE_CSE_SECURE_BOOT) { > + // > + // "Reserved" field is used to distinguish CSE Secure Boot entries= (see FIT spec revision 1.2) > + // > + if (FitEntry->Rsvd < sizeof (mFitCseSubTypeStr)/sizeof(mFitCseSubT= ypeStr[0])) { > + return mFitCseSubTypeStr[FitEntry->Rsvd]; > + } > + } > return mFitTypeStr[FitEntry->Type]; > } else { > return " "; > @@ -2675,6 +2746,9 @@ Returns: > *(UINT32 *)&FitEntry[FitIndex].Size[0] =3D gFitTableContext.Optional= Module[Index].Size; > FitEntry[FitIndex].Version =3D (UINT16)gFitTableContext.= OptionalModule[Index].Version; > FitEntry[FitIndex].Type =3D (UINT8)gFitTableContext.O= ptionalModule[Index].Type; > + if (FitEntry[FitIndex].Type =3D=3D FIT_TABLE_TYPE_CSE_SECURE_BOOT) { > + FitEntry[FitIndex].Rsvd =3D (UINT8)gFitTableContext.O= ptionalModule[Index].SubType; > + } > FitEntry[FitIndex].C_V =3D 0; > FitEntry[FitIndex].Checksum =3D 0; > FitIndex++; > diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h=20 > b/Silicon/Intel/Tools/FitGen/FitGen.h > index cb9274b4175e..abad2d8799c8 100644 > --- a/Silicon/Intel/Tools/FitGen/FitGen.h > +++ b/Silicon/Intel/Tools/FitGen/FitGen.h > @@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent //=20 > Utility version information // #define UTILITY_MAJOR_VERSION 0=20 > -#define UTILITY_MINOR_VERSION 61 > +#define UTILITY_MINOR_VERSION 62 > #define UTILITY_DATE __DATE__ >=20 > // > -- > 2.16.2.windows.1