From nobody Sun May 19 05:22:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97765+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97765+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1672160870; cv=none; d=zohomail.com; s=zohoarc; b=nDjbL3CwGBDJXv4fZyVxxDXePzt536N57lOzPVQjOKK2qSaT/ew8eNuJ/z8bdhjeE6ydTb+VC0j1g4W3X4G7AsEm0kb5BSeKnKUTn1Hk4c3cZX6+UkaNNZfwmKNrYeKJ5JG08TqPNpOQfsy79MLkxy09KcoePEtgLk6fWR60Vmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672160870; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=5KIQ8s9KD4MEN0bDoKsHupo0Ww28/Pzmh+qaP9LpPyA=; b=nVmdbZ6Ch/ntqSGljAf8+Z77J/+wtioDr+AC60pFGPAIvCwS4S037JIUyDadG8ZsxpX1MPuj5Ey275WL1oEoy5xdugO1ktoEuB8KkY1DSs4p9pzKuWLw1ieLlkgz6aW6PjCNKUviDqcA82f9kFU6vGJr1gV0vfy9uw1atg+VWCs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97765+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1672160870513613.4130982842258; Tue, 27 Dec 2022 09:07:50 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id pmzKYY1788612xWfIOjmIdTK; Tue, 27 Dec 2022 09:07:49 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.153712.1672133031683839778 for ; Tue, 27 Dec 2022 01:23:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="304175627" X-IronPort-AV: E=Sophos;i="5.96,278,1665471600"; d="scan'208";a="304175627" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2022 01:23:46 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="827076875" X-IronPort-AV: E=Sophos;i="5.96,278,1665471600"; d="scan'208";a="827076875" X-Received: from dakotach-mobl1.gar.corp.intel.com ([10.225.40.118]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2022 01:23:44 -0800 From: dakota.chiang@intel.com To: devel@edk2.groups.io Cc: Dakota Chiang , Bob Feng , Liming Gao , Jason1 Lin , Rahul R Kumar Subject: [edk2-devel] [PATCH] S-ACM entry ver 0x200 does not contain requested FMS&mask Date: Tue, 27 Dec 2022 17:23:29 +0800 Message-Id: <6999c9cfb4e13e2883ec19e7671b171ad64abb6f.1672132941.git.dakota.chiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,dakota.chiang@intel.com X-Gm-Message-State: t4nep4jIS81GrUxXAYyTGaJHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672160869; bh=Bi3MyYVcGgJoqR7lB4/U5n6bp/5RVEEx6XM8F23vwnU=; h=Cc:Date:From:Reply-To:Subject:To; b=YPKNda4BgTjJSLTbtPUUVCr7ZQEA0TdXDyO/biL1gKamrLY2Ci5vrGqPQnQSycPPOUk D+nzqbk37nFPxtDhvY2N2a38hMV4I8sNSXansBugM7EYr0cWL06InYmFk325Drv71BNgy cdYUVCZc98qgBTqT513csaAbS89eyccAKZc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672160871565000003 Content-Type: text/plain; charset="utf-8" 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 argument. 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 Reviewed-by: Bob Feng --- 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); =20 if (gFitTableContext.StartupAcm[Index].Version >=3D 0x200) { - GetAcmFms((ACM_FORMAT *)AcmBuffer, &gFitTableContext.Startup= Acm[Index].FMS, &gFitTableContext.StartupAcm[Index].FMSMask); - printf("ACM FMS:%08x\n", gFitTableContext.StartupAcm[Index].= FMS); - printf("ACM FMS Mask:%08x\n", gFitTableContext.StartupAcm[In= dex].FMSMask); + if ((gFitTableContext.StartupAcm[Index].FMS =3D=3D 0) && (gF= itTableContext.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 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97765): https://edk2.groups.io/g/devel/message/97765 Mute This Topic: https://groups.io/mt/95906183/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-