From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::22e; helo=mail-wr0-x22e.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x22e.google.com (mail-wr0-x22e.google.com [IPv6:2a00:1450:400c:c0c::22e]) (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 2E0E7207E6376 for ; Thu, 24 May 2018 02:09:57 -0700 (PDT) Received: by mail-wr0-x22e.google.com with SMTP id w18-v6so1691650wrn.6 for ; Thu, 24 May 2018 02:09:57 -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=4WwapQSe19fvux92f/oRKcQdyHyZL37u0klOzxPwNzk=; b=Ym1wInppN3xAoivjVmOPYH8Efv4rZwF6FyFmLjg3525e70pccVhuinTRTMgvYwSeCf h2ijihcQmipNKw4DqKlgTaC+mDICfbQrKL1VfUlE4amUMXl5g7beZ6yCmGFw50maS0/P fwRpKeuOJcfdC/2Urm8XPE6msS2WZai3xjOTY= 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=4WwapQSe19fvux92f/oRKcQdyHyZL37u0klOzxPwNzk=; b=gSjTY4Qy9oDhXogIgDLyTTdRnywG4dN6ldwu9SboUmViT/8VE88e9iTLOO9DNoapmH Sv7KkT0Q3U0RqXRWjz1cCuesfn3tCvSXul2NOWde+JRPg4rsmaS1kRFeghe74hCs9AO2 toS2qkZYSIZPMoAfHMs93oNBx9A4BG5Qd7CGH/QKdJm4eXxIeVtjSxm6fv7rX4bOA8zx gp4QwUHi3FN11NmtNDedh8AOAAZJ08aNk8JNH3ySGRnAZacbCojwktE6tBMdvjWe+qnQ JTdEFaVSM7Jo3EINT6aQ595ZTnGIYceuWXvtSB9Rp5oURLpZUtir9+MeUMn1FZ1yl4aL pG0A== X-Gm-Message-State: ALKqPweVzNr+2EIvlTpRf++WJOLAWkqURbbUIk3lrn9PRPrCAGQeFtdG sPEBl6y/ZFfxBVHUQLwNO3C2TNK9TBw= X-Google-Smtp-Source: AB8JxZrEB6wenG28uUowErI49Ld3kdY4eHavACenHvxrOxzN88/bfOs07xJszkY9P42b9oV/I15erg== X-Received: by 2002:adf:c32b:: with SMTP id n40-v6mr5406697wrf.91.1527152995427; Thu, 24 May 2018 02:09:55 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:3995:5470:200:1aff:fe1b:b328]) by smtp.gmail.com with ESMTPSA id x16-v6sm8505467wmc.2.2018.05.24.02.09.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 02:09:54 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: Ard Biesheuvel , Laszlo Ersek , Leif Lindholm , Michael D Kinney , Liming Gao , Star Zeng , Eric Dong , Dandan Bi Date: Thu, 24 May 2018 11:09:43 +0200 Message-Id: <20180524090945.10289-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524090945.10289-1-ard.biesheuvel@linaro.org> References: <20180524090945.10289-1-ard.biesheuvel@linaro.org> Subject: [PATCH v2 3/5] MdePkg/DxeServicesLib: introduce AllocatePeiAccessiblePages routine 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: , X-List-Received-Date: Thu, 24 May 2018 09:09:57 -0000 Add a routine to DxeServicesLib that abstracts the allocation of memory that should be accessible by PEI after a warm reboot. We will use it to replace open coded implementations that limit the address to < 4 GB, which may not be possible on non-Intel systems that have no 32-bit addressable memory at all. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdePkg/Include/Library/DxeServicesLib.h | 23 +++++++- MdePkg/Library/DxeServicesLib/DxeServicesLib.c | 55 ++++++++++++++++++++ MdePkg/Library/DxeServicesLib/DxeServicesLib.inf | 3 ++ 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/MdePkg/Include/Library/DxeServicesLib.h b/MdePkg/Include/Library/DxeServicesLib.h index 7c1c62236d96..20aee68af558 100644 --- a/MdePkg/Include/Library/DxeServicesLib.h +++ b/MdePkg/Include/Library/DxeServicesLib.h @@ -305,5 +305,26 @@ GetFileDevicePathFromAnyFv ( OUT EFI_DEVICE_PATH_PROTOCOL **FvFileDevicePath ); -#endif +/** + Allocates one or more 4KB pages of a given type from a memory region that is + accessible to PEI. + + Allocates the number of 4KB pages of type 'MemoryType' and returns a + pointer to the allocated buffer. The buffer returned is aligned on a 4KB + boundary. If Pages is 0, then NULL is returned. If there is not enough + memory remaining to satisfy the request, then NULL is returned. + @param[in] MemoryType The memory type to allocate + @param[in] Pages The number of 4 KB pages to allocate. + + @return A pointer to the allocated buffer or NULL if allocation fails. + +**/ +VOID * +EFIAPI +AllocatePeiAccessiblePages ( + IN EFI_MEMORY_TYPE MemoryType, + IN UINTN Pages + ); + +#endif diff --git a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c index 1827c9216fbc..6719aabe5d04 100644 --- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c +++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -1093,3 +1094,57 @@ Done: return Status; } + +/** + Allocates one or more 4KB pages of a given type from a memory region that is + accessible to PEI. + + Allocates the number of 4KB pages of type 'MemoryType' and returns a + pointer to the allocated buffer. The buffer returned is aligned on a 4KB + boundary. If Pages is 0, then NULL is returned. If there is not enough + memory remaining to satisfy the request, then NULL is returned. + + @param[in] MemoryType The memory type to allocate + @param[in] Pages The number of 4 KB pages to allocate. + + @return A pointer to the allocated buffer or NULL if allocation fails. + +**/ +VOID * +EFIAPI +AllocatePeiAccessiblePages ( + IN EFI_MEMORY_TYPE MemoryType, + IN UINTN Pages + ) +{ + EFI_STATUS Status; + EFI_ALLOCATE_TYPE AllocType; + EFI_PHYSICAL_ADDRESS Memory; +#ifdef MDE_CPU_X64 + EFI_HOB_HANDOFF_INFO_TABLE *PhitHob; +#endif + + if (Pages == 0) { + return NULL; + } + + AllocType = AllocateAnyPages; +#ifdef MDE_CPU_X64 + // + // On X64 systems, a X64 build of DXE may be combined with a 32-bit build of + // PEI, and so we need to check the memory limit set by PEI, and allocate + // below 4 GB if the limit is set to 4 GB or lower. + // + PhitHob = (EFI_HOB_HANDOFF_INFO_TABLE *)GetHobList (); + if (PhitHob->EfiFreeMemoryTop <= MAX_UINT32) { + AllocType = AllocateMaxAddress; + Memory = MAX_UINT32; + } +#endif + + Status = gBS->AllocatePages (AllocType, MemoryType, Pages, &Memory); + if (EFI_ERROR (Status)) { + return NULL; + } + return (VOID *)(UINTN)Memory; +} diff --git a/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf b/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf index bd2faf2f6f2d..b0306c09872f 100644 --- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf +++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf @@ -44,6 +44,9 @@ [LibraryClasses] UefiLib UefiBootServicesTableLib +[LibraryClasses.common.X64] + HobLib + [Guids] gEfiFileInfoGuid ## SOMETIMES_CONSUMES ## UNDEFINED -- 2.17.0