From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 4A043D81113 for ; Tue, 12 Dec 2023 13:24:18 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=CFvT4yc9V2BwzJjDXhLW3bTvzm1uO2FcjYGeVgo3VBU=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type:Content-Transfer-Encoding; s=20140610; t=1702387457; v=1; b=NsDuvi2/VTJnDU/ueukN+WH0KyTeYCkjX6q1uaWLtLNbuKyYg0b/nZliurCWgE1MsKFCw8d7 7UzMCMM0YYCbmWpCeoyYg8uaGj5v6bNl68RDVXYCAI7h+5I8H9w4npgl77hxGwYqanSVnWOZ/9Z d1CRDN/oGg4trpSEPu9uOnOE= X-Received: by 127.0.0.2 with SMTP id BDIlYY7687511xr88TNeErn0; Tue, 12 Dec 2023 05:24:17 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by mx.groups.io with SMTP id smtpd.web11.11955.1702368388704133276 for ; Tue, 12 Dec 2023 00:06:28 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="8128743" X-IronPort-AV: E=Sophos;i="6.04,269,1695711600"; d="scan'208";a="8128743" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 00:06:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="896808920" X-IronPort-AV: E=Sophos;i="6.04,269,1695711600"; d="scan'208";a="896808920" X-Received: from liuliqi.ccr.corp.intel.com ([10.239.158.34]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 00:06:26 -0800 From: Liqi Liu To: devel@edk2.groups.io Cc: Liqi Liu Subject: =?UTF-8?B?W2VkazItZGV2ZWxdIFtQQVRDSCBWMiAxLzFdIFNpbGljb24vSW50ZWwvRml0R2Vu77yaRklUIGNoYW5nZSBmb3IgRkJNIGVudHJ5Lg==?= Date: Tue, 12 Dec 2023 16:06:21 +0800 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liqi.liu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: b9MTTg7NYY1DD7azHuiQLhmtx7686176AA= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b="NsDuvi2/"; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4621 1）Refer to FIT spec change, add a new entry in FIT table - FSP Boot Manifest(Type 0xD) to store the location of FBM. 2)We found that 0xD was occupied by FIT_TABLE_TYPE_BIOS_DATA_AREA. But all FIT specs in archive show record 0xD as reserved.After confirming with architect,we will use 0xD for FBM and update FitGen.c accordingly. Signed-off-by: Liqi Liu Cc: Chen Christine yuwei.chen@intel.com Cc: Feng Bob C bob.c.feng@intel.com Cc: Chagnanty Rangasai V rangasai.v.chaganty@intel.com --- .../IndustryStandard/FirmwareInterfaceTable.h | 1 + Silicon/Intel/Tools/FitGen/FitGen.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Silicon/Intel/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h b/Silicon/Intel/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h index f65779eb3778..27d83f5f72ea 100644 --- a/Silicon/Intel/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h +++ b/Silicon/Intel/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h @@ -24,6 +24,7 @@ #define FIT_TYPE_0A_TXT_POLICY 0x0A #define FIT_TYPE_0B_KEY_MANIFEST 0x0B #define FIT_TYPE_0C_BOOT_POLICY_MANIFEST 0x0C +#define FIT_TYPE_0D_FSP_BOOT_MANIFEST 0x0D #define FIT_TYPE_10_CSE_SECURE_BOOT 0x10 #define FIT_TYPE_2D_TXTSX_POLICY 0x2D #define FIT_TYPE_2F_JMP_DEBUG_POLICY 0x2F diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c index 16c8b9b026f5..055ffd4cf8b9 100644 --- a/Silicon/Intel/Tools/FitGen/FitGen.c +++ b/Silicon/Intel/Tools/FitGen/FitGen.c @@ -285,7 +285,7 @@ typedef struct { #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_FSP_BOOT_MANIFEST 13 #define FIT_TABLE_TYPE_CSE_SECURE_BOOT 16 #define FIT_TABLE_SUBTYPE_FIT_PATCH_MANIFEST 12 #define FIT_TABLE_SUBTYPE_ACM_MANIFEST 13 @@ -1444,7 +1444,7 @@ GetFitEntryNumber ( case FIT_TABLE_TYPE_TXT_POLICY: case FIT_TABLE_TYPE_KEY_MANIFEST: case FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST: - case FIT_TABLE_TYPE_BIOS_DATA_AREA: + case FIT_TABLE_TYPE_FSP_BOOT_MANIFEST: case FIT_TABLE_TYPE_CSE_SECURE_BOOT: default : if (BiosInfoStruct[BiosInfoIndex].Version != 0) { @@ -2126,7 +2126,7 @@ GetFitEntryNumber ( if ((gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_POLICY) || (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_FSP_BOOT_MANIFEST) || (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) || @@ -2311,7 +2311,7 @@ GetFreeSpaceForFit ( if ((gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_POLICY) || (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_FSP_BOOT_MANIFEST) || (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) || @@ -2326,7 +2326,7 @@ GetFreeSpaceForFit ( if ((gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_POLICY) || (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_FSP_BOOT_MANIFEST) || (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) || @@ -2364,7 +2364,7 @@ GetFreeSpaceForFit ( if ((gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_POLICY) || (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_FSP_BOOT_MANIFEST) || (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) || @@ -2458,7 +2458,7 @@ CHAR8 *mFitTypeStr[] = { "TXT_POLICY ", "KEYMANIFEST", "BP_MANIFEST", - "BIOS_DATA_A", + "FSP_BOOT_MF", " ", " ", "CSE_SECUREB" @@ -3256,7 +3256,7 @@ ClearFitTable ( case FIT_TABLE_TYPE_BIOS_POLICY: case FIT_TABLE_TYPE_KEY_MANIFEST: case FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST: - case FIT_TABLE_TYPE_BIOS_DATA_AREA: + case FIT_TABLE_TYPE_FSP_BOOT_MANIFEST: case FIT_TABLE_TYPE_CSE_SECURE_BOOT: // // Clear FIT table data buffer -- 2.37.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112429): https://edk2.groups.io/g/devel/message/112429 Mute This Topic: https://groups.io/mt/103129294/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-