From patchwork Fri Aug 25 12:10:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 111013 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp909417qge; Fri, 25 Aug 2017 05:10:29 -0700 (PDT) X-Received: by 10.98.46.196 with SMTP id u187mr9872479pfu.199.1503663029101; Fri, 25 Aug 2017 05:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503663029; cv=none; d=google.com; s=arc-20160816; b=tzwbx8qbr1Euecme9UoXDFQ8WnxpVUyR9+1N6p1jHMYupOOPjbgkaFj7Kc1Ib5mrxK yiakmen2iPyndk6hLSP1I+OWHCgLRU1MWCB/C+dlvE6dMhdZ9ANEgLxSAtIqWkj1BWpB GP9CzipyftJhFz5EfIsnZ5vFoomy9gdzIYWI3qT9kZphfp7gWpt1TbD6P13DMSvJ50No 0VxYOuMcl9SDxD5bRmNDFWJTvlz/6Xo+Jc3CJsgxYFwlyyayfikDU3rUMAmRWHmJE4oB 8+Wr/Rzv2OqlTP7s45wWzkU4aTL6ECeCM0Kmwou+HRmq/Bfu81NJBDCxUHuJ67j0ooR2 HU6Q== 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=KbnvtBSdsf+ErynGhhzPKzOoz2Qzzd6YNgVy5Cf5My0=; b=nG9/7HhF5V3fxBXB+dTdqpymhnROvmieNgAmNmHAVgkU3LCzLgz8pHXatwRPEEEsl2 OyEz62GNWUyOrB/iOxKnZqqho11Ys5lnn4UE2gRPMJMuui8CvBvD7Llui96h+v55JDP7 Fjdh8/+kY0dts7KxU3bAdjxDiWZEB16W9PI3DIu6vnbUH72uuH4nIIoj10Xf5UEr3JVz r/r8hsMB4ovYAn3GTyorh932eHv3Ne+eJZz7LMtoY6sBKHZuV+msHHbeF2R0pUnH1AyL MighNsp0uSY6s6bk1BN/4u4ezLc8Be3oiXJ+OGbKxwSrIUrF8/P/om2lpwRIv3sD2iFx 8g1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DcFP/L5W; 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 43si4968225plc.358.2017.08.25.05.10.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:29 -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=DcFP/L5W; 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 998C72095B9C1; Fri, 25 Aug 2017 05:07:51 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) (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 EB95821D1E2FD for ; Fri, 25 Aug 2017 05:07:49 -0700 (PDT) Received: by mail-wm0-x233.google.com with SMTP id y71so1270500wmd.0 for ; Fri, 25 Aug 2017 05:10:26 -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=Y1sSqGmfUOfPbY32xGHgfLILD2DZ7QTKNifTerqPotA=; b=DcFP/L5WeUqFw1k60Zd/zu7Xs6fYAockClUYgsYUXF4VuEgVwKjK/cL5/bhGLitV61 LgdJ94lVHFdyiKY8m8IXZ79URk0K0Kebte/QRxZInswnFXuc5uMqoyahCDW1TfF25Fqz fyunsTusGIy3plsruWRqTKYXcuABUG4Nx+h+A= 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=Y1sSqGmfUOfPbY32xGHgfLILD2DZ7QTKNifTerqPotA=; b=U0AHhI04MmuU8GDHiElxKX05HaH0ZrOebvLtomptIKtiqv0lt+E5y7wdW/nyfUSfnw UbN4W0IKSTOmkKorZoTQxJ/GX26inFCVNhBJsZTfh/NTL8QicIlE05FzSnpz0Bh+pwNV GMySgaKps9lO9VRgv+m9wVf3JFQQDoV5LFtvWOqgsvJwikOSJ6YDmYUrIWM7VSUaHUj9 HS+7rRpoSVtn2Lg7vi4YNwvvR+iPENhUIBN9ARrxXQ9Eut7S/x6NRfZ7Ctawf+iMrvux v51qKWw0PkbnNCpUmTPHTgRJqblN4ZLb/LyddGiS+Jlk+hOd8fJnvk+VPbgTmNIonbXq AaWg== X-Gm-Message-State: AHYfb5gm5LJLnfbx+qJRELH+KGmtsnETPkvEX3UMW6BrnWTd5nP0dDGv f5rThdmOH4hesXWGjpVgqw== X-Received: by 10.28.97.132 with SMTP id v126mr1279543wmb.18.1503663024151; Fri, 25 Aug 2017 05:10:24 -0700 (PDT) Received: from localhost.localdomain ([105.137.125.182]) by smtp.gmail.com with ESMTPSA id 9sm1996137wmo.35.2017.08.25.05.10.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:23 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Fri, 25 Aug 2017 13:10:10 +0100 Message-Id: <20170825121014.15739-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170825121014.15739-1-ard.biesheuvel@linaro.org> References: <20170825121014.15739-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 1/5] EmbeddedPkg/DmaLib: add routine to allocate aligned buffers 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: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" DmaLib's purpose is to manage memory that is shared between the host and DMA capable devices. In some cases, this requires a larger alignment than page size, and we currently don't cater for that in DmaLib. So add a variant of DmaAllocateBuffer () that takes an alignment parameter. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- EmbeddedPkg/Include/Library/DmaLib.h | 30 +++++++++++- EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c | 48 ++++++++++++++++++-- 2 files changed, 72 insertions(+), 6 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/EmbeddedPkg/Include/Library/DmaLib.h b/EmbeddedPkg/Include/Library/DmaLib.h index 3814291c2875..1843814c65ca 100644 --- a/EmbeddedPkg/Include/Library/DmaLib.h +++ b/EmbeddedPkg/Include/Library/DmaLib.h @@ -155,5 +155,33 @@ DmaFreeBuffer ( ); -#endif +/** + Allocates pages that are suitable for an DmaMap() of type + MapOperationBusMasterCommonBuffer mapping, at the requested alignment. + + @param MemoryType The type of memory to allocate, EfiBootServicesData or + EfiRuntimeServicesData. + @param Pages The number of pages to allocate. + @param Alignment Alignment in bytes of the base of the returned + buffer (must be a power of 2) + @param HostAddress A pointer to store the base system memory address of the + allocated range. + @retval EFI_SUCCESS The requested memory pages were allocated. + @retval EFI_UNSUPPORTED Attributes is unsupported. The only legal attribute bits are + MEMORY_WRITE_COMBINE and MEMORY_CACHED. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. + +**/ +EFI_STATUS +EFIAPI +DmaAllocateAlignedBuffer ( + IN EFI_MEMORY_TYPE MemoryType, + IN UINTN Pages, + IN UINTN Alignment, + OUT VOID **HostAddress + ); + + +#endif diff --git a/EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c b/EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c index a0bb57541d60..4cbe349190a9 100644 --- a/EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c +++ b/EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c @@ -100,23 +100,61 @@ DmaAllocateBuffer ( OUT VOID **HostAddress ) { - if (HostAddress == NULL) { + return DmaAllocateAlignedBuffer (MemoryType, Pages, 0, HostAddress); +} + + +/** + Allocates pages that are suitable for an DmaMap() of type + MapOperationBusMasterCommonBuffer mapping, at the requested alignment. + + @param MemoryType The type of memory to allocate, EfiBootServicesData or + EfiRuntimeServicesData. + @param Pages The number of pages to allocate. + @param Alignment Alignment in bytes of the base of the returned + buffer (must be a power of 2) + @param HostAddress A pointer to store the base system memory address of the + allocated range. + + @retval EFI_SUCCESS The requested memory pages were allocated. + @retval EFI_UNSUPPORTED Attributes is unsupported. The only legal attribute bits are + MEMORY_WRITE_COMBINE and MEMORY_CACHED. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. + +**/ +EFI_STATUS +EFIAPI +DmaAllocateAlignedBuffer ( + IN EFI_MEMORY_TYPE MemoryType, + IN UINTN Pages, + IN UINTN Alignment, + OUT VOID **HostAddress + ) +{ + if (Alignment == 0) { + Alignment = EFI_PAGE_SIZE; + } + + if (HostAddress == NULL || + (Alignment & (Alignment - 1)) != 0) { return EFI_INVALID_PARAMETER; } // // The only valid memory types are EfiBootServicesData and EfiRuntimeServicesData // - // We used uncached memory to keep coherency - // if (MemoryType == EfiBootServicesData) { - *HostAddress = AllocatePages (Pages); + *HostAddress = AllocateAlignedPages (Pages, Alignment); } else if (MemoryType != EfiRuntimeServicesData) { - *HostAddress = AllocateRuntimePages (Pages); + *HostAddress = AllocateAlignedRuntimePages (Pages, Alignment); } else { return EFI_INVALID_PARAMETER; } + if (*HostAddress == NULL) { + return EFI_OUT_OF_RESOURCES; + } return EFI_SUCCESS; } From patchwork Fri Aug 25 12:10:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 111014 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp909488qge; Fri, 25 Aug 2017 05:10:31 -0700 (PDT) X-Received: by 10.99.16.65 with SMTP id 1mr9599957pgq.208.1503663031586; Fri, 25 Aug 2017 05:10:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503663031; cv=none; d=google.com; s=arc-20160816; b=DAJcnRVAGev3iuM/IQw5H5WuubcIAChnMbZTnvE0bqF/t1rkTumkca0DlOoRfxpA5l GfIi+7nAPzvlXGuQl0d5lXSlrrOA7PwHsLkCMbCuL8kTdSlFGAmci3vDdyQ6RM1COT5d YiOfntFb03yGZLjEG9hOkZ2QItEIBF6OwfijvSKbAwUOwqyRVximJQGMgWLMpeNIL5fh ZjvYJpWuydk23o9di6D6Ks7QyVjpNGWLjHCa6Pwz6j+JJWm4a3ltjDXGkQP5x9U4ws3J IAkwQzpQOHxHAIBjfT4IfIYMypEFqXo1bfQlvvrQA7xlLPtH4uOK4qznbS/nzcjDBpZE mc8g== 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=2TEDk7ptHHEdpML5xkierx7aAO43GgsZnlM9hLdXWWA=; b=0Wo4U+IlntmuCTYBSOe/CtVKYk0MQ5IKPDg7HvgoXVdkOI/YjGfinWfnsdQQJCiOd5 KOLKIO0+sT/c448t/mdnVxHN9rLnzhlexp5emDUSMTuXiwfjIZV1YJw0eroPexFbhGsj bUOSmsPt4P+0ddxXOp5nr0ANOvK4V0spXJSg9v41jh0S/mVKg7kh2bYSpwM8f/YpU3Mx Yut3bFcEEnQLYvvvAbBGGCpuSsnIOXKB+tRvRhWpSP+i4nUPd3WOGyIRfjEsTiDNnINu 3eKnabWc8CbkjZTXYPPUlOgA6/vpRIorFtLvt5HM2Pfv3QuPE+3Xs6BpyW36Z+ZIWhZe PHhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=AQ5S6B9i; 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 3si4971872pll.202.2017.08.25.05.10.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:31 -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=@linaro.org header.s=google header.b=AQ5S6B9i; 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 DD25D2095B9FD; Fri, 25 Aug 2017 05:07:53 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x232.google.com (mail-wr0-x232.google.com [IPv6:2a00:1450:400c:c0c::232]) (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 D72EF2095B9FD for ; Fri, 25 Aug 2017 05:07:51 -0700 (PDT) Received: by mail-wr0-x232.google.com with SMTP id a47so6763585wra.4 for ; Fri, 25 Aug 2017 05:10:27 -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=rWygZacTeInJ9LG1E3+ZiW0wBGTA9q2MX6A864NVj2Q=; b=AQ5S6B9iN2Y9WkqQItQiCvGxJISaBGB82T1Ve4rC8ORK8v0H6VgD/hESugxxc8p//8 ttGK9qmFuX92epdJWPaJ+unzbTOyLGCJiGsU01kuc+pv4FEIA8SSFVuo4BaChvmoNSnL u+7LlQFYHM/6tsqxc4ItTaF/McrttOWddfhq4= 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=rWygZacTeInJ9LG1E3+ZiW0wBGTA9q2MX6A864NVj2Q=; b=KwarGP1Pka+3X/W5FBy3bTU09AD5boyBP8D1lWpjuoJrPGw9q6yMEXTWGdvxR61D6q SCXWB4gCy9xKw/ocjodcbnY5GNifTUA0rdD6GvFESxqlVh5j1QUnpyUoDQJCUh0nBclD EQXs6TSBx+XTUg2vFW87c3i8TWBVRx5pA+hwSa3HXI3jiq1s8ToVJOtOMiyFu0D2e1EG yFWC3EF8MoNAW4/NaSyhCTNGeyQhWwdeZJzHJsnN2YIjYOUH97cMEpxGoQqkwEvfRsqu UBnvMPru35fnrhvfy9TTeWe2oxObo7CqKUt+XWtQabKPyvMFnnK/7BaI6Kp9BLcJreKg +vCw== X-Gm-Message-State: AHYfb5gKaafqnMj2CGRzUQR7pArfMiJWUrYR7fgVhaKuEc6VdfRkxxVV Q0tlqdxNTjWktBVXteLmSA== X-Received: by 10.223.165.129 with SMTP id g1mr5432724wrc.108.1503663025830; Fri, 25 Aug 2017 05:10:25 -0700 (PDT) Received: from localhost.localdomain ([105.137.125.182]) by smtp.gmail.com with ESMTPSA id 9sm1996137wmo.35.2017.08.25.05.10.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:25 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Fri, 25 Aug 2017 13:10:11 +0100 Message-Id: <20170825121014.15739-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170825121014.15739-1-ard.biesheuvel@linaro.org> References: <20170825121014.15739-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 2/5] ArmPkg/ArmDmaLib: implement DmaAllocateAlignedBuffer() 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: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Implement the new DmaLib routine that returns DMA'able buffers at a specified minimum alignment. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmDmaLib/ArmDmaLib.c | 42 ++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c index e12bda4c2d33..2a8cf0fe21a4 100644 --- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c +++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c @@ -285,20 +285,56 @@ DmaAllocateBuffer ( OUT VOID **HostAddress ) { + return DmaAllocateAlignedBuffer (MemoryType, Pages, 0, HostAddress); +} + +/** + Allocates pages that are suitable for an DmaMap() of type + MapOperationBusMasterCommonBuffer mapping, at the requested alignment. + + @param MemoryType The type of memory to allocate, EfiBootServicesData or + EfiRuntimeServicesData. + @param Pages The number of pages to allocate. + @param Alignment Alignment in bytes of the base of the returned + buffer (must be a power of 2) + @param HostAddress A pointer to store the base system memory address of the + allocated range. + + @retval EFI_SUCCESS The requested memory pages were allocated. + @retval EFI_UNSUPPORTED Attributes is unsupported. The only legal attribute bits are + MEMORY_WRITE_COMBINE and MEMORY_CACHED. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. + +**/ +EFI_STATUS +EFIAPI +DmaAllocateAlignedBuffer ( + IN EFI_MEMORY_TYPE MemoryType, + IN UINTN Pages, + IN UINTN Alignment, + OUT VOID **HostAddress + ) +{ EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor; VOID *Allocation; UINT64 MemType; UNCACHED_ALLOCATION *Alloc; EFI_STATUS Status; - if (HostAddress == NULL) { + if (Alignment == 0) { + Alignment = EFI_PAGE_SIZE; + } + + if (HostAddress == NULL || + (Alignment & (Alignment - 1)) != 0) { return EFI_INVALID_PARAMETER; } if (MemoryType == EfiBootServicesData) { - Allocation = AllocatePages (Pages); + Allocation = AllocateAlignedPages (Pages, Alignment); } else if (MemoryType == EfiRuntimeServicesData) { - Allocation = AllocateRuntimePages (Pages); + Allocation = AllocateAlignedRuntimePages (Pages, Alignment); } else { return EFI_INVALID_PARAMETER; } From patchwork Fri Aug 25 12:10:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 111015 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp909564qge; Fri, 25 Aug 2017 05:10:34 -0700 (PDT) X-Received: by 10.98.46.5 with SMTP id u5mr9841297pfu.187.1503663034444; Fri, 25 Aug 2017 05:10:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503663034; cv=none; d=google.com; s=arc-20160816; b=sToLtS9Gm5ozUNf2R6HrNXQ13KETE1yG+qKAHhxec88K6TvB6SXzn81uRWNeN+X01q zZi1Hyf6jOqSioEs1gT4uY6dZJ5qxviW2iTZp990PJKjqSmxWUHvks6ioxnt6EmdOh6Q Zs3x3H0uDeXzzBhUCKS0bxqEnJh3Xd2Xp34w7rVO7YCp1xt+iPbACrq7LkJtiruDXFbr 3gcgB3YDpRmwPFUIA6JHgW8+Mtmc5V/DrMQv0xNAv33n48Cccqmo40xb9cOnMVPpaG1Z vbifJDAV3+UyJKgu3XTBUL/H0p2O5lnAkjGopEtjesKWQtlOVYHxbAvy8mQCDr1h7Ou3 TkfA== 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=cXqoAfscYXLB9Wi3pB0qB++EWWf2px8aRdCQvjWn6q4=; b=gLMqPaYmX1X/Mx9GDGHBXhFw1aUfRgQhr1grxCR1KHSncss7cqRF63nMivQKzav7rh 0wCOb9pqkGFkkLD9NQ2BElZc3QF98gMdfNJ+C818A83rXLhfM09gMOep0dNfECMjv92D EOXg0bBi4IwKBF660fZQuMwuf7V1OBlnW21T94E5YGC7r03KqJC9h25vCCFQxBccZG5s 2S7BnQ1HY0sf/Kd7oEc8ejk1bOsO7cOcETS52USi9pC+1IABgL4Lxou8iJLXqxKtCqmg RjhbzMM7igAEXFeE3c+BjBU/Qzj8XiT0hpUoSzWFkWbAoUvWxetCffgroRi7O5NVeBD2 axUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=b1/xPPyW; 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 a61si4841221pla.166.2017.08.25.05.10.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10: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=@linaro.org header.s=google header.b=b1/xPPyW; 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 1EC932095AE79; Fri, 25 Aug 2017 05:07:56 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x22f.google.com (mail-wr0-x22f.google.com [IPv6:2a00:1450:400c:c0c::22f]) (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 52B262095B9FD for ; Fri, 25 Aug 2017 05:07:53 -0700 (PDT) Received: by mail-wr0-x22f.google.com with SMTP id a47so6763806wra.4 for ; Fri, 25 Aug 2017 05:10:29 -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=rDWcvXVjiNugUb0zxfMZwuXqYoESbWJ5dc7tZcMpnlg=; b=b1/xPPyWg2PbqtmjGd1dlFNHpNuSeqoEMsuz5JDwImuGH+lnFEHzluPNbbjvxJTY7w nlg/x+wKNGmGSffouys83eUI8+sZ3z+aPieKdflZEacqx08+uvGVOy/K/PCxCyS/MkCL hhRsBGO2qbt3bZVF4Ikuj6RoiyxNmvusJBR/c= 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=rDWcvXVjiNugUb0zxfMZwuXqYoESbWJ5dc7tZcMpnlg=; b=aFr55Muovc7lrRapPpEPjtsqXzFw0KXOHttylhP34e7u5xgbufGnmzl0KIeyJqFyY6 gw9dcGl/8IvEH8sQkJpMqH+/iL0W0OzeYabEWZxcmyLOsJUVru0R55bEoBny0YvD/B2P Q5aTlaca4l4AK6j0FYK477fNpNVcAOiedMw5DVUu69+eZxINTOrFIGGl3bwR2oipGeV0 ETmJoN7psooGKx3ZixwaGdrxq/9Xx/dyaUr2FcpPL4547aUHFhTRnirEwCazFNyH4i+P plB0OI46EALDjKzZVdGa5rmupNuY9N3wrdFJEMxQQXiNH3fj0x+U40wmSTNbFUkKfQX3 IDFA== X-Gm-Message-State: AHYfb5haQdTSx+tuaT4KiiAcJPPvJoxEZtMOrNwE65kzstNozRPT7chD Bl8BztsiCeLE2Z3Fl6KaWw== X-Received: by 10.223.146.3 with SMTP id 3mr279763wrj.296.1503663027713; Fri, 25 Aug 2017 05:10:27 -0700 (PDT) Received: from localhost.localdomain ([105.137.125.182]) by smtp.gmail.com with ESMTPSA id 9sm1996137wmo.35.2017.08.25.05.10.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:26 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Fri, 25 Aug 2017 13:10:12 +0100 Message-Id: <20170825121014.15739-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170825121014.15739-1-ard.biesheuvel@linaro.org> References: <20170825121014.15739-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 3/5] BeagleBoardPkg: remove UncachedMemoryAllocationLib resolutions 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: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" ArmDmaLib no longer depends on UncachedMemoryAllocationLib, so we can remove the library class resolutions for it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- BeagleBoardPkg/BeagleBoardPkg.dsc | 2 -- 1 file changed, 2 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc index b22f814a28a4..84aae84ff52d 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -44,10 +44,8 @@ [LibraryClasses.common] !if $(TARGET) == RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf !else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf !endif DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf From patchwork Fri Aug 25 12:10:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 111016 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp909650qge; Fri, 25 Aug 2017 05:10:38 -0700 (PDT) X-Received: by 10.98.70.27 with SMTP id t27mr9655864pfa.103.1503663037914; Fri, 25 Aug 2017 05:10:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503663037; cv=none; d=google.com; s=arc-20160816; b=A2M/1VhhLWfNFeap28mLt5+NxQcCSirMB1KfI844foYiOXt3DZHqw9JpUCjm7XC/9m CftNQzGxNlyjBFQ+9QZbrcCM9+dHOtES8mz43+u9novjDVJ/J2rxBuQP3Wd/B73Yj11w caXpz9nODsdUEyI/u+93DnFHaZeAfzTkKWWftXBZfyO+vm5ZhSplRKJNxZ8QPWazZQgr ZAAZ2z/YlrOvOiw3vducnocZJDBNG2i/xwx9HjIC/w9orNm90Vfq6oa6lCpxX1HFVko+ GHe/S9niNaglO8FJqCAPO9FXKat+0aZK/nA4fdWNP8wth05r4B1xSAuctpmbFxMXjS3m f8Gw== 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=8Oow9dpGrQirIhMGcTVkeJIf+g+XQgduT7wg/Pd5dB4=; b=m6hiU6HxHWMk91ubGJCS2Wx/gEjPtGE6bTbwZY/PDsXDRlpOu+EcEqH5VLOnpZdhft tf1TQErwUx2An5oQi+vvpvgJEhWlMizu3aYRb0WKutHxCqDzHloBTl1PFmAZJswH6Nw3 S1/d5MsmCA6itFegGDwJLRhdWUkJcrjqCH+j0XSb0f3QI2PF+Fv6kDEXqaIPJcscNJaX sVm21kxFTSF+VkX5A0XVTHENw274qyPCltYLy9CnQn221PtU75u+QGD67hRJJVTR3cYM p74EdfcFm6x6ht2AVlLYR82oswyBjvoSP1uvRNSUxhsmy6bMVq0nhxAo9hVkDeSIGosT eWzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XRF4nyQP; 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 37si4208018plq.775.2017.08.25.05.10.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:37 -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=@linaro.org header.s=google header.b=XRF4nyQP; 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 6129721E79014; Fri, 25 Aug 2017 05:07:59 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x236.google.com (mail-wr0-x236.google.com [IPv6:2a00:1450:400c:c0c::236]) (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 49F4C21D1E2FD for ; Fri, 25 Aug 2017 05:07:55 -0700 (PDT) Received: by mail-wr0-x236.google.com with SMTP id k46so2484640wre.0 for ; Fri, 25 Aug 2017 05:10:31 -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=vOnZFNin1imogRMSMbH4lP970UNMr0IJpLcx/2/Jb4M=; b=XRF4nyQP0AXq8ZJNtMZ8XUQi5fWzIVNWCJr1VYSgKxtnRZ5S+Vh0PlJRbfXmjXWM9D aRgXn1R6hOY30k6g4Qk2whDXaIG/DlMtgwhyz/SjwPELRUAipAyEtjrYglEiXuSivtc7 RDLaWCMfO8q1wtHqZzN1w1QIyM//LQLXERMVg= 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=vOnZFNin1imogRMSMbH4lP970UNMr0IJpLcx/2/Jb4M=; b=cTy5MElKO+Hs9Bdt18bVqPX7baW4CIZzn9zPCUoDuzz2Alp2enVaVV+TSmcfErbChK WqAvtDNYjB/ihMl+9jk6vzc2+pkimDbFiFwUgSK1qpi9BYK4TSNV3dq41aT6zakvDe7c VBrGcDIIh1+EUhZjJMb1BbZjxkRhXSrYZi53kPIR2oYa4OaErgrZ6RyzixJZImWStMWd XMCDEOssStqdT2QccUYvY8r3r2GAXsnXGyCT/PyPtkLwCxEheE1mEQvCJBjiannocD16 oH7VdXEh+hdTwV/r6DbBMi4j53MiMFLfF88s13kF6IwlZMdtIMqw7WOVFm5S2fZepRqo B5dw== X-Gm-Message-State: AHYfb5jtmA/wyFlh9PoJZ2JbNSojsk7MQiKSIfyFdrnZZWO70+uMjq6s vvcENPJhwoP6rC6W8jEXtw== X-Received: by 10.223.128.131 with SMTP id 3mr6756050wrl.77.1503663029703; Fri, 25 Aug 2017 05:10:29 -0700 (PDT) Received: from localhost.localdomain ([105.137.125.182]) by smtp.gmail.com with ESMTPSA id 9sm1996137wmo.35.2017.08.25.05.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:28 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Fri, 25 Aug 2017 13:10:13 +0100 Message-Id: <20170825121014.15739-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170825121014.15739-1-ard.biesheuvel@linaro.org> References: <20170825121014.15739-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 4/5] Omap35xxPkg: remove bogus UncachedMemoryAllocationLib 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: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove a false dependency on UncachedMemoryAllocationLib, and fix the broken build while we're at it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf | 1 + Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf | 1 - Omap35xxPkg/Omap35xxPkg.dsc | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf index 07810d9afd63..5907745b14e2 100644 --- a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf +++ b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf @@ -44,3 +44,4 @@ [LibraryClasses] [Pcd] gOmap35xxTokenSpaceGuid.PcdOmap35xxDebugAgentTimer gOmap35xxTokenSpaceGuid.PcdDebugAgentTimerFreqNanoSeconds + gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress diff --git a/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf b/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf index b569cfbdefca..1f6275d7460d 100644 --- a/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf +++ b/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf @@ -33,7 +33,6 @@ [LibraryClasses] DebugLib UefiBootServicesTableLib MemoryAllocationLib - UncachedMemoryAllocationLib IoLib BaseMemoryLib ArmLib diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc index fc94ca7ed129..941bc97060b9 100644 --- a/Omap35xxPkg/Omap35xxPkg.dsc +++ b/Omap35xxPkg/Omap35xxPkg.dsc @@ -72,8 +72,6 @@ [LibraryClasses.common] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf - CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf From patchwork Fri Aug 25 12:10:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 111017 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp909760qge; Fri, 25 Aug 2017 05:10:41 -0700 (PDT) X-Received: by 10.84.209.169 with SMTP id y38mr10403612plh.230.1503663041702; Fri, 25 Aug 2017 05:10:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503663041; cv=none; d=google.com; s=arc-20160816; b=b1nB0M62i0430HW45F6ClKBRwFV1Hw7Yu1+3YdPPTNYyujQGsfMs7IeQq0lUnsDTqR R1WI3PD0vRDlouZzagIt9urfimbKkK4OmXEREoVz5CInmIhiorKa0R5i4IskzNdGe6nV 8XbPsAnKcmWN66G9FKoY4iwr+dW1Hr/e552q5Xm7Pc05royiQ0Y+lfY35NGFaGb/a1Hl UmBDdi1PTO7pMhcE5/4YtpI56DiNh3bCCJTfrKTy7HLzTEqKpqcAL3Q8bzNsEzClJU6B ZU7kDDpTKr0i2hVgHnc5MrJjn0eTr7y/OB8FVKwEhojjbaobN65e15cf/XM3uTKYizC8 l5iA== 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=ECUzwNiRgeTnfyWDNJHlfWLCjt3MXw61pHF5QYQsQvQ=; b=T47Yz3WV91MwMeJYhfHw9jGbYxGPfBw/JlqL9Df6Qw+AuYqI6q5/rxMxL/nXCilsys JNOn2JYZGG0A2enMPR0OqqaCf8LRuxaybyhq/RcmZW3yZaDzNF0SAfMrGL9m19c2rKaQ YxlJ/HHIVU9GTRw1UYlFnxihdh6PJMAqODMrsM1r/6vPPApIHveF8dYFu6Pu44awu378 D3N2Y1Jvf0b4UWMRLTC0w7eKkeNwaFe/qG5jGQukNYyBM2VlRtxK4qjxaOMNa36QsnOF W/HCOgoi81lMC6Wwz0p7s7MMSQ8h51r5GhW29j4Ekfu+cwmjPW0c+hanYh4y5XJP+L7c e3rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=U1KEcNfx; 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 q10si4619609pfc.535.2017.08.25.05.10.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:41 -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=U1KEcNfx; 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 9EE9721E79011; Fri, 25 Aug 2017 05:08:01 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x236.google.com (mail-wr0-x236.google.com [IPv6:2a00:1450:400c:c0c::236]) (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 C530821D1E2FD for ; Fri, 25 Aug 2017 05:07:58 -0700 (PDT) Received: by mail-wr0-x236.google.com with SMTP id p8so6832052wrf.2 for ; Fri, 25 Aug 2017 05:10:34 -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=2Gz4aAHpZMcZeENk7Fe1i+D2Q+mdPaIY+COzKPfFtqU=; b=U1KEcNfxdP1mvuR79f59sgZgWlpMtm3kIP0njuu4vHQqqjCB1efeBFxztmvop0vcuz wuUfj9dBcMFcJSsqwJIGj2DfPZjmtV2nvlcpV5luLp0iSkG8OCJc3KwgmRBikh7Zxo84 pRGNcfNAoKAk2AnOIS5dNJK1Tp0mF30//HVus= 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=2Gz4aAHpZMcZeENk7Fe1i+D2Q+mdPaIY+COzKPfFtqU=; b=sp3qxlWv/cABidINPDE8AwuubZze1lYw3BscqY9vD5PY5MCov2bxVVOfWmUJfm4USO 6Lk1AqsjBXXkdZzN0wNfQpsyo5Y11hTqkKR0oxdxATQI6Qi4Q1VjiFjLOpEJlOARJw6o uow+NLgWlpWeznlDOVEWTmoJDOIguUtbDZFp2RoEtxqhJeQlDMJTctdHpbGzm1chmE5k 0zaVYTn7Vlz2dqtr/Neq/mdqRRtsg/mjei91b6325pj+JCRw8ZDtJfAIVu4IIsJZ/Ehx dVtjMCqqbKDbVCnJOI7wrTVr1YryLXUi5d0egxOj+xhW4yfI9m5SxGF2SiTLVStuqH+X 8IHw== X-Gm-Message-State: AHYfb5g28W4bqRYsIUviAgEhRM7PuSUW0MPzHbOZaGP6zr+GBHT0CIAS c7//b4PdjvzOszo9RcCU4A== X-Received: by 10.223.184.198 with SMTP id c6mr5292811wrg.200.1503663032153; Fri, 25 Aug 2017 05:10:32 -0700 (PDT) Received: from localhost.localdomain ([105.137.125.182]) by smtp.gmail.com with ESMTPSA id 9sm1996137wmo.35.2017.08.25.05.10.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 05:10:31 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Fri, 25 Aug 2017 13:10:14 +0100 Message-Id: <20170825121014.15739-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170825121014.15739-1-ard.biesheuvel@linaro.org> References: <20170825121014.15739-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 5/5] ArmPkg: remove UncachedMemoryAllocationLib 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: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Now that ArmDmaLib can take care of its own memory allocation needs, let's get rid of UncachedMemoryAllocationLib entirely. This forces platforms to declare the required semantics (non-cache coherent DMA, whichever way it is implemented), rather than using uncached memory allocations directly, which may not always be the right choice, and prevents sharing of drivers between platforms if one is cache coherent and the other is not. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/ArmPkg.dec | 4 - ArmPkg/ArmPkg.dsc | 2 - ArmPkg/Include/Library/UncachedMemoryAllocationLib.h | 665 ------------------ ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c | 719 -------------------- ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf | 50 -- 5 files changed, 1440 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index c4b4da2f95bb..084d7efb1d8b 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -36,7 +36,6 @@ [LibraryClasses.common] ArmLib|Include/Library/ArmLib.h ArmMmuLib|Include/Library/ArmMmuLib.h SemihostLib|Include/Library/Semihosting.h - UncachedMemoryAllocationLib|Include/Library/UncachedMemoryAllocationLib.h DefaultExceptionHandlerLib|Include/Library/DefaultExceptionHandlerLib.h ArmDisassemblerLib|Include/Library/ArmDisassemblerLib.h ArmGicArchLib|Include/Library/ArmGicArchLib.h @@ -84,9 +83,6 @@ [PcdsFixedAtBuild.common] # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor. gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024 - # This PCD will free the unallocated buffers if their size reach this threshold. - # We set the default value to 512MB. - gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003 gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0xffff0000|UINT64|0x00000004 gArmTokenSpaceGuid.PcdCpuResetAddress|0x00000000|UINT32|0x00000005 diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 9144334cb821..ff2b0c074dc1 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -62,7 +62,6 @@ [LibraryClasses.common] HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf - UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf @@ -117,7 +116,6 @@ [Components.common] ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf ArmPkg/Library/SemihostLib/SemihostLib.inf - ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf diff --git a/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h b/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h deleted file mode 100644 index a49d8d3ac99f..000000000000 --- a/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h +++ /dev/null @@ -1,665 +0,0 @@ -/** @file - - Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
- - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#ifndef __UNCACHED_MEMORY_ALLOCATION_LIB_H__ -#define __UNCACHED_MEMORY_ALLOCATION_LIB_H__ - -/** - Converts a cached or uncached address to a physical address suitable for use in SoC registers. - - @param VirtualAddress The pointer to convert. - - @return The physical address of the supplied virtual pointer. - -**/ -EFI_PHYSICAL_ADDRESS -ConvertToPhysicalAddress ( - IN VOID *VirtualAddress - ); - -/** - Converts a cached or uncached address to a cached address. - - @param Address The pointer to convert. - - @return The address of the cached memory location corresponding to the input address. - -**/ -VOID * -ConvertToCachedAddress ( - IN VOID *Address - ); - -/** - Converts a cached or uncached address to an uncached address. - - @param Address The pointer to convert. - - @return The address of the uncached memory location corresponding to the input address. - -**/ -VOID * -ConvertToUncachedAddress ( - IN VOID *Address - ); - -/** - Allocates one or more 4KB pages of type EfiBootServicesData. - - Allocates the number of 4KB pages of type EfiBootServicesData 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 Pages The number of 4 KB pages to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocatePages ( - IN UINTN Pages - ); - -/** - Allocates one or more 4KB pages of type EfiRuntimeServicesData. - - Allocates the number of 4KB pages of type EfiRuntimeServicesData 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 Pages The number of 4 KB pages to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateRuntimePages ( - IN UINTN Pages - ); - -/** - Allocates one or more 4KB pages of type EfiReservedMemoryType. - - Allocates the number of 4KB pages of type EfiReservedMemoryType 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 Pages The number of 4 KB pages to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateReservedPages ( - IN UINTN Pages - ); - -/** - Frees one or more 4KB pages that were previously allocated with one of the page allocation - functions in the Memory Allocation Library. - - Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer. Buffer - must have been allocated on a previous call to the page allocation services of the Memory - Allocation Library. - If Buffer was not allocated with a page allocation function in the Memory Allocation Library, - then ASSERT(). - If Pages is zero, then ASSERT(). - - @param Buffer Pointer to the buffer of pages to free. - @param Pages The number of 4 KB pages to free. - -**/ -VOID -EFIAPI -UncachedFreePages ( - IN VOID *Buffer, - IN UINTN Pages - ); - -/** - Allocates one or more 4KB pages of type EfiBootServicesData at a specified alignment. - - Allocates the number of 4KB pages specified by Pages of type EfiBootServicesData with an - alignment specified by Alignment. The allocated buffer is returned. If Pages is 0, then NULL is - returned. If there is not enough memory at the specified alignment remaining to satisfy the - request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param Pages The number of 4 KB pages to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedPages ( - IN UINTN Pages, - IN UINTN Alignment - ); - -/** - Allocates one or more 4KB pages of type EfiRuntimeServicesData at a specified alignment. - - Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData with an - alignment specified by Alignment. The allocated buffer is returned. If Pages is 0, then NULL is - returned. If there is not enough memory at the specified alignment remaining to satisfy the - request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param Pages The number of 4 KB pages to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedRuntimePages ( - IN UINTN Pages, - IN UINTN Alignment - ); - -/** - Allocates one or more 4KB pages of type EfiReservedMemoryType at a specified alignment. - - Allocates the number of 4KB pages specified by Pages of type EfiReservedMemoryType with an - alignment specified by Alignment. The allocated buffer is returned. If Pages is 0, then NULL is - returned. If there is not enough memory at the specified alignment remaining to satisfy the - request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param Pages The number of 4 KB pages to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedReservedPages ( - IN UINTN Pages, - IN UINTN Alignment - ); - -/** - Frees one or more 4KB pages that were previously allocated with one of the aligned page - allocation functions in the Memory Allocation Library. - - Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer. Buffer - must have been allocated on a previous call to the aligned page allocation services of the Memory - Allocation Library. - If Buffer was not allocated with an aligned page allocation function in the Memory Allocation - Library, then ASSERT(). - If Pages is zero, then ASSERT(). - - @param Buffer Pointer to the buffer of pages to free. - @param Pages The number of 4 KB pages to free. - -**/ -VOID -EFIAPI -UncachedFreeAlignedPages ( - IN VOID *Buffer, - IN UINTN Pages - ); - -/** - Allocates a buffer of type EfiBootServicesData. - - Allocates the number bytes specified by AllocationSize of type EfiBootServicesData and returns a - pointer to the allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is - returned. If there is not enough memory remaining to satisfy the request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocatePool ( - IN UINTN AllocationSize - ); - -/** - Allocates a buffer of type EfiRuntimeServicesData. - - Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData and returns - a pointer to the allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is - returned. If there is not enough memory remaining to satisfy the request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateRuntimePool ( - IN UINTN AllocationSize - ); - -/** - Allocates a buffer of type EfieservedMemoryType. - - Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType and returns - a pointer to the allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is - returned. If there is not enough memory remaining to satisfy the request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateReservedPool ( - IN UINTN AllocationSize - ); - -/** - Allocates and zeros a buffer of type EfiBootServicesData. - - Allocates the number bytes specified by AllocationSize of type EfiBootServicesData, clears the - buffer with zeros, and returns a pointer to the allocated buffer. If AllocationSize is 0, then a - valid buffer of 0 size is returned. If there is not enough memory remaining to satisfy the - request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate and zero. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateZeroPool ( - IN UINTN AllocationSize - ); - -/** - Allocates and zeros a buffer of type EfiRuntimeServicesData. - - Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, clears the - buffer with zeros, and returns a pointer to the allocated buffer. If AllocationSize is 0, then a - valid buffer of 0 size is returned. If there is not enough memory remaining to satisfy the - request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate and zero. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateRuntimeZeroPool ( - IN UINTN AllocationSize - ); - -/** - Allocates and zeros a buffer of type EfiReservedMemoryType. - - Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType, clears the - buffer with zeros, and returns a pointer to the allocated buffer. If AllocationSize is 0, then a - valid buffer of 0 size is returned. If there is not enough memory remaining to satisfy the - request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate and zero. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateReservedZeroPool ( - IN UINTN AllocationSize - ); - -/** - Copies a buffer to an allocated buffer of type EfiBootServicesData. - - Allocates the number bytes specified by AllocationSize of type EfiBootServicesData, copies - AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the - allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there - is not enough memory remaining to satisfy the request, then NULL is returned. - If Buffer is NULL, then ASSERT(). - If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). - - @param AllocationSize The number of bytes to allocate and zero. - @param Buffer The buffer to copy to the allocated buffer. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer - ); - -/** - Copies a buffer to an allocated buffer of type EfiRuntimeServicesData. - - Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, copies - AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the - allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there - is not enough memory remaining to satisfy the request, then NULL is returned. - If Buffer is NULL, then ASSERT(). - If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). - - @param AllocationSize The number of bytes to allocate and zero. - @param Buffer The buffer to copy to the allocated buffer. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateRuntimeCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer - ); - -/** - Copies a buffer to an allocated buffer of type EfiReservedMemoryType. - - Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType, copies - AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the - allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there - is not enough memory remaining to satisfy the request, then NULL is returned. - If Buffer is NULL, then ASSERT(). - If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). - - @param AllocationSize The number of bytes to allocate and zero. - @param Buffer The buffer to copy to the allocated buffer. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateReservedCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer - ); - -/** - Frees a buffer that was previously allocated with one of the pool allocation functions in the - Memory Allocation Library. - - Frees the buffer specified by Buffer. Buffer must have been allocated on a previous call to the - pool allocation services of the Memory Allocation Library. - If Buffer was not allocated with a pool allocation function in the Memory Allocation Library, - then ASSERT(). - - @param Buffer Pointer to the buffer to free. - -**/ -VOID -EFIAPI -UncachedFreePool ( - IN VOID *Buffer - ); - -/** - Allocates a buffer of type EfiBootServicesData at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfiBootServicesData with an - alignment specified by Alignment. The allocated buffer is returned. If AllocationSize is 0, - then a valid buffer of 0 size is returned. If there is not enough memory at the specified - alignment remaining to satisfy the request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ); - -/** - Allocates a buffer of type EfiRuntimeServicesData at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData with an - alignment specified by Alignment. The allocated buffer is returned. If AllocationSize is 0, - then a valid buffer of 0 size is returned. If there is not enough memory at the specified - alignment remaining to satisfy the request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedRuntimePool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ); - -/** - Allocates a buffer of type EfieservedMemoryType at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType with an - alignment specified by Alignment. The allocated buffer is returned. If AllocationSize is 0, - then a valid buffer of 0 size is returned. If there is not enough memory at the specified - alignment remaining to satisfy the request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedReservedPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ); - -/** - Allocates and zeros a buffer of type EfiBootServicesData at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfiBootServicesData with an - alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the - allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there - is not enough memory at the specified alignment remaining to satisfy the request, then NULL is - returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedZeroPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ); - -/** - Allocates and zeros a buffer of type EfiRuntimeServicesData at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData with an - alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the - allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there - is not enough memory at the specified alignment remaining to satisfy the request, then NULL is - returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedRuntimeZeroPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ); - -/** - Allocates and zeros a buffer of type EfieservedMemoryType at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType with an - alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the - allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there - is not enough memory at the specified alignment remaining to satisfy the request, then NULL is - returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedReservedZeroPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ); - -/** - Copies a buffer to an allocated buffer of type EfiBootServicesData at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfiBootServicesData type with an - alignment specified by Alignment. The allocated buffer is returned. If AllocationSize is 0, - then a valid buffer of 0 size is returned. If there is not enough memory at the specified - alignment remaining to satisfy the request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Buffer The buffer to copy to the allocated buffer. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer, - IN UINTN Alignment - ); - -/** - Copies a buffer to an allocated buffer of type EfiRuntimeServicesData at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData type with an - alignment specified by Alignment. The allocated buffer is returned. If AllocationSize is 0, - then a valid buffer of 0 size is returned. If there is not enough memory at the specified - alignment remaining to satisfy the request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Buffer The buffer to copy to the allocated buffer. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedRuntimeCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer, - IN UINTN Alignment - ); - -/** - Copies a buffer to an allocated buffer of type EfiReservedMemoryType at a specified alignment. - - Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType type with an - alignment specified by Alignment. The allocated buffer is returned. If AllocationSize is 0, - then a valid buffer of 0 size is returned. If there is not enough memory at the specified - alignment remaining to satisfy the request, then NULL is returned. - If Alignment is not a power of two and Alignment is not zero, then ASSERT(). - - @param AllocationSize The number of bytes to allocate. - @param Buffer The buffer to copy to the allocated buffer. - @param Alignment The requested alignment of the allocation. Must be a power of two. - If Alignment is zero, then byte alignment is used. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -UncachedAllocateAlignedReservedCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer, - IN UINTN Alignment - ); - -/** - Frees a buffer that was previously allocated with one of the aligned pool allocation functions - in the Memory Allocation Library. - - Frees the buffer specified by Buffer. Buffer must have been allocated on a previous call to the - aligned pool allocation services of the Memory Allocation Library. - If Buffer was not allocated with an aligned pool allocation function in the Memory Allocation - Library, then ASSERT(). - - @param Buffer Pointer to the buffer to free. - -**/ -VOID -EFIAPI -UncachedFreeAlignedPool ( - IN VOID *Buffer - ); - -VOID -EFIAPI -UncachedSafeFreePool ( - IN VOID *Buffer - ); - -#endif // __UNCACHED_MEMORY_ALLOCATION_LIB_H__ diff --git a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c b/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c deleted file mode 100644 index fdaaf2d706ab..000000000000 --- a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c +++ /dev/null @@ -1,719 +0,0 @@ -/** @file - UncachedMemoryAllocation lib that uses DXE Service to change cachability for - a buffer. - - Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
- Copyright (c) 2014, AMR Ltd. All rights reserved.
- - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -STATIC EFI_CPU_ARCH_PROTOCOL *mCpu; - -VOID * -UncachedInternalAllocatePages ( - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN Pages - ); - -VOID * -UncachedInternalAllocateAlignedPages ( - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN Pages, - IN UINTN Alignment - ); - - - -typedef struct { - EFI_PHYSICAL_ADDRESS Base; - VOID *Allocation; - UINTN Pages; - EFI_MEMORY_TYPE MemoryType; - BOOLEAN Allocated; - LIST_ENTRY Link; - UINT64 Attributes; -} FREE_PAGE_NODE; - -STATIC LIST_ENTRY mPageList = INITIALIZE_LIST_HEAD_VARIABLE (mPageList); -// Track the size of the non-allocated buffer in the linked-list -STATIC UINTN mFreedBufferSize = 0; - -/** - * This function firstly checks if the requested allocation can fit into one - * of the previously allocated buffer. - * If the requested allocation does not fit in the existing pool then - * the function makes a new allocation. - * - * @param MemoryType Type of memory requested for the new allocation - * @param Pages Number of requested page - * @param Alignment Required alignment - * @param Allocation Address of the newly allocated buffer - * - * @return EFI_SUCCESS If the function manage to allocate a buffer - * @return !EFI_SUCCESS If the function did not manage to allocate a buffer - */ -STATIC -EFI_STATUS -AllocatePagesFromList ( - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN Pages, - IN UINTN Alignment, - OUT VOID **Allocation - ) -{ - EFI_STATUS Status; - LIST_ENTRY *Link; - FREE_PAGE_NODE *Node; - FREE_PAGE_NODE *NewNode; - UINTN AlignmentMask; - EFI_PHYSICAL_ADDRESS Memory; - EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor; - - // Alignment must be a power of two or zero. - ASSERT ((Alignment & (Alignment - 1)) == 0); - - // - // Look in our list for the smallest page that could satisfy the new allocation - // - Node = NULL; - NewNode = NULL; - for (Link = mPageList.ForwardLink; Link != &mPageList; Link = Link->ForwardLink) { - Node = BASE_CR (Link, FREE_PAGE_NODE, Link); - if ((Node->Allocated == FALSE) && (Node->MemoryType == MemoryType)) { - // We have a node that fits our requirements - if (((UINTN)Node->Base & (Alignment - 1)) == 0) { - // We found a page that matches the page size - if (Node->Pages == Pages) { - Node->Allocated = TRUE; - Node->Allocation = (VOID*)(UINTN)Node->Base; - *Allocation = Node->Allocation; - - // Update the size of the freed buffer - mFreedBufferSize -= Pages * EFI_PAGE_SIZE; - return EFI_SUCCESS; - } else if (Node->Pages > Pages) { - if (NewNode == NULL) { - // It is the first node that could contain our new allocation - NewNode = Node; - } else if (NewNode->Pages > Node->Pages) { - // This node offers a smaller number of page. - NewNode = Node; - } - } - } - } - } - // Check if we have found a node that could contain our new allocation - if (NewNode != NULL) { - NewNode->Allocated = TRUE; - NewNode->Allocation = (VOID*)(UINTN)NewNode->Base; - *Allocation = NewNode->Allocation; - mFreedBufferSize -= NewNode->Pages * EFI_PAGE_SIZE; - return EFI_SUCCESS; - } - - // - // Otherwise, we need to allocate a new buffer - // - - // We do not want to over-allocate in case the alignment requirement does not - // require extra pages - if (Alignment > EFI_PAGE_SIZE) { - AlignmentMask = Alignment - 1; - Pages += EFI_SIZE_TO_PAGES (Alignment); - } else { - AlignmentMask = 0; - } - - Status = gBS->AllocatePages (AllocateAnyPages, MemoryType, Pages, &Memory); - if (EFI_ERROR (Status)) { - return Status; - } - - Status = gDS->GetMemorySpaceDescriptor (Memory, &Descriptor); - if (EFI_ERROR (Status)) { - goto FreePages; - } - - Status = gDS->SetMemorySpaceAttributes (Memory, EFI_PAGES_TO_SIZE (Pages), - EFI_MEMORY_WC); - if (EFI_ERROR (Status)) { - goto FreePages; - } - - // - // EFI_CPU_ARCH_PROTOCOL::SetMemoryAttributes() will preserve the original - // memory type attribute if no memory type is passed. Permission attributes - // will be replaced, so EFI_MEMORY_RO will be removed if present (although - // it would be a bug if that were the case for an AllocatePages() allocation) - // - Status = mCpu->SetMemoryAttributes (mCpu, Memory, EFI_PAGES_TO_SIZE (Pages), - EFI_MEMORY_XP); - if (EFI_ERROR (Status)) { - goto FreePages; - } - - InvalidateDataCacheRange ((VOID *)(UINTN)Memory, EFI_PAGES_TO_SIZE (Pages)); - - NewNode = AllocatePool (sizeof (FREE_PAGE_NODE)); - if (NewNode == NULL) { - ASSERT (FALSE); - Status = EFI_OUT_OF_RESOURCES; - goto FreePages; - } - - NewNode->Base = Memory; - NewNode->Allocation = (VOID*)(((UINTN)Memory + AlignmentMask) & ~AlignmentMask); - NewNode->Pages = Pages; - NewNode->Allocated = TRUE; - NewNode->MemoryType = MemoryType; - NewNode->Attributes = Descriptor.Attributes; - - InsertTailList (&mPageList, &NewNode->Link); - - *Allocation = NewNode->Allocation; - return EFI_SUCCESS; - -FreePages: - gBS->FreePages (Memory, Pages); - return Status; -} - -/** - * Free the memory allocation - * - * This function will actually try to find the allocation in the linked list. - * And it will then mark the entry as freed. - * - * @param Allocation Base address of the buffer to free - * - * @return EFI_SUCCESS The allocation has been freed - * @return EFI_NOT_FOUND The allocation was not found in the pool. - * @return EFI_INVALID_PARAMETER If Allocation is NULL - * - */ -STATIC -EFI_STATUS -FreePagesFromList ( - IN VOID *Allocation - ) -{ - LIST_ENTRY *Link; - FREE_PAGE_NODE *Node; - - if (Allocation == NULL) { - return EFI_INVALID_PARAMETER; - } - - for (Link = mPageList.ForwardLink; Link != &mPageList; Link = Link->ForwardLink) { - Node = BASE_CR (Link, FREE_PAGE_NODE, Link); - if ((UINTN)Node->Allocation == (UINTN)Allocation) { - Node->Allocated = FALSE; - - // Update the size of the freed buffer - mFreedBufferSize += Node->Pages * EFI_PAGE_SIZE; - - // If the size of the non-allocated reaches the threshold we raise a warning. - // It might be an expected behaviour in some cases. - // We might device to free some of these buffers later on. - if (mFreedBufferSize > PcdGet64 (PcdArmFreeUncachedMemorySizeThreshold)) { - DEBUG ((EFI_D_WARN, "Warning: The list of non-allocated buffer has reach the threshold.\n")); - } - return EFI_SUCCESS; - } - } - - return EFI_NOT_FOUND; -} - -/** - * This function is automatically invoked when the driver exits - * It frees all the non-allocated memory buffer. - * This function is not responsible to free allocated buffer (eg: case of memory leak, - * runtime allocation). - */ -EFI_STATUS -EFIAPI -UncachedMemoryAllocationLibConstructor ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - return gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&mCpu); -} - -EFI_STATUS -EFIAPI -UncachedMemoryAllocationLibDestructor ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - LIST_ENTRY *Link; - FREE_PAGE_NODE *OldNode; - - // Test if the list is empty - Link = mPageList.ForwardLink; - if (Link == &mPageList) { - return EFI_SUCCESS; - } - - // Free all the pages and nodes - do { - OldNode = BASE_CR (Link, FREE_PAGE_NODE, Link); - // Point to the next entry - Link = Link->ForwardLink; - - // We only free the non-allocated buffer - if (OldNode->Allocated == FALSE) { - gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)OldNode->Base, OldNode->Pages); - - gDS->SetMemorySpaceAttributes ((EFI_PHYSICAL_ADDRESS)(UINTN)OldNode->Base, - EFI_PAGES_TO_SIZE (OldNode->Pages), OldNode->Attributes); - - RemoveEntryList (&OldNode->Link); - FreePool (OldNode); - } - } while (Link != &mPageList); - - return EFI_SUCCESS; -} - -/** - Converts a cached or uncached address to a physical address suitable for use in SoC registers. - - @param VirtualAddress The pointer to convert. - - @return The physical address of the supplied virtual pointer. - -**/ -EFI_PHYSICAL_ADDRESS -ConvertToPhysicalAddress ( - IN VOID *VirtualAddress - ) -{ - return (EFI_PHYSICAL_ADDRESS)(UINTN)VirtualAddress; -} - - -VOID * -UncachedInternalAllocatePages ( - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN Pages - ) -{ - return UncachedInternalAllocateAlignedPages (MemoryType, Pages, EFI_PAGE_SIZE); -} - - -VOID * -EFIAPI -UncachedAllocatePages ( - IN UINTN Pages - ) -{ - return UncachedInternalAllocatePages (EfiBootServicesData, Pages); -} - -VOID * -EFIAPI -UncachedAllocateRuntimePages ( - IN UINTN Pages - ) -{ - return UncachedInternalAllocatePages (EfiRuntimeServicesData, Pages); -} - -VOID * -EFIAPI -UncachedAllocateReservedPages ( - IN UINTN Pages - ) -{ - return UncachedInternalAllocatePages (EfiReservedMemoryType, Pages); -} - - - -VOID -EFIAPI -UncachedFreePages ( - IN VOID *Buffer, - IN UINTN Pages - ) -{ - UncachedFreeAlignedPages (Buffer, Pages); - return; -} - - -VOID * -UncachedInternalAllocateAlignedPages ( - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN Pages, - IN UINTN Alignment - ) -{ - EFI_STATUS Status; - VOID *Allocation; - - if (Pages == 0) { - return NULL; - } - - Allocation = NULL; - Status = AllocatePagesFromList (MemoryType, Pages, Alignment, &Allocation); - if (EFI_ERROR (Status)) { - ASSERT_EFI_ERROR (Status); - return NULL; - } else { - return Allocation; - } -} - - -VOID -EFIAPI -UncachedFreeAlignedPages ( - IN VOID *Buffer, - IN UINTN Pages - ) -{ - FreePagesFromList (Buffer); -} - - -VOID * -UncachedInternalAllocateAlignedPool ( - IN EFI_MEMORY_TYPE PoolType, - IN UINTN AllocationSize, - IN UINTN Alignment - ) -{ - VOID *AlignedAddress; - - // - // Alignment must be a power of two or zero. - // - ASSERT ((Alignment & (Alignment - 1)) == 0); - - if (Alignment < EFI_PAGE_SIZE) { - Alignment = EFI_PAGE_SIZE; - } - - AlignedAddress = UncachedInternalAllocateAlignedPages (PoolType, EFI_SIZE_TO_PAGES (AllocationSize), Alignment); - if (AlignedAddress == NULL) { - return NULL; - } - - return (VOID *) AlignedAddress; -} - -VOID * -EFIAPI -UncachedAllocateAlignedPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedPool (EfiBootServicesData, AllocationSize, Alignment); -} - -VOID * -EFIAPI -UncachedAllocateAlignedRuntimePool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedPool (EfiRuntimeServicesData, AllocationSize, Alignment); -} - -VOID * -EFIAPI -UncachedAllocateAlignedReservedPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedPool (EfiReservedMemoryType, AllocationSize, Alignment); -} - -VOID * -UncachedInternalAllocateAlignedZeroPool ( - IN EFI_MEMORY_TYPE PoolType, - IN UINTN AllocationSize, - IN UINTN Alignment - ) -{ - VOID *Memory; - Memory = UncachedInternalAllocateAlignedPool (PoolType, AllocationSize, Alignment); - if (Memory != NULL) { - Memory = ZeroMem (Memory, AllocationSize); - } - return Memory; -} - -VOID * -EFIAPI -UncachedAllocateAlignedZeroPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedZeroPool (EfiBootServicesData, AllocationSize, Alignment); -} - -VOID * -EFIAPI -UncachedAllocateAlignedRuntimeZeroPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedZeroPool (EfiRuntimeServicesData, AllocationSize, Alignment); -} - -VOID * -EFIAPI -UncachedAllocateAlignedReservedZeroPool ( - IN UINTN AllocationSize, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedZeroPool (EfiReservedMemoryType, AllocationSize, Alignment); -} - -VOID * -UncachedInternalAllocateAlignedCopyPool ( - IN EFI_MEMORY_TYPE PoolType, - IN UINTN AllocationSize, - IN CONST VOID *Buffer, - IN UINTN Alignment - ) -{ - VOID *Memory; - - ASSERT (Buffer != NULL); - ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1)); - - Memory = UncachedInternalAllocateAlignedPool (PoolType, AllocationSize, Alignment); - if (Memory != NULL) { - Memory = CopyMem (Memory, Buffer, AllocationSize); - } - return Memory; -} - -VOID * -EFIAPI -UncachedAllocateAlignedCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedCopyPool (EfiBootServicesData, AllocationSize, Buffer, Alignment); -} - -VOID * -EFIAPI -UncachedAllocateAlignedRuntimeCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedCopyPool (EfiRuntimeServicesData, AllocationSize, Buffer, Alignment); -} - -VOID * -EFIAPI -UncachedAllocateAlignedReservedCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer, - IN UINTN Alignment - ) -{ - return UncachedInternalAllocateAlignedCopyPool (EfiReservedMemoryType, AllocationSize, Buffer, Alignment); -} - -VOID -EFIAPI -UncachedFreeAlignedPool ( - IN VOID *Allocation - ) -{ - UncachedFreePages (Allocation, 0); -} - -VOID * -UncachedInternalAllocatePool ( - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN AllocationSize - ) -{ - UINTN CacheLineLength = ArmCacheWritebackGranule (); - return UncachedInternalAllocateAlignedPool (MemoryType, AllocationSize, CacheLineLength); -} - -VOID * -EFIAPI -UncachedAllocatePool ( - IN UINTN AllocationSize - ) -{ - return UncachedInternalAllocatePool (EfiBootServicesData, AllocationSize); -} - -VOID * -EFIAPI -UncachedAllocateRuntimePool ( - IN UINTN AllocationSize - ) -{ - return UncachedInternalAllocatePool (EfiRuntimeServicesData, AllocationSize); -} - -VOID * -EFIAPI -UncachedAllocateReservedPool ( - IN UINTN AllocationSize - ) -{ - return UncachedInternalAllocatePool (EfiReservedMemoryType, AllocationSize); -} - -VOID * -UncachedInternalAllocateZeroPool ( - IN EFI_MEMORY_TYPE PoolType, - IN UINTN AllocationSize - ) -{ - VOID *Memory; - - Memory = UncachedInternalAllocatePool (PoolType, AllocationSize); - if (Memory != NULL) { - Memory = ZeroMem (Memory, AllocationSize); - } - return Memory; -} - -VOID * -EFIAPI -UncachedAllocateZeroPool ( - IN UINTN AllocationSize - ) -{ - return UncachedInternalAllocateZeroPool (EfiBootServicesData, AllocationSize); -} - -VOID * -EFIAPI -UncachedAllocateRuntimeZeroPool ( - IN UINTN AllocationSize - ) -{ - return UncachedInternalAllocateZeroPool (EfiRuntimeServicesData, AllocationSize); -} - -VOID * -EFIAPI -UncachedAllocateReservedZeroPool ( - IN UINTN AllocationSize - ) -{ - return UncachedInternalAllocateZeroPool (EfiReservedMemoryType, AllocationSize); -} - -VOID * -UncachedInternalAllocateCopyPool ( - IN EFI_MEMORY_TYPE PoolType, - IN UINTN AllocationSize, - IN CONST VOID *Buffer - ) -{ - VOID *Memory; - - ASSERT (Buffer != NULL); - ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1)); - - Memory = UncachedInternalAllocatePool (PoolType, AllocationSize); - if (Memory != NULL) { - Memory = CopyMem (Memory, Buffer, AllocationSize); - } - return Memory; -} - -VOID * -EFIAPI -UncachedAllocateCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer - ) -{ - return UncachedInternalAllocateCopyPool (EfiBootServicesData, AllocationSize, Buffer); -} - -VOID * -EFIAPI -UncachedAllocateRuntimeCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer - ) -{ - return UncachedInternalAllocateCopyPool (EfiRuntimeServicesData, AllocationSize, Buffer); -} - -VOID * -EFIAPI -UncachedAllocateReservedCopyPool ( - IN UINTN AllocationSize, - IN CONST VOID *Buffer - ) -{ - return UncachedInternalAllocateCopyPool (EfiReservedMemoryType, AllocationSize, Buffer); -} - -VOID -EFIAPI -UncachedFreePool ( - IN VOID *Buffer - ) -{ - UncachedFreeAlignedPool (Buffer); -} - -VOID -EFIAPI -UncachedSafeFreePool ( - IN VOID *Buffer - ) -{ - if (Buffer != NULL) { - UncachedFreePool (Buffer); - Buffer = NULL; - } -} - diff --git a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf b/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf deleted file mode 100644 index c637430c9020..000000000000 --- a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf +++ /dev/null @@ -1,50 +0,0 @@ -#/** @file -# -# UncachedMemoryAllocation lib that uses DXE Service to change cachability for -# a buffer. -# -# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
-# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# -#**/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = UncachedMemoryAllocationLib - FILE_GUID = DC101A1A-7525-429B-84AF-EEAA630E576C - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - LIBRARY_CLASS = UncachedMemoryAllocationLib - CONSTRUCTOR = UncachedMemoryAllocationLibConstructor - DESTRUCTOR = UncachedMemoryAllocationLibDestructor - -[Sources.common] - UncachedMemoryAllocationLib.c - -[Packages] - ArmPkg/ArmPkg.dec - MdePkg/MdePkg.dec - -[LibraryClasses] - BaseLib - ArmLib - MemoryAllocationLib - PcdLib - DxeServicesTableLib - CacheMaintenanceLib - -[Pcd] - gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold - -[Protocols] - gEfiCpuArchProtocolGuid - -[Depex] - gEfiCpuArchProtocolGuid