From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.34766.1659026772626690319 for ; Thu, 28 Jul 2022 09:46:13 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=SJ6ELktg; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: chasel.chiu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659026772; x=1690562772; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=YqjijD4d/xlKBxR+B81r9ULECV8a9Sn6YLGI8FjPvxo=; b=SJ6ELktg+qwBffuHztk4QIoRqYJ6RCFdX5OKsZpN8lFew4CksssMGBHY +yQIL3BO9k8BTsJKUYgpfebjcPDsq40GaOL74NMVbXtQyymP+YoV5TFkt ULRMfeBDWN/C6GF3/CwKDhI43iD8BgUaiEtyCl8fvVMOkGJVqmou767kA UTuCseRBFKvXWThAVp18l1XxVAAsNfgWkFe+85euNd8pJz024uwgA/f9V 2dYEsFTZVKnXrGMr56kvZWXzProFwwa3Zz/M7FjptzjlnHlEqpV8NEcnB Z6t6z+VfL33uQRru531sk7orukJuTPN5RzCLGUYt7583J37LnBDIOo827 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10422"; a="289330086" X-IronPort-AV: E=Sophos;i="5.93,198,1654585200"; d="scan'208";a="289330086" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2022 09:46:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,198,1654585200"; d="scan'208";a="659811295" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by fmsmga008.fm.intel.com with ESMTP; 28 Jul 2022 09:46:09 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 28 Jul 2022 09:46:08 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 28 Jul 2022 09:46:08 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28 via Frontend Transport; Thu, 28 Jul 2022 09:46:08 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.45) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.28; Thu, 28 Jul 2022 09:46:08 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jOQVAU95BeGk+eMeqjiYIM3ZLD/KM0A9Z5soglnEDa+K85CXGCR5NBXYs9Yj/BdOXUBq+ETSdvPNCkfo9LQi+mRQ+fuhgWLeymdvSckmYIsobguBEDHMFigaTeFx1RaNmGxDNzmbOv7amSoty6bb5v52G77ySm1J+jQhPYQ8vGD2iVGmEtIKMLk/WV7XFXztw53pv2/E2wRyZ8wkuG1pysxwI56bCN43aO/PCIVqqqFyyIHMu1TGc94s7S9Y5bcAmQKCCI57nzRur4IJv8Mkv/VKUlHzhpNYXi4DfcJwadM9RuX2ewxZzVj/UmEHr9WZlFWdhALoO28DdGZce5ukJg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=F0bJAiKs+2hzjjbi12tATfEae6SQwTnGVBWiMU7wy/Q=; b=mIICchdn5cgZn9JIN2BM/wptKXILe1ZeDUQxjY96BLnwoo1Rfn7Q8HYE+X3CRVK/t3yRt/ifJX/AOGKP0SNGjl4Qep8TiXzKrz9RCFmbuPQ+CCTrAewtTyJty+BZ2GQaDf0vEiDhGytlOcu8KwvKwVIxwer1EfTOoK5vfqPz8sB+jbqJ55MLdU3yXnNoWfKO7fEqNILJqpvB5QBucJtvKAmg4bDR/FBRDalAwEVxQOlikcbw3PsaQJeiiUA5iJ3fEhXbjPsl8MO9Vvr0vXhfphnZxY11yp3pqddBytCtHagVkhqL5xX/ximG5uRVKT6AFORj2NxRs6twve1Lp2yF1g== 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 Received: from BN9PR11MB5483.namprd11.prod.outlook.com (2603:10b6:408:104::10) by BYAPR11MB3640.namprd11.prod.outlook.com (2603:10b6:a03:f7::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.19; Thu, 28 Jul 2022 16:46:04 +0000 Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::7d76:87d2:50dd:bc57]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::7d76:87d2:50dd:bc57%3]) with mapi id 15.20.5482.011; Thu, 28 Jul 2022 16:46:04 +0000 From: "Chiu, Chasel" To: "devel@edk2.groups.io" , "Chiu, Chasel" CC: "Desimone, Nathaniel L" , "Zeng, Star" Subject: Re: [edk2-devel] [PATCH v2] IntelFsp2Pkg: FSPI_UPD is not mandatory. Thread-Topic: [edk2-devel] [PATCH v2] IntelFsp2Pkg: FSPI_UPD is not mandatory. Thread-Index: AQHYokEcKDI9GHGNfUaRReHuryoe/62T/ndg Date: Thu, 28 Jul 2022 16:46:04 +0000 Message-ID: References: <1705E66000A71BDC.1380@groups.io> In-Reply-To: <1705E66000A71BDC.1380@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.500.17 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 78e57e25-661a-4343-227a-08da70b8a996 x-ms-traffictypediagnostic: BYAPR11MB3640:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: B6YxdU9GKAivVgtIFeWqXFjD4ObFoZ8EPAB95hthSPPSBhZ0ZWjVco+HAn0ZKzsV6ibjjxkLOGvCv5/kk+6ZMKqWVAcmSNo8JAvphkOmV6Bw5UaZ6o2bSFmjXiYYU3VTstKnMBaTlpSzDbrQWaNbMnTWAa2Pu24RanAjQYzxdWvpl3SbADMgSsTnlMfQ3y4LMyPOCVeB5rdQ/IEnnsbbCU9uKk4GWzReW+/7ZvPH6pl7yv5TEgboGTuH1YiN4KtHMjoafpgLgPXCfxhUgOOTki9/kVnK7z6rDajfEfyv3lLGEUvMQ24/Ppl2RzZQPmhXDKypgtZ3bN8TpcMw/WBWPB8u/HgyWDTKupzklx0QcnrbrqSxPxJ8ELrpbBpUK4zuIajajvM9ipHGrUQgtjm37ublowgdXi9bt/TKOGhDwj4BrXNq/eytYO7Fqqju+L7OoLA+r7W4GQhz9ge8KQkbcV65etXlLZWlDK/pA26qRWnJxT/h7FuZkmPWbFEZmYIkIxJTc3v086PaLusANXFHbFyJlXf1Lm98fUzHjTJWpO002dIYOwQ+9QVIZNb5c8Ai13sjqvMg0cqRXS5z6hCldBOC3Evr2mxTxQJTemnwjE8craw6QIIAP5xKtmgP0H6H4rhZc9DRtgC2pvvamfJQS2fsltcD3UsEqr5YpL5EuiZ913bG78dewPUubrvUfBUOsOQA228u+O4akDECdmyUPvjqSdcLoC8kjSNx0PDI4CKOdTvIlsRU3Yh7PcUrIgjkKrSlFOUyvr3+bQDl7IY8wT6YExrD6X3HsoGcuvM04gjXZu56GkSxWyH416nws9YqnvKUCNCowYeIOGfHjwigLA6WjhgxGxXy8TuHTjsyK55e+D6XfWUu2daDB1AlDIfL x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN9PR11MB5483.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(366004)(136003)(39860400002)(376002)(346002)(66946007)(966005)(478600001)(5660300002)(71200400001)(66476007)(6506007)(53546011)(66446008)(26005)(9686003)(33656002)(66556008)(2906002)(8936002)(7696005)(76116006)(64756008)(41300700001)(8676002)(4326008)(52536014)(54906003)(86362001)(55016003)(38100700002)(316002)(186003)(19627235002)(38070700005)(122000001)(82960400001)(107886003)(110136005)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?R7HUT5IdgUpjLW4iBiRw51lSCfdG/UqgJj/40vwzPC+2J4lpkl/CU9I9uocL?= =?us-ascii?Q?3HIQ8N6C6seFryDc5DsJV2slGDX7byP0sEvIWNNbpa1cCItRgPu6H/mqAeAb?= =?us-ascii?Q?cYBt0Ymhht4To4958tUeGsOvH6KzFOqE3goE19RLcftLkjQZbJRBqpvcuoXJ?= =?us-ascii?Q?oqqV2svYLWYWxJCv/JHMFBPXo3/2KAte4raymqJe1wiuNZPQcajSITP5uybp?= =?us-ascii?Q?id7TiJkXnsKNa3SpINznbgtKppzytqnADhcUgEJZ73jby438duwDJt+k9nTl?= =?us-ascii?Q?3SQYip17dyXaB9wb4TNbPqhLFl2wwYZoLFxhJkP9QrPirk8rzPI0FRDDVf17?= =?us-ascii?Q?4JVVGCcel/RZMovz8I/DH7fcwpuxkoJr3cF9qyUhhcDkSgU5Hq1c+fPh5v9D?= =?us-ascii?Q?lMHRCEcvxR9xusrOtKKZG0C900aSuNl0hTrcsROwfRATtiF1Y+sZ+jSmCOKb?= =?us-ascii?Q?AY5ftM8GrUnoP1Jw0njT+LGll5In1M3ObdLsfee7ptA2ofkMrMawIGS5zkED?= =?us-ascii?Q?jg3czN9cwEAMw5QC2wtGo0O6kR3ZcQlrFcqjMuGLDobt8OFtp76niCebGbSi?= =?us-ascii?Q?WVpmzlHNrx/e6WMDK2G0D80ApQ0rFUoM6ie46HF0PSNdaU8fXPFmqWggHnyv?= =?us-ascii?Q?YQCcnzIThcrE5SFoN9bUjKLZ36YP/R0HbzIvlLPom/hZkAcgoJHhxOeGenq8?= =?us-ascii?Q?e9Ce/FmstKh+N/txjG3yEdo4Lx8Bma1t7HZFrrJ4gT1pfipYU8D8qVwH53xR?= =?us-ascii?Q?Sk6ui/x16YBW6EZSlb9RYUyUyeV9HRrUJXh4zYVD1ICMP5Kn51x490Fxe6Bd?= =?us-ascii?Q?WwzHBHTDjff6pIkSSURobMyrj7a0X6/10p5F9xJgxeQQgF5ukbuv2zZu+rE0?= =?us-ascii?Q?OCZ4iBL67hza1lhhdis6ZNwix2ph4ZmwUsyfHhZdv6i7P0AoFJt1kft+qhXA?= =?us-ascii?Q?Z1X29FxVB9FbbbEsCsRJvDReZtjWy1zJM15KDqnUC5+w1rIKOSz0lLOQyWKS?= =?us-ascii?Q?6xB2xC6tM43zbEEIpOchGbjlBdJk/5cADRMV+GYkrP0zxzCKmDeG817Ne7eO?= =?us-ascii?Q?UXf4MZgUO3qA6kcMy1mv5UkUNXF5mOTAvcgVM1do2TL1wzXgREX2f1GbbcwR?= =?us-ascii?Q?3KimYnYCmYb8jwiiakF8CRfccMEZXsiD3J2YBZ9KBLVQSilAILLA/UnDUGYh?= =?us-ascii?Q?JYLMznq4+/A0Bt4igUvcR3uKEkwTrseyN4yUyXec20+Nc2AmajhH+6reml30?= =?us-ascii?Q?RMwNqgte52qF21/C45NVQwOC8Wu2HkKTLFPNG+626ZnCmJDgBNl8rusLUwWr?= =?us-ascii?Q?nJvTpZ9UktPvSZ0ZlcE7V3lhYhpo6xWXhITS6GEEXlqQ6MZFX9EhwVGJv6uF?= =?us-ascii?Q?yaS8TEFQbha04a3LFGpqxMKiecgq5AdvB+yLfc7JJ4v1iw4qsmvO5RTKQO4K?= =?us-ascii?Q?pAGXGrNtPGK2m5RKzw4U4oN+URZLdKyBgxrT44wZmS912eumP3etOMr3cYpx?= =?us-ascii?Q?nsk7rEdJo4lhVO8Ktriabcv99lNMkbEA8QYucbhHr4IMCwOc5m7ucIZ6p5El?= =?us-ascii?Q?+YduZCwg77fbT9QV9/914kOgdSGRdsgBBKU3tr73?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5483.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78e57e25-661a-4343-227a-08da70b8a996 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jul 2022 16:46:04.7203 (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: vFqvE5ijmGMn7nnBYqgSKok47C1hThi62PpDRBR7TgofthAqe1FsH0CUNtEQnmBEDAVmCpBgqLKBw/odhAKutQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3640 Return-Path: chasel.chiu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Patch merged: https://github.com/tianocore/edk2/commit/3eca64f157c340f9bbf5= 52d89a69698a3090c080 Thanks, Chasel > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Chiu, Chas= el > Sent: Wednesday, July 27, 2022 10:15 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Zeng, Star > Subject: [edk2-devel] [PATCH v2] IntelFsp2Pkg: FSPI_UPD is not mandatory. >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3993 > FSPI_UPD is required only When platforms implemented FSP_I component. > Updated the scripts to allow FSPI_UPD not present scenario. > Also fixed FSP_GLOBAL_DATA structure alignment issue and unnecessary non- > backward compatibility change in previous FSP_I patch. >=20 > Cc: Nate DeSimone > Cc: Star Zeng > Signed-off-by: Chasel Chiu > --- > IntelFsp2Pkg/Include/FspGlobalData.h | 43 +++++++++++++++++++++---------= ---- > --------- > IntelFsp2Pkg/Tools/GenCfgOpt.py | 14 ++++++++++---- > 2 files changed, 31 insertions(+), 26 deletions(-) >=20 > diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h > b/IntelFsp2Pkg/Include/FspGlobalData.h > index cf94f7b6a5..32c6d460e4 100644 > --- a/IntelFsp2Pkg/Include/FspGlobalData.h > +++ b/IntelFsp2Pkg/Include/FspGlobalData.h > @@ -42,58 +42,57 @@ typedef struct { > #define FSP_PERFORMANCE_DATA_TIMER_MASK 0xFFFFFFFFFFFFFF typedef > struct {- UINT32 Signature;- UINT8 Version;- UINT8 Reserve= d1[3];+ > UINT32 Signature;+ UINT8 Version;+ UINT8 = Reserved1[3]; > /// /// Offset 0x08 ///- UINTN CoreStack;- UINTN Reserved2;= + UINTN > CoreStack;+ VOID *SmmInitUpdPtr; /// /// IA32: Offset = 0x10; X64: > Offset 0x18 ///- UINT32 StatusCode;- UINT8 ApiIdx;+ UINT32 > StatusCode;+ UINT8 ApiIdx; /// /// 0: FSP in API mode; = 1: FSP in > DISPATCH mode ///- UINT8 FspMode;- UINT8 OnSeparateStack;- U= INT8 > Reserved3;- UINT32 NumberOfPhases;- UINT32 PhasesExecuted;- UINT= 32 > Reserved4[8];+ UINT8 FspMode;+ UINT8 OnSepara= teStack;+ > UINT8 Reserved2;+ UINT32 NumberOfPhases;+ UINT= 32 > PhasesExecuted;+ UINT32 Reserved3[8]; /// /// IA32: Offs= et 0x40; X64: > Offset 0x48 /// Start of UINTN and pointer section- /// All UINTN and = pointer > members must be put in this section- /// except CoreStack and Reserved2.= In > addition, the number of- /// UINTN and pointer members must be even for > natural alignment- /// in both IA32 and X64.+ /// All UINTN and pointer > members are put in this section+ /// for maintaining natural alignment f= or both > IA32 and X64 builds. /// FSP_PLAT_DATA PlatformData; VOID > *TempRamInitUpdPtr; VOID *MemoryInitUpdPtr; VOID > *SiliconInitUpdPtr;- VOID *SmmInitUpdPtr; ///- /// IA32= : Offset 0x68; > X64: Offset 0x98+ /// IA32: Offset 0x64; X64: Offset 0x90 /// To store= function > parameters pointer /// so it can be retrieved after stack switched. /= // VOID > *FunctionParameterPtr; FSP_INFO_HEADER *FspInfoHeader; VOID > *UpdDataPtr;- UINTN Reserved5; /// /// End of UINTN and= pointer > section+ /// At this point, next field offset must be either *0h or *8h = to+ /// > meet natural alignment requirement. ///- UINT8 Reserved6[= 16];+ > UINT8 Reserved4[16]; UINT32 PerfSig; UINT16 = PerfLen;- > UINT16 Reserved7;+ UINT16 Reserved5; UINT32 = PerfIdx;+ > UINT32 Reserved6; UINT64 PerfData[32]; } FSP_GL= OBAL_DATA; > diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py > b/IntelFsp2Pkg/Tools/GenCfgOpt.py > index 128b896592..71c48f10e0 100644 > --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py > +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py > @@ -959,8 +959,13 @@ EndList > UpdTxtFile =3D '' FvDir =3D self._FvDir = if GuidList[Index] not in > self._MacroDict:- self.Error =3D "%s definition is missing= in DSC file" % > (GuidList[Index])- return 1+ NoFSPI =3D Fal= se+ if > GuidList[Index] =3D=3D 'FSP_I_UPD_TOOL_GUID':+ NoFSPI = =3D True+ > continue+ else:+ self.Error =3D "%s def= inition is missing in DSC > file" % (GuidList[Index])+ return 1 if Up= dTxtFile =3D=3D '': > UpdTxtFile =3D os.path.join(FvDir, self._MacroDict[GuidList[Index]] + '.t= xt')@@ - > 1296,7 +1301,8 @@ EndList > elif '_S' in SignatureStr[6:6+2]: TxtB= ody.append("#define > FSPS_UPD_SIGNATURE %s /* '%s' */\n\n" % (Item['value= '], > SignatureStr)) elif '_I' in SignatureStr[6:6+2]:- > TxtBody.append("#define FSPI_UPD_SIGNATURE %s /* '%s= ' */\n\n" > % (Item['value'], SignatureStr))+ if NoFSPI =3D=3D True= :+ > TxtBody.append("#define FSPI_UPD_SIGNATURE %s /* '%s= ' */\n\n" > % (Item['value'], SignatureStr)) TxtBody.append("\n") fo= r Region in > ['UPD']:@@ -1702,7 +1708,7 @@ EndList > def Usage():- print ("GenCfgOpt Version 0.58")+ print ("GenCfgOp= t Version > 0.59") print ("Usage:") print (" GenCfgOpt UPDTXT PlatformDs= cFile > BuildFvDir [-D Macros]") print (" GenCfgOpt HEADE= R > PlatformDscFile BuildFvDir InputHFile [-D Macros]")-- > 2.35.0.windows.1 >=20 >=20 >=20 > -=3D-=3D-=3D-=3D-=3D-=3D > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#91933): https://edk2.groups.io/g/devel/message/91933 > Mute This Topic: https://groups.io/mt/92665008/1777047 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [chasel.chiu@intel.com]= -=3D- > =3D-=3D-=3D-=3D-=3D >=20