From nobody Mon Apr 29 15:10: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+82675+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+82675+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635235556; cv=none; d=zohomail.com; s=zohoarc; b=dzoporJBveoB2qlwy8RteZ9hC4tZnSyTuVrOjNFYVtf70OoNqgHITi91S67uU2egC6D6hfVEArLfc7PMtlAHNeTZxjX377592O32iLLD/AzvTohg5oQoK1lDRfXSLkLcMXqcXiucn0PG1CxhleDm9d/WuO9IyjMLbomUsKMFlIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635235556; 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=7ou3TvvjI6KvjP6MVFhZC4MJRtH2saI7wfH7rM6wfk4=; b=ih+XCwbXtNL/FBs/jjI7vipboGUQRSdYsvl3oeUk2WXXMwqUHWQFJc9VhzRar+1Wyx3O0OUriyGaxmFis/JisisCqYdvaPCFZ/KonazjvMP9iv+5RbTLuxBQyg29yR4XPGi6/XqtJm3dNmNfFfZliYc/jbOtLPQV1aLWxZifPmk= 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+82675+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 1635235556743446.95178869187987; Tue, 26 Oct 2021 01:05:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id kfwxYY1788612xPoXS5REvWI; Tue, 26 Oct 2021 01:05:56 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web09.9037.1635235554867972536 for ; Tue, 26 Oct 2021 01:05:55 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10148"; a="210630612" X-IronPort-AV: E=Sophos;i="5.87,182,1631602800"; d="scan'208";a="210630612" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2021 01:05:54 -0700 X-IronPort-AV: E=Sophos;i="5.87,182,1631602800"; d="scan'208";a="578527942" X-Received: from cchiu4-mobl.gar.corp.intel.com ([10.252.191.6]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2021 01:05:52 -0700 From: "Chiu, Chasel" To: devel@edk2.groups.io Cc: Chasel Chiu , Maurice Ma , Nate DeSimone , Star Zeng Subject: [edk2-devel] [PATCH] IntelFsp2Pkg/SplitFspBin.py: adopt FSP 2.3 specification. Date: Tue, 26 Oct 2021 16:05:46 +0800 Message-Id: <20211026080547.1134-1-chasel.chiu@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,chasel.chiu@intel.com X-Gm-Message-State: IokhWJZN9IYyvyFOEKYI83Zpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635235556; bh=81z7m8DW/UxA0hzjbl8OydjhjZC79dKeawB5XmV4CSk=; h=Cc:Date:From:Reply-To:Subject:To; b=g0WsBe2HLT4xsA0QjO4hasr9dUfia0gTsy24TsuK3Lbg0up9xqSQpqFqKUFt2f9xmKp 0PAEp19mPrVqkcTOnWF9KTFxxnroP1pLZiUMMLc7WLMUjKaU09d5WnlAqc8DrnVP6JOKe TSCfpNA1/3EmyDED021TCrLoNey+VGoDkrA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635235558041100001 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3705 FSP 2.3 has updated FSP_INFO_HEADER to support ExtendedImageRevision and SplitFspBin.py needs to support it. Also updated script to display integer value basing on length. Cc: Maurice Ma Cc: Nate DeSimone Cc: Star Zeng Signed-off-by: Chasel Chiu Reviewed-by: Maurice Ma Reviewed-by: Nate DeSimone Reviewed-by: Star Zeng --- IntelFsp2Pkg/Tools/SplitFspBin.py | 66 +++++++++++++++++++++++++++++++++++= +++++++++---------------------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py b/IntelFsp2Pkg/Tools/SplitFs= pBin.py index 24272e82af..20e329a76e 100644 --- a/IntelFsp2Pkg/Tools/SplitFspBin.py +++ b/IntelFsp2Pkg/Tools/SplitFspBin.py @@ -1,6 +1,6 @@ ## @ FspTool.py # -# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -103,26 +103,29 @@ class FSP_COMMON_HEADER(Structure): =20 class FSP_INFORMATION_HEADER(Structure): _fields_ =3D [ - ('Signature', ARRAY(c_char, 4)), - ('HeaderLength', c_uint32), - ('Reserved1', c_uint16), - ('SpecVersion', c_uint8), - ('HeaderRevision', c_uint8), - ('ImageRevision', c_uint32), - ('ImageId', ARRAY(c_char, 8)), - ('ImageSize', c_uint32), - ('ImageBase', c_uint32), - ('ImageAttribute', c_uint16), - ('ComponentAttribute', c_uint16), - ('CfgRegionOffset', c_uint32), - ('CfgRegionSize', c_uint32), - ('Reserved2', c_uint32), - ('TempRamInitEntryOffset', c_uint32), - ('Reserved3', c_uint32), - ('NotifyPhaseEntryOffset', c_uint32), - ('FspMemoryInitEntryOffset', c_uint32), - ('TempRamExitEntryOffset', c_uint32), - ('FspSiliconInitEntryOffset', c_uint32) + ('Signature', ARRAY(c_char, 4)), + ('HeaderLength', c_uint32), + ('Reserved1', c_uint16), + ('SpecVersion', c_uint8), + ('HeaderRevision', c_uint8), + ('ImageRevision', c_uint32), + ('ImageId', ARRAY(c_char, 8)), + ('ImageSize', c_uint32), + ('ImageBase', c_uint32), + ('ImageAttribute', c_uint16), + ('ComponentAttribute', c_uint16), + ('CfgRegionOffset', c_uint32), + ('CfgRegionSize', c_uint32), + ('Reserved2', c_uint32), + ('TempRamInitEntryOffset', c_uint32), + ('Reserved3', c_uint32), + ('NotifyPhaseEntryOffset', c_uint32), + ('FspMemoryInitEntryOffset', c_uint32), + ('TempRamExitEntryOffset', c_uint32), + ('FspSiliconInitEntryOffset', c_uint32), + ('FspMultiPhaseSiInitEntryOffset', c_uint32), + ('ExtendedImageRevision', c_uint16), + ('Reserved4', c_uint16) ] =20 class FSP_PATCH_TABLE(Structure): @@ -390,7 +393,26 @@ def OutputStruct (obj, indent =3D 0, plen =3D 0): if IsStrType (val): rep =3D HandleNameStr (val) elif IsIntegerType (val): - rep =3D '0x%X' % val + if (key =3D=3D 'ImageRevision'): + FspImageRevisionMajor =3D ((val >> 24) & 0xFF) + FspImageRevisionMinor =3D ((val >> 16) & 0xFF) + FspImageRevisionRevision =3D ((val >> 8) & 0xFF) + FspImageRevisionBuildNumber =3D (val & 0xFF) + rep =3D '0x%08X' % val + elif (key =3D=3D 'ExtendedImageRevision'): + FspImageRevisionRevision |=3D (val & 0xFF00) + FspImageRevisionBuildNumber |=3D ((val << 8) & 0xFF00) + rep =3D "0x%04X ('%02X.%02X.%04X.%04X')" % (val, FspIm= ageRevisionMajor, FspImageRevisionMinor, FspImageRevisionRevision, FspImage= RevisionBuildNumber) + elif field[1] =3D=3D c_uint64: + rep =3D '0x%016X' % val + elif field[1] =3D=3D c_uint32: + rep =3D '0x%08X' % val + elif field[1] =3D=3D c_uint16: + rep =3D '0x%04X' % val + elif field[1] =3D=3D c_uint8: + rep =3D '0x%02X' % val + else: + rep =3D '0x%X' % val elif isinstance(val, c_uint24): rep =3D '0x%X' % val.get_value() elif 'c_ubyte_Array' in str(type(val)): --=20 2.28.0.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 (#82675): https://edk2.groups.io/g/devel/message/82675 Mute This Topic: https://groups.io/mt/86597871/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-