From nobody Sat May 18 23:15:02 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+81130+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+81130+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1632611542; cv=none; d=zohomail.com; s=zohoarc; b=EM+So+1bEGIGg9+UmHd3TJlMz2Fu9Yixjd/8bM3Cv3px1hxeMVcGx2pi7xy9lHoFM8hQ1HrWVG8PKAGoNbPTbySDU3bVo09XgzATNwDAsv3VA7iFTMdOUERdBOccOxBhSO/o1DhnfR9rM7pZVESopm832/gUf3pRd9WxLa2nRHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632611542; 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=A94uZ6PVAQMiQlkrB/iiAK+7kJ4gH7G6JNfmGOZl/4I=; b=GBDy6VN3UPUgm6OMBrLgyv8IeI2of1AGFD6Fpv+GYhv1/pgAflASOrLLQRZ//0vQOTADhUa+j1i40G01ronCob+rwrlH0mUe+/GLwexb7ScQDAiczvhqilLSxe7Zf3LT3cgf/Iz+LNiO0FackO941kFqtMNt2wtgw3A8YVzCkLY= 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+81130+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 1632611542838426.5884475286829; Sat, 25 Sep 2021 16:12:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id yfpfYY1788612xPVyWSTgcgW; Sat, 25 Sep 2021 16:12:22 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web09.12666.1632611541946699213 for ; Sat, 25 Sep 2021 16:12:22 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10118"; a="211389756" X-IronPort-AV: E=Sophos;i="5.85,322,1624345200"; d="scan'208";a="211389756" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2021 16:12:21 -0700 X-IronPort-AV: E=Sophos;i="5.85,322,1624345200"; d="scan'208";a="586419141" X-Received: from gdong1-mobl1.amr.corp.intel.com ([10.255.67.241]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2021 16:12:20 -0700 From: "Guo Dong" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Maurice Ma , Benjamin You Subject: [edk2-devel] [`edk2-devel][PATCH v2] UefiPayloadPkg: Add ".upld_info" in universal payload Date: Sat, 25 Sep 2021 16:12:11 -0700 Message-Id: <20210925231211.221-1-guo.dong@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,guo.dong@intel.com X-Gm-Message-State: SPbQo3C6gEi3d4by1z450OjYx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632611542; bh=agjiNfB5CmQ5J7QHnh533aw0g6Y6D9IloAnT0zjpmuk=; h=Cc:Date:From:Reply-To:Subject:To; b=w8KECGNsuJ+91cCSIHGfj1PcotulWSBliRj3w/UBjkcVbFEdDLeY8tUGDyXQrZt2G9E 3LA/UZ42uQWP5x/PfhgcwVgzBjsvdNBqItNd5ks5sSimuZD3XDpovoV6VDaYYO9bfRB3+ WeZlr5nBGBRslU6dXoBC764ztStpr8RD/pY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632611544360100002 Content-Type: text/plain; charset="utf-8" From: Guo Dong V2: Use LittleEndianStructure by review comment. From the universal scalable firmware payload requirement V0.75, Payload must have Universal Payload Information Section ".upld_info" So update the build tool to add this section. Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You Signed-off-by: Guo Dong Reviewed-by: Ray Ni --- UefiPayloadPkg/UniversalPayloadBuild.py | 42 +++++++++++++++++++++++++++++= ++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive= rsalPayloadBuild.py index b78c6a7620..e624ec5874 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -10,6 +10,31 @@ import subprocess import os import shutil import sys +from ctypes import * + +sys.dont_write_bytecode =3D True + +class UPLD_INFO_HEADER(LittleEndianStructure): + _pack_ =3D 1 + _fields_ =3D [ + ('Identifier', ARRAY(c_char, 4)), + ('HeaderLength', c_uint32), + ('SpecRevision', c_uint16), + ('Reserved', c_uint16), + ('Revision', c_uint32), + ('Attribute', c_uint32), + ('Capability', c_uint32), + ('ProducerId', ARRAY(c_char, 16)), + ('ImageId', ARRAY(c_char, 16)), + ] + + def __init__(self): + self.Identifier =3D b'UPLD' + self.HeaderLength =3D sizeof(UPLD_INFO_HEADER) + self.HeaderRevision =3D 0x0075 + self.Revision =3D 0x0000010105 + self.ImageId =3D b'UEFI' + self.ProducerId =3D b'INTEL' =20 def RunCommand(cmd): print(cmd) @@ -37,6 +62,7 @@ def BuildUniversalPayload(Args, MacroList): EntryOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ElfToolChai= n}", os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPayload= Entry/DEBUG/UniversalPayloadEntry.dll")) PayloadReportPath =3D os.path.join(BuildDir, "UefiUniversalPayload.txt= ") ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt") + UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin") =20 if "CLANG_BIN" in os.environ: LlvmObjcopyPath =3D os.path.join(os.environ["CLANG_BIN"], "llvm-ob= jcopy") @@ -65,12 +91,21 @@ def BuildUniversalPayload(Args, MacroList): BuildModule +=3D Defines RunCommand(BuildModule) =20 + # + # Buid Universal Payload Information Section ".upld_info" + # + upld_info_hdr =3D UPLD_INFO_HEADER() + upld_info_hdr.ImageId =3D Args.ImageId.encode()[:16] + fp =3D open(UpldInfoFile, 'wb') + fp.write(bytearray(upld_info_hdr)) + fp.close() + # # Copy the DXEFV as a section in elf format Universal Payload entry. # - remove_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --remove-sect= ion .upld.uefi_fv %s'%(LlvmObjcopyPath, EntryOutputDir) - add_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --add-section .u= pld.uefi_fv=3D%s %s'%(LlvmObjcopyPath, FvOutputDir, EntryOutputDir) - set_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --set-section-al= ignment .upld.uefi_fv=3D16 %s'%(LlvmObjcopyPath, EntryOutputDir) + remove_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --remove-sect= ion .upld_info --remove-section .upld.uefi_fv %s'%(LlvmObjcopyPath, EntryOu= tputDir) + add_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --add-section= .upld_info=3D%s --add-section .upld.uefi_fv=3D%s %s'%(LlvmObjcopyPath, Upl= dInfoFile, FvOutputDir, EntryOutputDir) + set_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --set-section= -alignment .upld.upld_info=3D16 --set-section-alignment .upld.uefi_fv=3D16 = %s'%(LlvmObjcopyPath, EntryOutputDir) RunCommand(remove_section) RunCommand(add_section) RunCommand(set_section) @@ -82,6 +117,7 @@ def main(): parser.add_argument('-t', '--ToolChain') parser.add_argument('-b', '--Target', default=3D'DEBUG') parser.add_argument("-D", "--Macro", action=3D"append", default=3D["UN= IVERSAL_PAYLOAD=3DTRUE"]) + parser.add_argument('-i', '--ImageId', type=3Dstr, help=3D'Specify pay= load ID (16 bytes maximal).', default =3D'UEFI') MacroList =3D {} args =3D parser.parse_args() if args.Macro is not None: --=20 2.32.0.windows.2 -=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 (#81130): https://edk2.groups.io/g/devel/message/81130 Mute This Topic: https://groups.io/mt/85870108/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-