From patchwork Thu Jun 7 11:08:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 137878 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1950702lji; Thu, 7 Jun 2018 04:08:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJFFRQWAcxjBlybe8P2vOdl0lwyGD6Q7sARJlGIwwbcLC0Bh77xD1YUDAiiEG29ksZE8P6u X-Received: by 2002:a62:9d82:: with SMTP id a2-v6mr1358769pfk.223.1528369710548; Thu, 07 Jun 2018 04:08:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528369710; cv=none; d=google.com; s=arc-20160816; b=f/lGyrNuVl1MNNp1ur1qyAwWv9jtYBRlFRINdf3qWp7g7S5cqbvPC6rPlEDexXvdYi gbjijJFfmBaPH8VGnjHuDc96F/I1ROD9JmdrEFPYgbpRh4SEDTk8a7oOxGxE7zsvwnK8 sGq2DTYVgfPb9YsPLXUrJky2t1afzhqQ3DpIifi0xPf6LUuvFAFzgyxNCAH3WcG9S43q nA/uF6XtEq/sU4drAsLgplzDGqrsuLfLXrsUaW/5J2FGADR43dPdWOV33jWlwCdDYCDi t9S0nh7ljnYo7c/1E/XMnLVaRRfxPc5EalD7u1zldriUCGcvi7ysYNCzXLaSHkxuVCdn 3duw== 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=yXBkbTdsRRe42cjWiM2hplUlderIQVAjgfKtDASqrV0=; b=g8Ar4KvomPITbvjFf9fCcrq/kh+KB7EWXtA5ZDUhWDxkJpBI340ydTGGj+Y5Ats96i gUiThgxPwTsn+LhojuFFnnIoOxSeVxVhmyBiyHvgV4hGeDqCXWPAWmTNe4w2uSRqzyhI li7QMiaq27m+JB+rnJ5NfEZBPVpTjDAfq5fGGjWAt1DKjPAG0KRZTqqDuBIM3a4JWyyl xMsjw9VRFmQjF1LShMUM3T3a870mzKHqfVQfPn/hORwiH610q/QXDTY8ugyhRuNCOtOY 7IybKpxX4YBxrEeMV9U6kVV2NNqBLhjoOWcLGZboTQAUEPBiHqPLAtHqQdIBfiwFxuXM LM5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ColBu0+H; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id d5-v6si20147606plr.13.2018.06.07.04.08.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 04:08:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ColBu0+H; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 CAF00211D67F6; Thu, 7 Jun 2018 04:08:22 -0700 (PDT) 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:c0c::243; helo=mail-wr0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) (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 90A3B211D67EC for ; Thu, 7 Jun 2018 04:08:21 -0700 (PDT) Received: by mail-wr0-x243.google.com with SMTP id l41-v6so9631659wre.7 for ; Thu, 07 Jun 2018 04:08:21 -0700 (PDT) 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=o+84anZdOaoGmnazOmTgpD/VqzbYO6uf3gsP1KNc2FY=; b=ColBu0+HDNoTSr5olLZaN9Kp4ld6aV0YGvb21uDIklAC3gisNXMknHACJwyaT6OGKW i4z4hlcOJpZ5FH38eXRe79TBKG0D3/MHuM+4S2YZouW+5FZLO5LMMkn5qNKWdQ+65d2z yq4vaT3bf6/tic43pSLoODmxWFHBVVgLoABLw= 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=o+84anZdOaoGmnazOmTgpD/VqzbYO6uf3gsP1KNc2FY=; b=cAE9f4uYWUA7IcqvFJBkuev1R1H6c45sbFcDM8zHRXdyottQOraVDum7ROSTH5v6st LxQMhOda2+7mcWFM2WjklZL/6z0kAzXl2shsBlePKhHUmcC8wCQ966VEws0xypmteila R1VZxApBW/NepXXqWEmY1orzdqxRctgVDKrnMMetGAuoNpLsBpPgSIkFontxE+SYS67K NYtRx7Fh9VmNloHaj60PD8fgj3oXLtFmXLBF3xFSLbF+EQXNbBD60T8ldgC0Mjf9m+G7 Cb8LeX0Jkbiv6OYHE70DDilA4WI02t9wIV9rhszFhBi51cFFo8DlwqRSYYJDrxtuzq09 NcAw== X-Gm-Message-State: APt69E0GggZIqKSBL+dnU4kgiXIbwfFBDCMD95GnGH6OJP8pRTi3QqJO nb9JnCKPzvDhtyV7SLRfApBKjIGImhM= X-Received: by 2002:adf:8854:: with SMTP id e20-v6mr1437745wre.30.1528369699950; Thu, 07 Jun 2018 04:08:19 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:88ff:8f90:37f1:db91]) by smtp.gmail.com with ESMTPSA id 72-v6sm54997900wrb.22.2018.06.07.04.08.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 04:08:19 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 7 Jun 2018 13:08:11 +0200 Message-Id: <20180607110812.26778-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180607110812.26778-1-ard.biesheuvel@linaro.org> References: <20180607110812.26778-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 4/5] ArmPkg/PlatformBootManagerLib: call ProcessCapsules() only once X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.d.kinney@intel.com, jiewen.yao@intel.com, star.zeng@intel.com, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" ARM platforms have no restriction on when a system firmware update capsule can be applied, and so it is not necessary to call ProcessCapsules() twice. So let's drop the first invocation that occurs before EndOfDxe, so that capsule updates will be applied when the console is up and able to provide progress feedback. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 15 --------------- 1 file changed, 15 deletions(-) -- 2.17.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/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index 3456a71fbb9c..8e1ecdc01564 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -553,21 +553,6 @@ PlatformBootManagerBeforeConsole ( VOID ) { - EFI_STATUS Status; - ESRT_MANAGEMENT_PROTOCOL *EsrtManagement; - - if (GetBootModeHob() == BOOT_ON_FLASH_UPDATE) { - DEBUG ((DEBUG_INFO, "ProcessCapsules Before EndOfDxe ......\n")); - Status = ProcessCapsules (); - DEBUG ((DEBUG_INFO, "ProcessCapsules returned %r\n", Status)); - } else { - Status = gBS->LocateProtocol (&gEsrtManagementProtocolGuid, NULL, - (VOID **)&EsrtManagement); - if (!EFI_ERROR (Status)) { - EsrtManagement->SyncEsrtFmp (); - } - } - // // Signal EndOfDxe PI Event //