From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.15115.1621231750216568713 for ; Sun, 16 May 2021 23:09:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=phEX7PID; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: chasel.chiu@intel.com) IronPort-SDR: J/8GhR7chRG1UvODCM0JWd+PiPmOqE7kWdgVrCXX2pagz017fSfJy5drOXccXlrovvT4x0Z1g8 SoZSm991l5Mw== X-IronPort-AV: E=McAfee;i="6200,9189,9986"; a="285918438" X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="285918438" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2021 23:09:09 -0700 IronPort-SDR: 3lRLcQCdOHgg8+R6qD0GRAOAFk4OI2cF+G3E5FwYltx+wc2hPk11T0YZjFUCfwRqYs9Fy/HFux P0qYepenZGrQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="465514379" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by FMSMGA003.fm.intel.com with ESMTP; 16 May 2021 23:09:08 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Sun, 16 May 2021 23:09:08 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Sun, 16 May 2021 23:09:08 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4 via Frontend Transport; Sun, 16 May 2021 23:09:08 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.174) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Sun, 16 May 2021 23:09:08 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dDmtsmeH1J5S8LlmRN4fwTefJ1ZRRzqJtTRALfUKpjq3PomJR/Z1K0oZrRR5taPYDa1Wd9ROaFBhsz+NuC9Amohm7cN36Bj56mN7L3FR0N+vGKxlQqxb1kGtQe0xtgbSCyCrmxI2MRMyuq+TQgBI2mXOMpjoBiMRXcIMaPjv/MRCnuZBlawSrZ7cv399TU88fA5H9o0W+kf+uZAOYV69LKh3HRJ1hTZD215vjGdJ5kVFlVP9gkOYwSj8sNw0G5+RjxPsRuBoCGf2uUM/bA0/3VpLCEO0ilKQkhNhbg77xRx2ZX2xwDTBUGXrXiK6RlurAU9mh9G3q7HClWJatMeslA== 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=1KLG10kwVKQ743IjElBXoKAMX+xIvP6ati2bfaBJEd4=; b=V9k3wBjjRMQ3yq5b6VzXLm8Z0eoSwmaWAXXc1UP4iaghqtLFRRFbZ/C+MGeVcZykfJiVsUs2LX95NF937699of0i6wT8oT2eJM0iMr9INXAqZ/hF68cyXGhBsKTOn3M4pCR3H8S68CChfBQX6gsvSe1EBKKecHyxcrV9dt0rbWXndcJr1AalEd+P1lfgIWfiy7987x/sxlXm3sXXyVCPppixGpz1sBXxHcQbUdeODYUBhI2gRwzVDg+9s5m5cVHRgsoXuET+lkxYtowYYbSyXRPOzoU2JwCYQGr+kr3t0N9VID48vWeGuCFcCXyJf9Yemj4diPP113WhCxWMEw5b9g== 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=1KLG10kwVKQ743IjElBXoKAMX+xIvP6ati2bfaBJEd4=; b=phEX7PIDmmEv/leJ0nz2D5WvS0Nbh1T/eEM+/urYPyyRf5s7UNEY7dhuQENPQ3LT1SLa3fNyDLHr8hxOJWeo03V69+hUJDMfaUtayvgH8Z96g18MFZu0uem4TkDKym1eKCilnyXtZUmMVMBnii1YhLBQIViKOaSWwzVtVRGVZTk= Received: from SN6PR11MB2814.namprd11.prod.outlook.com (2603:10b6:805:55::15) by SN6PR11MB3263.namprd11.prod.outlook.com (2603:10b6:805:c5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Mon, 17 May 2021 06:09:07 +0000 Received: from SN6PR11MB2814.namprd11.prod.outlook.com ([fe80::6157:b65c:53b6:a320]) by SN6PR11MB2814.namprd11.prod.outlook.com ([fe80::6157:b65c:53b6:a320%6]) with mapi id 15.20.4129.031; Mon, 17 May 2021 06:09:07 +0000 From: "Chiu, Chasel" To: "Loo, Tung Lun" , "devel@edk2.groups.io" CC: "Ma, Maurice" , "Desimone, Nathaniel L" , "Zeng, Star" Subject: Re: [PATCH v3] IntelFsp2Pkg: YAML script bug fix Thread-Topic: [PATCH v3] IntelFsp2Pkg: YAML script bug fix Thread-Index: AQHXStG82JZpqOiEzUa1dqyY/DHL96rnMIcA Date: Mon, 17 May 2021 06:09:07 +0000 Message-ID: References: <20210517040413.1025-1-tung.lun.loo@intel.com> In-Reply-To: <20210517040413.1025-1-tung.lun.loo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 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: [114.43.28.163] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9b3bbde5-5302-4cac-ca3e-08d918fa47bf x-ms-traffictypediagnostic: SN6PR11MB3263: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:972; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: b8lXqNkpCckCfwYJm+ytBLRa0K9f4WWoCm/JCGgfBiDBDAvjx+nAf/2glxwyzu7/8pWxWt1GwxUFPoFPjo1PJIgNwz99IpK4mkmggpiHMKnJSaqKGHD/3iypReWSis8V5KAT3f13Tw8qA52exngQHFZLjPJt0JgPr9K4EUrtQpXtciZCmxzzllbAEHlnLEhgFamPzw/QRw4u4abuIazEPaA/O2jvZMJ8mmy9FTeSlJGH7Qck+F1HRvgo8tRMzr67H0rt49yInrCsL0dsDU3FyJfXXkMxrDIWT8B7Q0apMz2nIoIeo9lDTp4sXZ63aUkePbAkGf4/BSiQA1VyG6Ak1wOdGnIMymP6Z2YgyRHniH+U7uMwsXEz4k4Xn9Nwm4o2/yx8xSpC42QeT+mxbmiiXj/kFkCOkPotKXgKX7TUdzGhKxnwUIH+8hfaWnwGSKq9Cj7jjQ5vmCCDmG6x2Vo6ARBaI3RKBQRSQ9gq0iTst1oxg2KW7fYltgksUwyIjmy6R3P42V/CGQhcCQVB9zs/Luuva+7Yp79hqGf+3kdziu/SJ+l3osTWLgKItby/tJNRHB4qvlezwPZfQyrxDOxyke5K3y+G8gpoPZWYXgEzmXemc2k0Ow+xLaSAHPHOeylfdoDdq8EYBAT7je3BuNu9lIjTQ7TeUksfSwshuPXfc57CJtb8rPRQ0SWv+D0+ICruA8xHxw9BHMQpoBzshXtiERfwDKxva/IlCnZ2OgKYfyn1u5E4bVitAj3uXP+rcgbI3476b+CMfpVIQm1PpwU2dQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB2814.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(346002)(366004)(136003)(376002)(39860400002)(8936002)(19627235002)(9686003)(186003)(2906002)(55016002)(122000001)(83380400001)(38100700002)(86362001)(33656002)(53546011)(5660300002)(71200400001)(66476007)(64756008)(66446008)(66556008)(110136005)(66946007)(54906003)(7696005)(8676002)(52536014)(4326008)(6506007)(478600001)(26005)(316002)(76116006)(107886003)(11716005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?mwye/xLHTea15wj57tlgI0IP5YvX/1UuTygVNHLW/i3oifPhar9wELXehNDE?= =?us-ascii?Q?qmD4iXuwzxac2nT4kOJkOH7uvyjufYVYra/um+ZITnrZ8PPSC2lNAWK6vA86?= =?us-ascii?Q?iB+SZ3fogUhAgDAemWCcJPhCKBjyO8V7/vSnfqJCt5LBYwokhALlXEYLDoH4?= =?us-ascii?Q?BKlu7m0mnmsvJTltSGiPO3NCxXRZEjSuVNpm1vyRzHEnY+hnvjIkBMhUjrFX?= =?us-ascii?Q?0VYJagSqZVBQswlY7o0mVKpumymkHMvhK8bpMr1X8UAoEbj4Lcv5FkfZiyuQ?= =?us-ascii?Q?6aXqoF2zFwn2wg0EZ1QBHxMI6krtFW3/D/E5ePeY9EUPNVqHQ/ehMRcbd15b?= =?us-ascii?Q?lU2pXaDM19MhXl3sgbQmnnMPODuP9wd3ArXun5eBAKAILSpB65xQLGdAeX36?= =?us-ascii?Q?m0Ei6ADeu5q+Yv820YDFz8tp25MXay1UNG5EeKzrJS+5DZ5EbUNDTBK71YTB?= =?us-ascii?Q?SrD5O1xVKKdQblq/G4kzTejOPMuqwfOIxVbjPLbPka9cOtBgPQZhyVbqfZWK?= =?us-ascii?Q?BBVs1euvFbsDqAT4IYObuQyprTIdItzKGvTaEV/KY5wntO4KW6aHc3fDX5mg?= =?us-ascii?Q?JYoqQB4yYnf+iwp8atX/mXGrpVUEXhuKwQnTXJYjRa949Zfn4nz0nZSb1m9t?= =?us-ascii?Q?GTIdjQC0ixlR81YNZAE+qGwHX32uFYbeKtjbb7DayvUVC1+wNHN9dAt4u7nN?= =?us-ascii?Q?gaFAzRZ+IuSWbmCnEWtaFK6aCksXXU4ic2mUt/yMM6jZ8gHY7lsa5JzWnYS+?= =?us-ascii?Q?D+pPzKZxt6NLeiJg6qgrUlarUDDQTyZ9CUoUq0soO7vlzkSnlRTg3v+CD3iR?= =?us-ascii?Q?dSFNBtAkv4t7lgjYCBN4QIP8jBo813g07zNMrhmeryNrY5vUfJuujiW67eV8?= =?us-ascii?Q?m0KaOzVVVX4APVzkA0oA9cLotC+TCn/0O6u++Xk16hbNuhqgrLIvuLck0wWD?= =?us-ascii?Q?S7J0oqK5g0/N2fucHlhE5ErJuraVb2M14tFAjce5ZFWtBcAWjqXL7jT5oOPS?= =?us-ascii?Q?YNA5keiMRp9jL/cGINNd1lmgcRE0V0sjYt6wU67wPwd7zipxbbksRI5/L+y4?= =?us-ascii?Q?0YIH63dwwzr6q3kjvAjxKk7DRCku6Bn/PYJ3jbcRn1KXwusLqdC5xJIm/6W6?= =?us-ascii?Q?DFphdibtRgHwjP26N9sK6GHESQp0BMpA0CLSdMCzVMShT+wYTOX+9LNSNv2U?= =?us-ascii?Q?pM+GpgpTT2nCFaSt/hQ+bfsCcvOXReHn5TGT93Z9C1EtY5+9J5AKpElXWqxb?= =?us-ascii?Q?fkQk9lS4qKQtiIcWI2KY+YrFhE5Pu/M67LFv5AnOgZmitbUbXu9rF5jlUmI2?= =?us-ascii?Q?6iuLUA3dUQGyQR9EoR54pUHk?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2814.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b3bbde5-5302-4cac-ca3e-08d918fa47bf X-MS-Exchange-CrossTenant-originalarrivaltime: 17 May 2021 06:09:07.2199 (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: Dsfp/MyUECfkzmy00cZxn2puLlp5gkDSAgVMgpIF7bkwxS1GkK7Fec62O9so3H3h6GsDjpRuvu9j+ihHPPFSAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3263 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 Reviewed-by: Chasel Chiu > -----Original Message----- > From: Loo, Tung Lun > Sent: Monday, May 17, 2021 12:04 PM > To: devel@edk2.groups.io > Cc: Loo, Tung Lun ; Ma, Maurice > ; Desimone, Nathaniel L > ; Zeng, Star ; Chiu, > Chasel > Subject: [PATCH v3] IntelFsp2Pkg: YAML script bug fix >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3395 >=20 > This patch fixes the issue observed during BSF file to YAML file conversi= on. It > also addresses the issue during multibyte array data conversion check, fo= r > example the data representation of 0xFFFF instead of 0xFF, 0xFF would be > thrown exception "Array size is not proper" without this patch. >=20 > Cc: Maurice Ma > Cc: Nate DeSimone > Cc: Star Zeng > Cc: Chasel Chiu > Signed-off-by: Loo Tung Lun > --- > IntelFsp2Pkg/Tools/FspDscBsf2Yaml.py | 11 +++++++++-- > IntelFsp2Pkg/Tools/GenCfgOpt.py | 3 ++- > 2 files changed, 11 insertions(+), 3 deletions(-) >=20 > diff --git a/IntelFsp2Pkg/Tools/FspDscBsf2Yaml.py > b/IntelFsp2Pkg/Tools/FspDscBsf2Yaml.py > index cad9b60e73..d2ca7145ae 100644 > --- a/IntelFsp2Pkg/Tools/FspDscBsf2Yaml.py > +++ b/IntelFsp2Pkg/Tools/FspDscBsf2Yaml.py > @@ -46,6 +46,13 @@ def Bytes2Val(Bytes): > return reduce(lambda x, y: (x << 8) | y, Bytes[::-1]) +def Str2Byte= s(Value, > Blen):+ Result =3D bytearray(Value[1:-1], 'utf-8') # Excluding quotes= + if > len(Result) < Blen:+ Result.extend(b'\x00' * (Blen - len(Result)))= + return > Result++ class CFspBsf2Dsc: def __init__(self, bsf_file):@@ -108,7 += 115,8 > @@ class CFspBsf2Dsc: > cfg_item['find'] =3D prefix cfg_item['cn= ame'] =3D 'Signature' > cfg_item['length'] =3D len(finds[0][1])- cfg_item['value']= =3D '0x%X' % > Bytes2Val(finds[0][1].encode('UTF-8'))+ str2byte =3D Str2B= ytes("'" + > finds[0][1] + "'", len(finds[0][1]))+ cfg_item['value'] = =3D '0x%X' % > Bytes2Val(str2byte) cfg_list.append(dict(cfg_item)) = cfg_item =3D > dict(cfg_temp) find_list.pop(0)@@ -291,7 +299,6 @@ class > CFspDsc2Yaml(): > raise Exception('DSC variable creation error !') = else: raise > Exception('Unsupported file "%s" !' % file_name)- > gen_cfg_data.UpdateDefaultValue() self.gen_cfg_data =3D gen_cfg_d= ata > def print_dsc_line(self):diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py > b/IntelFsp2Pkg/Tools/GenCfgOpt.py > index 660824b740..714b2d8b1a 100644 > --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py > +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py > @@ -708,7 +708,8 @@ EndList > for Page in PageList: = Page =3D Page.strip() > Match =3D re.match("(\w+):\"(.+)\"", Page)- > self._CfgPageDict[Match.group(1)] =3D Match.group(2)+ = if > Match !=3D None:+ self._CfgPageDict[Ma= tch.group(1)] =3D > Match.group(2) Match =3D > re.match("(?:^|.+\s+)BLOCK:{NAME:\"(.+)\"\s*,\s*VER:\"(.+)\"\s*}", Remain= ing) > if Match:-- > 2.28.0.windows.1