From patchwork Thu Nov 30 15:24:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 120215 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp809975qgn; Thu, 30 Nov 2017 07:25:30 -0800 (PST) X-Google-Smtp-Source: AGs4zMYwBmSpAysV/1UH/j9qpObnEX1vOHDAiUgmR41URVMvwUhSouxErfiBpLSJcy6fUntLLnAR X-Received: by 10.84.245.142 with SMTP id j14mr3037922pll.328.1512055530062; Thu, 30 Nov 2017 07:25:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512055530; cv=none; d=google.com; s=arc-20160816; b=P72FjuuF4y6m6aFQrLSGZuqbSFuXqwUK+Ne7Zh2ozfb3UZqM7/RspjRSqCaCFF4CBm S9qGNd8Fp/TTFHn8OgVaWk9deDolSXawlZcy90xnTWUCJLsWrUcJ2L7WDEqO1aDKDCq3 Q8eXZfyJJovKQB19yS47XQiAVIJHJe4LkBoQXXtodhlvFHwv0eyk9GofPi2y6/wYJLCK UODUjl3MHsYX8Fh3chvai2M7k/KmYvv6LCLI+LRt/0DwCur2sgt7I1AaUnzYDo4HgJr5 A1JdjqCncsmpv9ZdjWwIY/EzbhaiewC0C82omkrzUsndCqBW9ubb+eSCWyHuFensIvh+ Gfug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=XyveibH/F+qb04p+r2P/VSgEPU9kZQYRpZOIOCr8uDE=; b=NVZC50pMYs1CoUPzft7ifgIk5lCzDu3sH9OUKtltq8IEZdOSpTFPs+SJuNDPUeNkRn 6lLcx8eJKGl6nTmse9MTiN0higQbVqOrgpFaRK711oMblYrCR5htgYDXkjDLxZXdIin5 RkIcnJ+JvTItZq5Cy3TwSTnn6efUdwRKWKfflY1XZDkHKBBkSZMN2eUNVFOylxDM9Kfd HT9yF4TVzmyvU2TFSiL25g1VtPiCCbrAeNpWX+OLs5aq4F+QWbrkbCXTfrVZgvAmoOsQ k+3RyXotsNGO1tiAhcNRV0/ua2vysRML0afS30NXhNuxVa159GIWwakVKpNDGC95o611 r3MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GISzkc3J; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id f1si3170265pgq.100.2017.11.30.07.25.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 07:25:30 -0800 (PST) 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=@linaro.org header.s=google header.b=GISzkc3J; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3877D2211B43D; Thu, 30 Nov 2017 07:21:01 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::244; helo=mail-wm0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 61C4A220F3C5D for ; Thu, 30 Nov 2017 07:20:57 -0800 (PST) Received: by mail-wm0-x244.google.com with SMTP id b76so13172867wmg.1 for ; Thu, 30 Nov 2017 07:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=T2BuGhW/lWViu4xhEVNFRIsoZsOdo+1PD49O2nCJiUk=; b=GISzkc3JyvG8zM2uHZzsppRK8Q3nN4LL1KcrmWFSQT5oOh9bBfE0E/GyLZpQUvcZfq +fUBMOaqzpnxJj4QDAwzLHqmfwNcUucCAiBOrwZGdxCv2cvE9Yor1axonNAk1Q9GXuUl IJTJU3JQlgL3Xp7kAINB3i1hf9CV3iYqkaye8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=T2BuGhW/lWViu4xhEVNFRIsoZsOdo+1PD49O2nCJiUk=; b=B+/feS6Lab5k81Mdk7lk4bLFdlALP2Y6VBGUsU/8ggjVJtbk8qOnufCvAQqF0TEXcU csI+W3wcKer7LD1sIYE7DU6X9ui58H8oEa7mvTLoR0281tOjb1Q8rnal/OgbC0yF8wc1 EL2kJfWYhMpkYAiznsKfFOV9qnrcZ7+E6ahuGqY4T5gkn+jXqj47Rcl4pRdX6vF4qfNl TKRw15eYfO0sSTzlXiaVniTCih5/jI5WNL7P9jbkDSU170S4YUn8StwgybFxUWVCibmH M7U80fNj92PqY4EiSl0TkP8cB5o3nlnvB44TRnotV/7mN7zvKiee+D+iER6sLiDCzXNj 5Wdw== X-Gm-Message-State: AJaThX68oZ04jalHRlV2pBAzbNCWHB0eB0sTUoVi8Fw6fpbAYkQdGSyy 9rHk85DCvNS9EO4/AhKxMjq7gJ3W0Vg= X-Received: by 10.28.127.22 with SMTP id a22mr897173wmd.12.1512055521182; Thu, 30 Nov 2017 07:25:21 -0800 (PST) Received: from localhost.localdomain ([105.150.171.234]) by smtp.gmail.com with ESMTPSA id 43sm2566328wru.81.2017.11.30.07.25.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 07:25:20 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 30 Nov 2017 15:24:52 +0000 Message-Id: <20171130152453.19205-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171130152453.19205-1-ard.biesheuvel@linaro.org> References: <20171130152453.19205-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 6/7] ArmPlatformPkg/PrePi; call all constructors by hand X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Call ProcessLibraryConstructorList () to invoke all library constructors by hand rather than calling only some of them explicitly. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/PrePi/PrePi.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c index a60cafdce45e..76a53bc871d2 100644 --- a/ArmPlatformPkg/PrePi/PrePi.c +++ b/ArmPlatformPkg/PrePi/PrePi.c @@ -33,15 +33,9 @@ UINT64 mSystemMemoryEnd = FixedPcdGet64(PcdSystemMemoryBase) + FixedPcdGet64(PcdSystemMemorySize) - 1; -EFI_STATUS -EFIAPI -ExtractGuidedSectionLibConstructor ( - VOID - ); - -EFI_STATUS +VOID EFIAPI -LzmaDecompressLibConstructor ( +ProcessLibraryConstructorList ( VOID ); @@ -162,8 +156,7 @@ PrePiMain ( PERF_START (NULL, "PEI", NULL, StartTimeStamp); // SEC phase needs to run library constructors by hand. - ExtractGuidedSectionLibConstructor (); - LzmaDecompressLibConstructor (); + ProcessLibraryConstructorList (); // Assume the FV that contains the SEC (our code) also contains a compressed FV. Status = DecompressFirstFv ();