From nobody Mon Dec 23 09:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1517295398854392.2990664272321; Mon, 29 Jan 2018 22:56:38 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5EA6E2215BDB5; Mon, 29 Jan 2018 22:51:02 -0800 (PST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0BDD52215BD8E for ; Mon, 29 Jan 2018 22:51:00 -0800 (PST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2018 22:56:34 -0800 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129]) by fmsmga005.fm.intel.com with ESMTP; 29 Jan 2018 22:56:34 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,433,1511856000"; d="scan'208";a="199713042" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Tue, 30 Jan 2018 14:56:30 +0800 Message-Id: <1517295390-10280-1-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 Subject: [edk2] [Patch] BaseTools: Fix the bug to align VPD PCD based on value type X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Spec required for VOID* VPD Pcd, Ascii string use byte alignment, byte array use 8-byte alignment, unicode string use 2-byte alignment. while when the VPD pcd offset use *, the offset generated in the .map file not follow this rule. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/BPDG/GenVpd.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Pyth= on/BPDG/GenVpd.py index 9861e7d..ec4da23 100644 --- a/BaseTools/Source/Python/BPDG/GenVpd.py +++ b/BaseTools/Source/Python/BPDG/GenVpd.py @@ -1,10 +1,10 @@ ## @file # This file include GenVpd class for fix the Vpd type PCD offset, and Pcd= Entry for describe # and process each entry of vpd type PCD. # -# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License # which accompanies this distribution. The full text of the license may = be found at # http://opensource.org/licenses/bsd-license.php @@ -33,21 +33,22 @@ _FORMAT_CHAR =3D {1: 'B', # # This class contain method to format and pack pcd's value. =20 # class PcdEntry: def __init__(self, PcdCName, SkuId,PcdOffset, PcdSize, PcdValue, Linen= o=3DNone, FileName=3DNone, PcdUnpackValue=3DNone,=20 - PcdBinOffset=3DNone, PcdBinSize=3DNone): + PcdBinOffset=3DNone, PcdBinSize=3DNone, Alignment=3DNone): self.PcdCName =3D PcdCName.strip() self.SkuId =3D SkuId.strip() self.PcdOffset =3D PcdOffset.strip() self.PcdSize =3D PcdSize.strip() self.PcdValue =3D PcdValue.strip() self.Lineno =3D Lineno.strip() self.FileName =3D FileName.strip() self.PcdUnpackValue =3D PcdUnpackValue self.PcdBinOffset =3D PcdBinOffset self.PcdBinSize =3D PcdBinSize + self.Alignment =3D Alignment =20 if self.PcdValue =3D=3D '' : EdkLogger.error("BPDG", BuildToolError.FORMAT_INVALID, "Invalid PCD format(Name: %s File: %s line: %s= ) , no Value specified!" % (self.PcdCName, self.FileName, self.Lineno)) =20 @@ -432,20 +433,22 @@ class GenVPD : elif PCD.PcdUnpackValue.startswith("L"): Alignment =3D 2 else: Alignment =3D 1 =20 + PCD.Alignment =3D Alignment if PCD.PcdOffset !=3D '*': if PCD.PcdOccupySize % Alignment !=3D 0: if PCD.PcdUnpackValue.startswith("{"): EdkLogger.warn("BPDG", "The offset value of PC= D %s is not 8-byte aligned!" %(PCD.PcdCName), File=3Dself.InputFileName) else: EdkLogger.error("BPDG", BuildToolError.FORMAT_= INVALID, 'The offset value of PCD %s should be %s-byte aligned.' % (PCD.Pcd= CName, Alignment)) else: if PCD.PcdOccupySize % Alignment !=3D 0: PCD.PcdOccupySize =3D (PCD.PcdOccupySize / Alignme= nt + 1) * Alignment =20 + PackSize =3D PCD.PcdOccupySize if PCD._IsBoolean(PCD.PcdValue, PCD.PcdSize): PCD._PackBooleanValue(PCD.PcdValue) self.FileLinesList[count] =3D PCD count +=3D 1 continue @@ -516,10 +519,12 @@ class GenVPD : # if (len(self.PcdFixedOffsetSizeList) =3D=3D 0) and (len(self.PcdUn= knownOffsetList) !=3D 0) : # The offset start from 0 NowOffset =3D 0 for Pcd in self.PcdUnknownOffsetList : + if NowOffset % Pcd.Alignment !=3D 0: + NowOffset =3D (NowOffset/ Pcd.Alignment + 1) * Pcd.Ali= gnment Pcd.PcdBinOffset =3D NowOffset Pcd.PcdOffset =3D str(hex(Pcd.PcdBinOffset)) NowOffset +=3D Pcd.PcdOccupySize =20 self.PcdFixedOffsetSizeList =3D self.PcdUnknownOffsetList @@ -578,10 +583,12 @@ class GenVPD : while(countOfUnfixedList < lenOfUnfixedList) : eachUnfixedPcd =3D self.PcdUnknownOffsetList[= countOfUnfixedList] needFixPcdSize =3D eachUnfixedPcd.PcdOccupySi= ze # Not been fixed if eachUnfixedPcd.PcdOffset =3D=3D '*' : + if LastOffset % eachUnfixedPcd.Alignment !=3D = 0: + LastOffset =3D (LastOffset / eachUnfixedPc= d.Alignment + 1) * eachUnfixedPcd.Alignment # The offset un-fixed pcd can write into this = free space if needFixPcdSize <=3D (NowOffset - LastOffset= ) : # Change the offset value of un-fixed pcd eachUnfixedPcd.PcdOffset =3D str(hex(La= stOffset)) eachUnfixedPcd.PcdBinOffset =3D LastOffset @@ -630,10 +637,13 @@ class GenVPD : # The last pcd instance LastPcd =3D self.PcdFixedOffsetSizeList[lenOfList-1] NeedFixPcd =3D self.PcdUnknownOffsetList[0] =20 NeedFixPcd.PcdBinOffset =3D LastPcd.PcdBinOffset + LastPcd.Pcd= OccupySize + if NeedFixPcd.PcdBinOffset % NeedFixPcd.Alignment !=3D 0: + NeedFixPcd.PcdBinOffset =3D (NeedFixPcd.PcdBinOffset / Nee= dFixPcd.Alignment + 1) * NeedFixPcd.Alignment + NeedFixPcd.PcdOffset =3D str(hex(NeedFixPcd.PcdBinOffset)) =20 # Insert this pcd into fixed offset pcd list's tail. self.PcdFixedOffsetSizeList.insert(lenOfList, NeedFixPcd) # Delete the item's offset that has been fixed and added into = fixed offset list --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel