From patchwork Thu Feb 23 15:48:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 94385 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp271208qgi; Thu, 23 Feb 2017 07:48:20 -0800 (PST) X-Received: by 10.98.147.207 with SMTP id r76mr46920085pfk.111.1487864900643; Thu, 23 Feb 2017 07:48:20 -0800 (PST) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id o5si4633881pgh.222.2017.02.23.07.48.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Feb 2017 07:48:20 -0800 (PST) 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; 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 39EDE82174; Thu, 23 Feb 2017 07:48:20 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x22a.google.com (mail-wr0-x22a.google.com [IPv6:2a00:1450:400c:c0c::22a]) (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 9299082171 for ; Thu, 23 Feb 2017 07:48:18 -0800 (PST) Received: by mail-wr0-x22a.google.com with SMTP id 97so24302221wrb.0 for ; Thu, 23 Feb 2017 07:48:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1NAoivOoA8isWllRnWFZ+3tIkrsdm8mfOvsQ4EKG75U=; b=PlCUIF8KMYTVa87fBqrdp15B1EYKu5HhCQ1Jk567O2/Lsp+pQ8fbUrdYHZ75QNrltu qVCTor+fkSyyn51diLmwFBxpx3xsy5SZ4zflOopJVtzhF+izIV+uKiBXE7xGExjmqRPc 3h5e9apGFjxxBl40HvoeLA6nthqo5yYnPlRdk= 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=1NAoivOoA8isWllRnWFZ+3tIkrsdm8mfOvsQ4EKG75U=; b=RpEkBYuFWPr65SEO14uqNPEyvVYrO0ZYrjYevYDgXgZaLCYFIAwqpmgskMZ/08gcA3 HG6w72UP0vJYCx91OKUibnqClKXPmk11vHKWguqDuK0InmNn4p91PoDJEhy1KG0s82nB c47RM8snG1bkl+i0x7e4OmAWkpZANPEY/9LliZRcAvYmVUJ6ZwarKlPDyNENitg7ecp4 FESV42efGaRQpLITRu263Y8V3ktab6mJRmOcpwPHTIuLOEOlBAI0Pvvterd4GtVOOzpv 0B8pq5R+G1tkychvoTN8CX6vvS7McKhSJYP23AeGNoaHlmpYLEIyOrxKILye734e1gwf 0vYA== X-Gm-Message-State: AMke39nOGfrqUmEIRyt0lCjGVkCgnNeunTgHVS+x2W30xmMb8Ea/YKUQ7WsZnhN5e/KI5HXK X-Received: by 10.223.176.252 with SMTP id j57mr3781364wra.136.1487864896694; Thu, 23 Feb 2017 07:48:16 -0800 (PST) Received: from localhost.localdomain ([105.149.201.216]) by smtp.gmail.com with ESMTPSA id 73sm2349884wml.19.2017.02.23.07.48.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Feb 2017 07:48:15 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com Date: Thu, 23 Feb 2017 15:48:05 +0000 Message-Id: <1487864885-13485-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487864885-13485-1-git-send-email-ard.biesheuvel@linaro.org> References: <1487864885-13485-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 2/2] ArmPkg/CpuDxe: remove VirtualUncachedPages protocol and implementation X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ryan.harkin@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Virtual uncached pages are simply pages that are aliased using mismatched attributes, which is not allowed by the ARM architecture. So remove the protocol and its implementation. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/ArmPkg.dec | 3 - ArmPkg/Drivers/CpuDxe/CpuDxe.c | 1 - ArmPkg/Drivers/CpuDxe/CpuDxe.h | 3 - ArmPkg/Drivers/CpuDxe/CpuDxe.inf | 1 - ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c | 70 -------------------- ArmPkg/Include/Protocol/VirtualUncachedPages.h | 60 ----------------- 6 files changed, 138 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 8e9cf199becc..4fd7a5be5158 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -52,9 +52,6 @@ [Ppis] ## Include/Ppi/ArmMpCoreInfo.h gArmMpCoreInfoPpiGuid = { 0x6847cc74, 0xe9ec, 0x4f8f, {0xa2, 0x9d, 0xab, 0x44, 0xe7, 0x54, 0xa8, 0xfc} } -[Protocols.common] - gVirtualUncachedPagesProtocolGuid = { 0xAD651C7D, 0x3C22, 0x4DBF, { 0x92, 0xe8, 0x38, 0xa7, 0xcd, 0xae, 0x87, 0xb2 } } - [PcdsFeatureFlag.common] gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport|FALSE|BOOLEAN|0x00000001 diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.c b/ArmPkg/Drivers/CpuDxe/CpuDxe.c index 7d328d096b1e..5aa5b874144a 100644 --- a/ArmPkg/Drivers/CpuDxe/CpuDxe.c +++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.c @@ -253,7 +253,6 @@ CpuDxeInitialize ( Status = gBS->InstallMultipleProtocolInterfaces ( &mCpuHandle, &gEfiCpuArchProtocolGuid, &mCpu, - &gVirtualUncachedPagesProtocolGuid, &gVirtualUncachedPages, NULL ); diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.h b/ArmPkg/Drivers/CpuDxe/CpuDxe.h index 80c305d53dd1..a00fc3064362 100644 --- a/ArmPkg/Drivers/CpuDxe/CpuDxe.h +++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.h @@ -35,7 +35,6 @@ #include #include #include -#include #include @@ -169,6 +168,4 @@ SetGcdMemorySpaceAttributes ( IN UINT64 Attributes ); -extern VIRTUAL_UNCACHED_PAGES_PROTOCOL gVirtualUncachedPages; - #endif // __CPU_DXE_ARM_EXCEPTION_H__ diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf index b31c994f43e2..d068e06803ed 100644 --- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf +++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf @@ -61,7 +61,6 @@ [LibraryClasses] [Protocols] gEfiCpuArchProtocolGuid gEfiDebugSupportPeriodicCallbackProtocolGuid - gVirtualUncachedPagesProtocolGuid [Guids] gEfiDebugImageInfoTableGuid diff --git a/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c b/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c index 54d9b0163331..ebe593d1c325 100644 --- a/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c +++ b/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c @@ -211,73 +211,3 @@ CpuSetMemoryAttributes ( return EFI_SUCCESS; } } - -EFI_STATUS -EFIAPI -CpuConvertPagesToUncachedVirtualAddress ( - IN VIRTUAL_UNCACHED_PAGES_PROTOCOL *This, - IN EFI_PHYSICAL_ADDRESS Address, - IN UINTN Length, - IN EFI_PHYSICAL_ADDRESS VirtualMask, - OUT UINT64 *Attributes OPTIONAL - ) -{ - EFI_STATUS Status; - EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor; - - if (Attributes != NULL) { - Status = gDS->GetMemorySpaceDescriptor (Address, &GcdDescriptor); - if (!EFI_ERROR (Status)) { - *Attributes = GcdDescriptor.Attributes; - } - } - - // - // Make this address range page fault if accessed. If it is a DMA buffer than this would - // be the PCI address. Code should always use the CPU address, and we will or in VirtualMask - // to that address. - // - Status = SetMemoryAttributes (Address, Length, EFI_MEMORY_RO, 0); - if (!EFI_ERROR (Status)) { - Status = SetMemoryAttributes (Address | VirtualMask, Length, EFI_MEMORY_UC, VirtualMask); - } - - DEBUG ((DEBUG_INFO | DEBUG_LOAD, "CpuConvertPagesToUncachedVirtualAddress()\n Unmapped 0x%08lx Mapped 0x%08lx 0x%x bytes\n", Address, Address | VirtualMask, Length)); - - return Status; -} - - -EFI_STATUS -EFIAPI -CpuReconvertPages ( - IN VIRTUAL_UNCACHED_PAGES_PROTOCOL *This, - IN EFI_PHYSICAL_ADDRESS Address, - IN UINTN Length, - IN EFI_PHYSICAL_ADDRESS VirtualMask, - IN UINT64 Attributes - ) -{ - EFI_STATUS Status; - - DEBUG ((DEBUG_INFO | DEBUG_LOAD, "CpuReconvertPages(%lx, %x, %lx, %lx)\n", Address, Length, VirtualMask, Attributes)); - - // - // Unmap the aliased Address - // - Status = SetMemoryAttributes (Address | VirtualMask, Length, EFI_MEMORY_RO, 0); - if (!EFI_ERROR (Status)) { - // - // Restore atttributes - // - Status = SetMemoryAttributes (Address, Length, Attributes, 0); - } - - return Status; -} - - -VIRTUAL_UNCACHED_PAGES_PROTOCOL gVirtualUncachedPages = { - CpuConvertPagesToUncachedVirtualAddress, - CpuReconvertPages -}; diff --git a/ArmPkg/Include/Protocol/VirtualUncachedPages.h b/ArmPkg/Include/Protocol/VirtualUncachedPages.h deleted file mode 100644 index 0822184b8931..000000000000 --- a/ArmPkg/Include/Protocol/VirtualUncachedPages.h +++ /dev/null @@ -1,60 +0,0 @@ -/** @file - - 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. - -**/ - -#ifndef __VIRTUAL_UNCACHED_PAGES_ROTOCOL_H__ -#define __VIRTUAL_UNCACHED_PAGES_ROTOCOL_H__ - -// -// Protocol GUID -// -#define VIRTUAL_UNCACHED_PAGES_PROTOCOL_GUID { 0xAD651C7D, 0x3C22, 0x4DBF, { 0x92, 0xe8, 0x38, 0xa7, 0xcd, 0xae, 0x87, 0xb2 } } - - - -// -// Protocol interface structure -// -typedef struct _VIRTUAL_UNCACHED_PAGES_PROTOCOL VIRTUAL_UNCACHED_PAGES_PROTOCOL; - - -typedef -EFI_STATUS -(EFIAPI *CONVERT_PAGES_TO_UNCACHED_VIRTUAL_ADDRESS) ( - IN VIRTUAL_UNCACHED_PAGES_PROTOCOL *This, - IN EFI_PHYSICAL_ADDRESS Address, - IN UINTN Length, - IN EFI_PHYSICAL_ADDRESS VirtualMask, - OUT UINT64 *Attributes OPTIONAL - ); - -typedef -EFI_STATUS -(EFIAPI *FREE_CONVERTED_PAGES) ( - IN VIRTUAL_UNCACHED_PAGES_PROTOCOL *This, - IN EFI_PHYSICAL_ADDRESS Address, - IN UINTN Length, - IN EFI_PHYSICAL_ADDRESS VirtualMask, - IN UINT64 Attributes - ); - - - -struct _VIRTUAL_UNCACHED_PAGES_PROTOCOL { - CONVERT_PAGES_TO_UNCACHED_VIRTUAL_ADDRESS ConvertPages; - FREE_CONVERTED_PAGES RevertPages; -}; - -extern EFI_GUID gVirtualUncachedPagesProtocolGuid; - -#endif