From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.200583.1672304715298341488 for ; Thu, 29 Dec 2022 01:05:16 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=UtMTokhx; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: bob.c.feng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672304715; x=1703840715; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=7YZ4PYObElPy/b0TvtOmO2aDKKTxPUXCnXsqejuOwbs=; b=UtMTokhxbhqDoYxLeFPbHEpnb/F9zi/DMExe/kgAFqy1cNsyXpdfPDgL VXRaPTS10zsge3/wCH3d2O3UBki7ExE5ShEJaRrje/Dv+QakfWzG2t759 Gp5HoioCzVOndAxEPtQBn2j5nu9CkncW6U2Zma/xDnQ6l2BRIi8OSEtMT EABPsubm3QQ6b9naVJiQl5XtykEJPL6TPQS0dBmG/jYIY0gWIFrPCmKWC thlIEaRqEs2PZetcJFpXOt3X8rRLtIoorq1F7WtW995/d2uMyl2o9Hh6z qh7u06bZO3Hv4FFR3mwuvcWHsQsoNjtuS0PXy679ArfbUGBlzOVt+qwwT Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="348219788" X-IronPort-AV: E=Sophos;i="5.96,283,1665471600"; d="scan'208";a="348219788" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Dec 2022 01:05:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="742250877" X-IronPort-AV: E=Sophos;i="5.96,283,1665471600"; d="scan'208";a="742250877" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by FMSMGA003.fm.intel.com with ESMTP; 29 Dec 2022 01:05:14 -0800 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Thu, 29 Dec 2022 01:05:14 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Thu, 29 Dec 2022 01:05:13 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Thu, 29 Dec 2022 01:05:13 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.170) 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.2507.16; Thu, 29 Dec 2022 01:05:13 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RFw1niTKTSoLe9D5ydtH8tUCVlbv/ldBz4jM0Wpkh3vEdy2Hobjj2JsyJL9PV8z58L6YpFGGtKJLIj5LdpO60g1QGqFV98TFnBkBDstIML0nGUIWAfAcqWQjMCRAffGSv4C1E+JR5/skSPL6uTXWsFGhyeCKLPihBJKMTHCIT2tVVVoEt7GW9/YG8vcnwo8DqE23fkgo5DBd8boijXp/7xAdpYlm0hnfO+zASqyFMldEt5tdIlM5FGmv/pu+MqAxqq6geSAYPpBiSGQ/VfrRYU9Ovt/ppValacgPMCWhmKP1+vJ9u5LXruSDFikLxffsntrHgRYgZKudjDvyzB9J4A== 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=4kdOeFyteUx2u3cSLRhCUBJl8ZRGjfBR7NfP3j0HE40=; b=g1TntdmJhOboY2gCclgti6lsjFXVKn0pO9aLZdA4YuJp+H3zfjuJCnuyYV75r9eU2EJKmlfIWjz3Y60whiCnkLKg6d+RpcsK0omRwZaUm/H43AO/dlWCPxtrKhIi2kQbHp2zq6Md7vuEGPkrbQ40nMGdGmsCMcTjORsDKsjnPL/xV4IBtJmH6LGPT/hMBpiwuKNVDjjZaVMsxbfu2/nt7E4XNGYmob/fgIEWGcM2CU1zZxRsNGKI973Cw7WoXxsKPf4VmbVDfSDApdqxjgijQWDmny5a8lJFf6Ey5In1wAoUjvmkfO7ZemVI22A85AKe1iBLvb5Hz33QmaO3Z2qvUQ== 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 PH7PR11MB5863.namprd11.prod.outlook.com (2603:10b6:510:135::11) by SA3PR11MB8076.namprd11.prod.outlook.com (2603:10b6:806:2f0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.16; Thu, 29 Dec 2022 09:05:11 +0000 Received: from PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::1251:f989:b162:4186]) by PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::1251:f989:b162:4186%3]) with mapi id 15.20.5944.012; Thu, 29 Dec 2022 09:05:10 +0000 From: "Bob Feng" To: "Chiang, Dakota" , "devel@edk2.groups.io" CC: "Gao, Liming" , "Lin, Jason1" , "Kumar, Rahul R" Subject: Re: [PATCH] S-ACM entry ver 0x200 does not contain requested FMS&mask Thread-Topic: [PATCH] S-ACM entry ver 0x200 does not contain requested FMS&mask Thread-Index: AQHZGdTviSYtQwM+6ESozIH00FvgsK6ElZJQ Date: Thu, 29 Dec 2022 09:05:10 +0000 Message-ID: References: <6999c9cfb4e13e2883ec19e7671b171ad64abb6f.1672132941.git.dakota.chiang@intel.com> In-Reply-To: <6999c9cfb4e13e2883ec19e7671b171ad64abb6f.1672132941.git.dakota.chiang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PH7PR11MB5863:EE_|SA3PR11MB8076:EE_ x-ms-office365-filtering-correlation-id: 2986b288-05fe-4334-c5d8-08dae97bca1d x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: nXhmT3pm4adKSjKCdVLDiQiVbTBRl2ACQk7XJjm6bC5pg0HxOOQnDizFKaIJsz3WIG6V++tKcqKoFIRdgq91H3B0dM4de0lezXw+sfThEZjUmjSrFXr84WaS+dN4ZSjAc2uKn/OsZ1zPILrcp4+BArmoIgyjoJkyZv0kVkYQp5V2OaWyXEHjwV73ZuOMMsDE5MMDE2AII3MNnAcDzP7h8u/odxvD3f9MjaJFwttY6ODIFI+1lSA3IDoy9jwjzceojZS9Hm29d6fxbTeAL7HxS4DqzAtnA9/fsJIE4tbbqYnASJsL6EYMs7b098SFgs/hUiTfCNoOtx1gmuQ7IYd15ca1U+blBJK1y9Ir2a+KiAGD7Kbn4PBC5C7wKQHYBp2JWoicne6o+enGiLUXNJ4PYQM7ceja8CJE2xNoTjWhUHuwjDd0GUonMynRT7pQSUdg2FCS2eEPmWmRCDygEZrDQXlbZ8fvNVXMbpDa01qYleQUTiy/v1DVQYDZlp8nK4b382VRijBQzAFCH1bLHyVvS0lfa2vUpXcsbJa8NYpEl2vr7RNABXi9kuE9R+snCa4BJ0h4If3E4BSWj3N9FqAZUVfaqpD3kq0myVVbTzAEpghXWA6tfXQvZKs8xmVsRUCybzwxsR9JEoXY4OB9v3e+RPBlr8XhnHATFEe8FIBBLPQYYZrGPIHXvHqhXxEit+dmFkVdpsDrV9fO1WHDtPE6qygupLsqVj2apByLmw91T9g= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB5863.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(376002)(39860400002)(366004)(346002)(396003)(451199015)(83380400001)(71200400001)(966005)(9686003)(55016003)(186003)(478600001)(107886003)(53546011)(7696005)(33656002)(6506007)(38070700005)(86362001)(82960400001)(38100700002)(5660300002)(122000001)(8936002)(52536014)(2906002)(110136005)(54906003)(316002)(8676002)(4326008)(41300700001)(66476007)(26005)(66556008)(66446008)(64756008)(66946007)(76116006);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?fXiMC9ovDXMwHLsczawk5gXp5M+Zdirka9pYMrvMiwClnv6ygvM4DwLiecLO?= =?us-ascii?Q?k12cMP/GMoYafkJMzgGfGCmhGLCiK9sYeu4h1O0zPRXwt2JZH2vEt+zYV9Ci?= =?us-ascii?Q?kwiQOQBWKZa2BhVL3cFBavPbCj4Yrgk9tGhA9arkVCEnZ4x6JQMVHWqLOL7s?= =?us-ascii?Q?C7o5B9Pno9o4HJLTHgrY7vXCqACOw/5nWM3Elk2QpZxs6wMy8kWrVJIhWW8F?= =?us-ascii?Q?cXd2+t2og7hDngNBqokNlpSL27opGqKDFpqCZ5vLt0U1l2TdVibkrIUQimOf?= =?us-ascii?Q?VwFrUVd0nNzdRqyCxxObgzRH6tlKplyGfwqtMXynLuieJBBReSDoeGBlDN75?= =?us-ascii?Q?MgRN5rNp8Z3hWnjwJTK/GCDSsPRSDnsCaUWG6tvrytjAFMa0XhElQe4rUKyu?= =?us-ascii?Q?v5/FuDBMJYlKZ2r2Cx9wmXF7CoskwXr6DfduKag5dlEGTFtwdkY4KLQT+0jt?= =?us-ascii?Q?yXhr4AcMKHSG0gdOphEplWYraGmVNZE7k1LQRLPltNWgmlrRqW/9tpns9r+n?= =?us-ascii?Q?NwG+Mu7q+zK8Qqu4esGEZf/E9Kd5TXBkgMVudXOmIHdyzQhN+i8qLnegV8FB?= =?us-ascii?Q?jAoLmHSrIIg0refPvzdY+Y/FjPwP/405rAiKMCwrDqWJg/44pA8xWdvho3S0?= =?us-ascii?Q?h7OkfLja1nQlF9wsSDnRmBMmIBv1CHiqncNDUZlTNV0dRvofMe0CaQUDuuZr?= =?us-ascii?Q?8TfqYa1KX4iNdxrZOAkLgKqjoevtTbP1xO6vPcoXH1MUQtaH9ELK229pFtgk?= =?us-ascii?Q?FDPaI7kTQOkKz1WQL62w7SGlvd+VHv0RlyoUVmSnQ3hGn9fcysxAH+R4fPzC?= =?us-ascii?Q?v7Ms/+9DLHQP2hr0JoXF9Q9V2Gr15ueP0LfNj+Wko+3HDYWno4wbwoq9FAr8?= =?us-ascii?Q?0AYFrfQg+AYYd3CarHDH/orHxu0aFcYjU1Uoo8P6OHCFIc/oINbcuiwVODy1?= =?us-ascii?Q?4omn/yaQC6XEyuA9eXUprBnpmOiC8EpPeJIgiuKPThzjzK2cTlTDdi6sRcDN?= =?us-ascii?Q?1St0T1VWCI/Ih0gm9PyJGUW1RKB3vXLnCGNogBsjJ4WO/jFESGzQDGXdALHm?= =?us-ascii?Q?IpgCHWA0miAFwP+svXGYDaVNUZmp/Y3GjWHhA6+ksElucXykuiZn4io9WvNW?= =?us-ascii?Q?OCRd4M9RtvEbBh2rtMKmZXRfoRqyEl3fZCJ3kdU/oh4/9dZRdjwiz0n96+gJ?= =?us-ascii?Q?hXIwylqOMsEAvMWrXfo8+LcY8loU3I8kb6s8OiNO1wCG+3nldu57O1+XYVMf?= =?us-ascii?Q?A7ThSZ+8a0sbdG6aea/32Q2et6/UdgXcGKEbg2EZHlZzAgGxXzdBJRjHmMsk?= =?us-ascii?Q?TQXY/YxCcNPfBFZIuDWUMKSGDPVwYd0FA8aOmcPFhzowyMa4Hx/2h7PbdaAJ?= =?us-ascii?Q?bwkqK6G2ZnUBJ5XY6CSTGwmq22lOzLtQZtxsEKmL1QO3o5KhUSecIIeHjeUd?= =?us-ascii?Q?etur2ho50PqFAvlRHTuZcXoq+Eu3O5lGkg5AAbM8dHlpMpR75YX90eCE1g0p?= =?us-ascii?Q?XDCLKHhy3gz6q4qfqEGt0sHVYMcKlystLCHZ/IXmdzcH0M0HwydaBxphVVTE?= =?us-ascii?Q?rSac+D0UajI16/xuRTLqImoqw3GgEAyPNDUQnt0j?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5863.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2986b288-05fe-4334-c5d8-08dae97bca1d X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Dec 2022 09:05:10.7076 (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: VW7zt6ZkPXaiCVjz1miD4chLWrpo3G3sBhxwMt66UUxfHQiOIJ8wHi59YsY/OiOw9Psu/iRvotVWHfdQ2Lq8xw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR11MB8076 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Chiang, Dakota =20 Sent: Tuesday, December 27, 2022 5:23 PM To: devel@edk2.groups.io Cc: Chiang, Dakota ; Feng, Bob C ; Gao, Liming ; Lin, Jason1 ; Kumar, Rahul R Subject: [PATCH] S-ACM entry ver 0x200 does not contain requested FMS&mask From: Dakota Chiang REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4198 After commit 1e1e35bb3b2fceea75ad97968da4b31f059dcb4c, FIT Type 2 ACM entry is not generated as expected with given -I arguments. FMS/FMS value is overridden by GetAcmFms(). This patch detects whether FMS/FMS Mask is already assigned with -I argumen= t. If it's not zero, skip invoking GetAcmFms(). Signed-off-by: Dakota Chiang Cc: Bob Feng Cc: Liming Gao Cc: Jason1 Lin Cc: Rahul R Kumar --- Silicon/Intel/Tools/FitGen/FitGen.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitG= en/FitGen.c index 4ba07945a6..16c8b9b026 100644 --- a/Silicon/Intel/Tools/FitGen/FitGen.c +++ b/Silicon/Intel/Tools/FitGen/FitGen.c @@ -3745,9 +3745,14 @@ FitGen ( DumpAcm((ACM_FORMAT *)AcmBuffer); if (gFitTableCo= ntext.StartupAcm[Index].Version >=3D 0x200) {- GetAcmFms((ACM_= FORMAT *)AcmBuffer, &gFitTableContext.StartupAcm[Index].FMS, &gFitTableCont= ext.StartupAcm[Index].FMSMask);- printf("ACM FMS:%08x\n", gFit= TableContext.StartupAcm[Index].FMS);- printf("ACM FMS Mask:%08= x\n", gFitTableContext.StartupAcm[Index].FMSMask);+ if ((gFitT= ableContext.StartupAcm[Index].FMS =3D=3D 0) && (gFitTableContext.StartupAcm= [Index].FMSMask =3D=3D 0)) {+ //+ // FMS and = FMSMask is not assigned via -I argument. Get it from ACM+ //= + GetAcmFms((ACM_FORMAT *)AcmBuffer, &gFitTableContext.Start= upAcm[Index].FMS, &gFitTableContext.StartupAcm[Index].FMSMask);+ = printf("ACM FMS:%08x\n", gFitTableContext.StartupAcm[Index].FMS);+ = printf("ACM FMS Mask:%08x\n", gFitTableContext.StartupAcm[Index= ].FMSMask);+ } } } else {--=20 2.38.1.windows.1