From patchwork Thu Aug 11 15:23:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Duran, Leo" X-Patchwork-Id: 73759 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp165386qga; Thu, 11 Aug 2016 08:25:35 -0700 (PDT) X-Received: by 10.98.34.151 with SMTP id p23mr18305650pfj.102.1470929134793; Thu, 11 Aug 2016 08:25:34 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id h28si3665633pfk.146.2016.08.11.08.25.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2016 08:25:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@amdcloud.onmicrosoft.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 437CC1A1DFE; Thu, 11 Aug 2016 08:25:34 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe46::60b]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 228091A1DF5 for ; Thu, 11 Aug 2016 08:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=IFPYo+NjQkkQ4oqHAw3GGV878iZhVuSBJIRghgmpprg=; b=wBay3L+BTAhS7o0T2oOnfuLrevl9BI9l1qjRxTdS+tDIzx3+hsGURJuKl40HYTWpt3y2Y+RAxwC5A5Rh4tvKTfgA6Fdf1/6IKKafUIm/hhlXKtV/GcoHH4Ywdo4De/hPo1bOziqDyFUXjWYv53Ak9z8yVDu+jTPvlr34a3bquOQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by CY4PR12MB1239.namprd12.prod.outlook.com (10.168.167.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Thu, 11 Aug 2016 15:25:27 +0000 From: Leo Duran To: Date: Thu, 11 Aug 2016 10:23:16 -0500 Message-ID: <1470928996-4545-2-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470928996-4545-1-git-send-email-leo.duran@amd.com> References: <1470928996-4545-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN1PR12CA0028.namprd12.prod.outlook.com (10.162.96.166) To CY4PR12MB1239.namprd12.prod.outlook.com (10.168.167.14) X-MS-Office365-Filtering-Correlation-Id: 7395b5f4-ed5f-41aa-b522-08d3c1fbb974 X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 2:590TuxngGgOSUpzqtA/ttzophTiB5t+j1BXzdtOxEcuunAOW9cSU6scPSXza2tNbvYPsVX7xyvjFfxLuTZgeAhUmDODGIPxbjHJKBkKZISAJo238K15If+egnhTRXZQp6J/bsYQGPHezvCDxhZvCDN41NAu9Rkwbo6h6PLBHsqXr7oWWghz0ZXIFKuDbHYFm; 3:yQNJCgF+0K1shb3v5E5JrpegyUHgnbTESdIhhMDmIXDTn2vWxWycYbp2ivy95uDZIEpkbh+4H1ovx9YVRTy+SRMIomS7F9vM/qJIuW/VQAFew67A8ggkz6ynxidlhCrY; 25:zp6QThrovCrg6Yp0vTtrZpmkQAY9CjeTk9x7XlXjOe9OFONk5yH28r2N4GXggAqrDCYyyo/GkBcFmrEj7m12on1H+RLx8mrgjZ8/7buEhlZ684xu0rOmEohy49yM2W0Ruv9a4eQ87ieBi1nySIJTAQ+buExB2ihlAxzVGTK3x5NozCYmNXd+Ey/7dfzjgng5ArmdrlIiuURdpeMALsMd69nJ5LMxDJiCB/GbMoG8EFTxCBqafF1meGlZUbBqJezJrxhKJK0Kvr2C8nRt5aFCH6hqfXCPmOoOzy754nm9QK4Wa/fVs9hsyZBYaWRVymJa/sHHxVYWILt6FlzO3zlh+1PCsUnZGFl9LekTmpysbkIQvFfuEUZ0fpEw0zFJ2bg57/TUkWR4HhY9SnhL4tIyPOpcMXMS4waVg245tlqstKQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR12MB1239; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 31:nJz6fHUMliE+MwtMZ25An18CR6YXNn82DLAxnMxYzmN/MwWQ01+Bqux6xIuMYbKCkfXRWJbIsLal6bYCb7NwaUO8dWgg1J9iKpoEdbNf+J8nlEAjFc14Sc7eEsfbtHBCOJOsyyinynepOgwA/rKtTevDxGmFr2GdbTiD3VDkJFM7aXIxGOTF60U7oudH40uikigC13ClTDKOyJVSXYE6md7Ou2Wp76e/gwh51WFbEHI=; 20:+7b6h5Kl+Kd7qMB5zU242FlxZ+mFOGymKuHp3w7Z81kJOFFSEwRqnH2LEZ67rDHv+7oYdiEdeZsbEujsxsOOly2NAZinJuz2EUA7li0St/K/pgjH3rmnmfk0dz+I8CUG3T6gcXq7f7cHMBHjspfWwx4DRUYjiOnwfEmLtMWPGQMtgpKI7kwVEaOVWAnblWzHtyg1XXXm5xCZ60zOOiNvv5AU+cTEHrlHzheWcNrgBwHKXx+lLGA280s6MAHfldcHAQvCcTLu903oalkLni06vjS58VUp7ks9mdgCLOwUorWbUUrCmOPUnCNW08pVWzumJhcaT74bswwDu4A9/LRo3p4TD2k52fzWigQCuTaoIRAekFOiOBXKpP5vBKOqafsqZtxnStNRk49GpIcFeDwu5c4M7OSjW7l9V6RqiqQuMRHXBVEJN0xplGw1xrmf2VnYFc+UBPJyIqC84y370XymYSn0knTkXBh2r4Z17vjaDGDxPzId+WHzr5llsz+Z/Ns+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040171)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:CY4PR12MB1239; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1239; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 4:7ygEd1er0YF5DudsVudcYF+n9Wv72nieX2Z5/g37910jkwaeeqb5uvDgjUDsGxYdrLOCSToWuq9J9fO/CE7xxPu47irXQzGSSWC/qjoescFEkSRw7XODwgHnPlnb01+L0tv+/cDbfOl0ZE7aoSEwhYscJiJWenq5sBOOLF5vQjGfX2W3sfathzJbre7T62p6Hvqyb8k1oiYzRG4F04OQ+RLE4AaKWHuJpIPsEIdL7byCfyOK6K7hwLRZi69SoLSGTItC1AoI+ZPJHTjXFcZmYn1Nh0ZJL4hM1CGvMGDD5q8B9GWpSrhfikVR90wvhzGO+1dT3s8KrUJq4l8gFAVsscMrcczhcf3r/pdffvX1mAnHDqc3Xq0r/rjnA95HWW8EM8qH8f54ru+5LlIvIfrI7Lqptvvzoqj3fKVV0c7rv5ZbZWpnZ7d3HywFc/Gpbkhb X-Forefront-PRVS: 0031A0FFAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(189002)(199003)(8676002)(92566002)(66066001)(47776003)(4326007)(2906002)(105586002)(42186005)(6116002)(3846002)(86362001)(53416004)(586003)(33646002)(101416001)(2351001)(106356001)(81156014)(50226002)(76176999)(36756003)(50986999)(81166006)(50466002)(229853001)(2950100001)(19580395003)(77096005)(5003940100001)(48376002)(19580405001)(110136002)(189998001)(305945005)(97736004)(7736002)(7846002)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1239; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1239; 23:+B1lQrRiXc75iozAWArpJL8iGkbhrTgBnKVnsxb9r?= =?us-ascii?Q?JL56dvKRtdAZLPajGxs8rmd62O7ByGwhFXLabKZADg5RzByPhkHZq9MAH15e?= =?us-ascii?Q?CBW20RQBiEUZBoN4k3LsNQqxDLKi0UrphWAng/rHgds2cwToInNiVTPmPwWP?= =?us-ascii?Q?bZ1R7gZeYMztlWVp3b/KlxeFsuTkkfZwe5SWkXi3oqkqO/boy4w7oWt//X8t?= =?us-ascii?Q?u6R7BgXP11EijW5XYXoRquzvyk2/Sb20Ialvvo46BXFd2H39ZnnLOd89+o4j?= =?us-ascii?Q?rsdbWeUwcgC/aFVB3BRbexY34YYemfSq+xjoALJKbdnQr5/gxn+3BGeTNDEL?= =?us-ascii?Q?vGfMepwonQcKurn+Rc/AasC4dM+2x3fWTDpws8f92EP/ya8GqYhmm4/igfUK?= =?us-ascii?Q?5WyyPwnrfX0C0GZqfkAdDzH7qB0WMl2X3VFFVtg4j86ekhe/WEWKslqb1Pux?= =?us-ascii?Q?YuuBChAabW7AqWQ9cYGq/l1jNZ27vbdd63nAqJshur5eTjKJfXUX3bTUCASb?= =?us-ascii?Q?OcS+NhM6W78vyM61YZ9DdkuoU+9oQJX99/2NuRW2dWq2YZ2Mes74kzOyr3AZ?= =?us-ascii?Q?JrRPqJseqe4W7crfVuTF6qwMiH3NAE5O89N3LYURwWuegVMCaTaPuVS2Cnu1?= =?us-ascii?Q?G8XAhpoHJTzXAcPlqCeSKpg1hrVI7XADHK1o4r8Ei4RTvh0N51VyxvC1yauL?= =?us-ascii?Q?envlPocHPjBbvtWOYduLTRHsW+dGQ7vMhBR16bBjNHUexz0pEwnIdlHXKLFX?= =?us-ascii?Q?uuByP7CjfSSE+bylhYlQz0v7YZ3OD7UjioArOKD30MYiyoDexT8t93AnqVLA?= =?us-ascii?Q?uJlHETjtcaE+wPt1tXPfGv5VFUzDqa6BJUVgbyMYGBGwV7NOWaDIAgyLcRmT?= =?us-ascii?Q?Hq0iMgASW3+E9uPZF3KEysM+160c9Cp+nt9HZ++/GZiojai5lP0z8KJLtsS6?= =?us-ascii?Q?tyuj4o3HX2RaLc8C3M7gKVI7+T0ILNKwrAO42ByPoBMrJYPlKqsDJpD9eK8q?= =?us-ascii?Q?hpDHioVFyUOCCGOwld2dyQ3kbP1y6BZTElPy3KgPj62UCgNt6789IYdD34Y5?= =?us-ascii?Q?AHZtXtPZ22QiMFlAm3FpB5ddZemIIxDG2zW4YHpIlbjMlUuWA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 6:4CTtV8xkqRgJxBLZHi7+Eu78Dw7SADRGGMF4EQPPW6ZGiHngG7cb3PtxfKCPfWIyU0MEFa2qafcWt9C6otuojduxzv5nkJjKdydx9+SlQy09PMd5w+5HEVWVvHtJhoKNbWD4t/dzVCGSj9GcVGtqPhTHc+J5r760fQjMZs8LHUPksSZZ5LVBz3d2VBtY0Zfz1oJVPCGzvRkMDENjEFgCxSNlzZe0p7brJlhl9i5GATQd1hX3SgI7fuqoXT5epsPC1OYb4f/5fUYZ1iDDE7b9DoCbQuIgP+IdiNdZQGnTh/dawGH//mHpUdulSVNMDL5g1bpCcAn83wspzeqji8cyqA==; 5:qLk8L/JT196WMVWse5GEU3cB91vw9avuWvXkVckhimxEqY3J8ujEsJx0TiWWh3hH3AsJVJnM+bqq5NMhNnmC3ON5pHhMhDSPoDR0Fh3wxUfEiMN68FAURf+fYh1yPsvKFT4vdCsbcEwSk+nA1oq/8g==; 24:PZpnFPG/eD+8SuJAjvaK0Xw86SNB2AR9haKr31J681+Jo9NxDqWEmdVunITeeoL8z8ElrbQWEUD9oVbK0SOKahPppC2geDB/57mC96RmEZ4=; 7:AAHfI/kg/LfhvI3zOONrQsWB12nf+bWGvFd7URBU1CUJHuBP4Wg+b2J/6ft9sD7Jq61UIhCfkUqk/U0toZTl5uY+DnAH7TEuNHR3SyRe0K56UZyn9fJKvEfTqNe44eU4xzy2plrA8zViQu91PoMpGmDDl9ZXYuDy+pNqBN18s6v76qm4XHsdM0J2oLoSOY+x04V8dAz/asEIckiGR3BBXPfcB9XEfCT34tl6cNNabG4yGQ5UU1ww0mFMBus4gZ8L SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 20:8/y4+8sN0HJy0f3hBM8pI8zSopQw3crRVd2vQSRb3Vzc5u4WrCPpyvZyxLW1bgSBWZBx5sTpyTvjxlfQ9piOjXv65hSxNJ4w0Cp5QnXQKdmaSyILdEfBg1dfOBn0ITQWVr84S7l2glBkj2kdQsoUh4AmXgsJ5olwK/noFjWTOpSLwamRhfvqIvtwqSgUShAX+GX27vc8nDLPZ8cqQn+TWowcPn8bLe5E66gdSJKaFqV2XGCqRvR8wyz9tRRZyQC2 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2016 15:25:27.8965 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1239 Subject: [edk2] [PATCH] BaseTools/Source/C/GenFv/GenFvInternalLib.c X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Duran , liming.gao@intel.com Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Account for rebase of FV section containing VTF file on IA32/IA64. This supports cases where the reset vector may not be set at 0xFFFFFFF0. For example, FV section defined as: [FV.FvSecPei] FvBaseAddress = $(FV_BOOT_BASE) FvForceRebase = TRUE Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leo Duran --- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index 7c839e2..8c2827b 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -2770,11 +2770,13 @@ Returns: // // Update reset vector (SALE_ENTRY for IPF) // Now for IA32 and IA64 platform, the fv which has bsf file must have the - // EndAddress of 0xFFFFFFFF. Thus, only this type fv needs to update the - // reset vector. If the PEI Core is found, the VTF file will probably get - // corrupted by updating the entry point. + // EndAddress of 0xFFFFFFFF (unless the section was rebased). + // Thus, only this type fv needs to update the reset vector. + // If the PEI Core is found, the VTF file will probably get + // corrupted by updating the entry point. // - if ((mFvDataInfo.BaseAddress + mFvDataInfo.Size) == FV_IMAGES_TOP_ADDRESS) { + if ((mFvDataInfo.ForceRebase == 1) || + (mFvDataInfo.BaseAddress + mFvDataInfo.Size) == FV_IMAGES_TOP_ADDRESS) { Status = UpdateResetVector (&FvImageMemoryFile, &mFvDataInfo, VtfFileImage); if (EFI_ERROR(Status)) { Error (NULL, 0, 3000, "Invalid", "Could not update the reset vector.");