From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-x22c.google.com (mail-lf0-x22c.google.com [IPv6:2a00:1450:4010:c07::22c]) (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 C2B6121A0480E for ; Wed, 5 Apr 2017 06:09:51 -0700 (PDT) Received: by mail-lf0-x22c.google.com with SMTP id j90so7733526lfk.2 for ; Wed, 05 Apr 2017 06:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=8oEPWAuJgB0I5cjx83Zh5CnBbkNcUoXiFyk0lpwH7rg=; b=DqK9qvRTCLkb6ITjTntLtCOTY15BY+pvQ4IKHwc5d23pOeqEOsTGpVp6f7ZttvFXVR fHRLPUByLYetlIFpcZJMVszQNZD1/eFaP6aE/M3+wC25PnK6LQahVN7r7go8UT/WPohf OwiEdYZaFIhA6v8qyByv09mMUUOb+dCKqtwV4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=8oEPWAuJgB0I5cjx83Zh5CnBbkNcUoXiFyk0lpwH7rg=; b=ny7VLneBKE76tV4pD1WikWksmEM6CxBygC9JiHp1h7QTJcpViMwQKseGyYVDRHrsDc Sq0P/wboKRYAOq9pIGXAuQfV7ZiIBdpwonFOSKCJlkh0orTRulnJkyvfb5BkBJnMd3/5 NtZHZ7Kv+7FW8OgGuQ8mQWf5VllWeOehDEDh1CniZkrLEzqC1WQDXndEW2JN7vP+ATYj gPySX4M0gBMdEgSe0t9dE/lin+9EXsLSDbK/b5pbEb6S4aJ5kjY7K+wJqtcwdXWaBcoa 13YKjvZyY/v+DS+qhZ9Gj31dHspOdTctQJoG95lxDLKWT9cLqXynVJknFD2kVSrtPMni ZmHA== X-Gm-Message-State: AFeK/H19oUdMw4lx5ay+CIWcl4neb9d5qsnN+71uLiz18ogVNrD3Vg4m mrLVMNZMKPpFTr+o X-Received: by 10.28.34.6 with SMTP id i6mr18754191wmi.41.1491397789336; Wed, 05 Apr 2017 06:09:49 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 60sm26198400wrg.60.2017.04.05.06.09.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Apr 2017 06:09:48 -0700 (PDT) Date: Wed, 5 Apr 2017 14:09:46 +0100 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org, ryan.harkin@linaro.org Message-ID: <20170405130946.GC25239@bivouac.eciton.net> References: <20170404123010.11722-1-ard.biesheuvel@linaro.org> <20170404123010.11722-2-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <20170404123010.11722-2-ard.biesheuvel@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH v3 1/6] ArmPlatformPkg/ArmShellCmdRunAxf: remove BdsLib dependency 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: , X-List-Received-Date: Wed, 05 Apr 2017 13:09:52 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Apr 04, 2017 at 01:30:05PM +0100, Ard Biesheuvel wrote: > Remove ArmShellCmdRunAxf's dependency on the deprecated BdsLib by > cloning the ShutdownUefiBootServices() routine into a local source > file; this is the only BdsLib feature 'runaxf' depends on. I was going to go through these individually and give a R-b for the whole series at the end if I didn't come across anything, but I'd just like to add for this one: This is abslutely the right thing to do - BdsLib only had this functionality due to the LinuxLoader, and it could be deleted now (but I guess we're planning to get rid of the whole thing?). Reviewed-by: Leif Lindholm > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel > --- > ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 1 - > ArmPlatformPkg/Library/ArmShellCmdRunAxf/RunAxf.c | 58 +++++++++++++++++++- > 2 files changed, 57 insertions(+), 2 deletions(-) > > diff --git a/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf > index 9a34f666612a..7d15f6934608 100644 > --- a/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf > +++ b/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf > @@ -43,7 +43,6 @@ [Packages] > [LibraryClasses] > ArmLib > BaseLib > - BdsLib > DebugLib > HiiLib > ShellLib > diff --git a/ArmPlatformPkg/Library/ArmShellCmdRunAxf/RunAxf.c b/ArmPlatformPkg/Library/ArmShellCmdRunAxf/RunAxf.c > index 2abfb6cc1053..9f4fc780307d 100644 > --- a/ArmPlatformPkg/Library/ArmShellCmdRunAxf/RunAxf.c > +++ b/ArmPlatformPkg/Library/ArmShellCmdRunAxf/RunAxf.c > @@ -21,7 +21,6 @@ > #include > #include > #include > -#include > #include > #include > > @@ -35,6 +34,63 @@ > typedef VOID (*ELF_ENTRYPOINT)(UINTN arg0, UINTN arg1, > UINTN arg2, UINTN arg3); > > +STATIC > +EFI_STATUS > +ShutdownUefiBootServices ( > + VOID > + ) > +{ > + EFI_STATUS Status; > + UINTN MemoryMapSize; > + EFI_MEMORY_DESCRIPTOR *MemoryMap; > + UINTN MapKey; > + UINTN DescriptorSize; > + UINT32 DescriptorVersion; > + UINTN Pages; > + > + MemoryMap = NULL; > + MemoryMapSize = 0; > + Pages = 0; > + > + do { > + Status = gBS->GetMemoryMap ( > + &MemoryMapSize, > + MemoryMap, > + &MapKey, > + &DescriptorSize, > + &DescriptorVersion > + ); > + if (Status == EFI_BUFFER_TOO_SMALL) { > + > + Pages = EFI_SIZE_TO_PAGES (MemoryMapSize) + 1; > + MemoryMap = AllocatePages (Pages); > + > + // > + // Get System MemoryMap > + // > + Status = gBS->GetMemoryMap ( > + &MemoryMapSize, > + MemoryMap, > + &MapKey, > + &DescriptorSize, > + &DescriptorVersion > + ); > + } > + > + // Don't do anything between the GetMemoryMap() and ExitBootServices() > + if (!EFI_ERROR(Status)) { > + Status = gBS->ExitBootServices (gImageHandle, MapKey); > + if (EFI_ERROR(Status)) { > + FreePages (MemoryMap, Pages); > + MemoryMap = NULL; > + MemoryMapSize = 0; > + } > + } > + } while (EFI_ERROR(Status)); > + > + return Status; > +} > + > > STATIC > EFI_STATUS > -- > 2.9.3 >