From nobody Tue Apr 30 07:08:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 153061175759889.36528739895243; Tue, 3 Jul 2018 02:55:57 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id DCBB3210DF4F8; Tue, 3 Jul 2018 02:55:56 -0700 (PDT) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 80CE3210C7AF2 for ; Tue, 3 Jul 2018 02:55:55 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5D96F80D; Tue, 3 Jul 2018 02:55:55 -0700 (PDT) Received: from usa.arm.com (a074948-lin.blr.arm.com [10.162.4.138]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 840043F5A0; Tue, 3 Jul 2018 02:55:53 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Tue, 3 Jul 2018 15:25:10 +0530 Message-Id: <1530611715-9819-2-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> References: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 1/6] ArmPkg: Add PCDs needed for MM communication driver. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch defines PCDs to describe the base address and size of communication buffer between normal world (uefi) and standalone MM environment in the secure world. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Achin Gupta Signed-off-by: Supreeth Venkatesh Cc: Leif Lindholm Cc: Ard Biesheuvel --- ArmPkg/ArmPkg.dec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 3aa229f..ce108f2 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -239,6 +239,9 @@ gArmTokenSpaceGuid.PcdSystemMemoryBase|0|UINT64|0x00000029 gArmTokenSpaceGuid.PcdSystemMemorySize|0|UINT64|0x0000002A =20 + gArmTokenSpaceGuid.PcdMmBufferBase|0|UINT64|0x00000045 + gArmTokenSpaceGuid.PcdMmBufferSize|0|UINT64|0x00000046 + [PcdsFixedAtBuild.common, PcdsDynamic.common] # # ARM Architectural Timer --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue Apr 30 07:08:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1530611762848124.54947246747201; Tue, 3 Jul 2018 02:56:02 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1A74B210DF77D; Tue, 3 Jul 2018 02:56:02 -0700 (PDT) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 3E88E210DF5E8 for ; Tue, 3 Jul 2018 02:56:00 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EAE2480D; Tue, 3 Jul 2018 02:55:59 -0700 (PDT) Received: from usa.arm.com (a074948-lin.blr.arm.com [10.162.4.138]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DDB4F3F5A0; Tue, 3 Jul 2018 02:55:57 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Tue, 3 Jul 2018 15:25:11 +0530 Message-Id: <1530611715-9819-3-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> References: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 2/6] ArmPkg/Drivers: Add EFI_MM_COMMUNICATION_PROTOCOL DXE driver. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" PI v1.5 Specification Volume 4 defines Management Mode Core Interface and defines EFI_MM_COMMUNICATION_PROTOCOL. This protocol provides a means of communicating between drivers outside of MM and MMI handlers inside of MM. This patch implements the EFI_MM_COMMUNICATION_PROTOCOL DXE runtime driver for AARCH64 platforms. It uses SMCs allocated from the standard SMC range defined in DEN0060A_ARM_MM_Interface_Specification.pdf to communicate with the standalone MM environment in the secure world. This patch also adds the MM Communication driver (.inf) file to define entry point for this driver and other compile related information the driver needs. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Achin Gupta Signed-off-by: Supreeth Venkatesh Cc: Leif Lindholm Cc: Ard Biesheuvel --- .../Drivers/MmCommunicationDxe/MmCommunication.c | 408 +++++++++++++++++= ++++ .../Drivers/MmCommunicationDxe/MmCommunication.inf | 50 +++ 2 files changed, 458 insertions(+) create mode 100644 ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c create mode 100644 ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf diff --git a/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c b/ArmPkg/D= rivers/MmCommunicationDxe/MmCommunication.c new file mode 100644 index 0000000..8ba1790 --- /dev/null +++ b/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c @@ -0,0 +1,408 @@ +/** @file + + Copyright (c) 2016-2018, ARM Limited. All rights reserved. + + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e 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 IMP= LIED. + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#define MM_MAJOR_VER_MASK 0xFFFF0000 +#define MM_MINOR_VER_MASK 0x0000FFFF +#define MM_MAJOR_VER_SHIFT 16 + +const UINT32 MM_MAJOR_VER =3D 1; +const UINT32 MM_MINOR_VER =3D 0; + +// +// Address, Length of the pre-allocated buffer for communication with the = secure +// world. +// +STATIC ARM_MEMORY_REGION_DESCRIPTOR mNsCommBuffMemRegion; + +// Notification event when virtual address map is set. +STATIC EFI_EVENT mSetVirtualAddressMapEvent; + +// +// Handle to install the MM Communication Protocol +// +STATIC EFI_HANDLE mMmCommunicateHandle; + +/** + Communicates with a registered handler. + + This function provides an interface to send and receive messages to the + Standalone MM environment on behalf of UEFI services. This function is = part + of the MM Communication Protocol that may be called in physical mode pri= or to + SetVirtualAddressMap() and in virtual mode after SetVirtualAddressMap(). + + @param[in] This The EFI_MM_COMMUNICATION_PROTOCOL + instance. + @param[in, out] CommBuffer A pointer to the buffer to convey + into MMRAM. + @param[in, out] CommSize The size of the data buffer being + passed in. This is optional. + + @retval EFI_SUCCESS The message was successfully posted. + @retval EFI_INVALID_PARAMETER The CommBuffer was NULL. + @retval EFI_BAD_BUFFER_SIZE The buffer size is incorrect for the= MM + implementation. If this error is + returned, the MessageLength field in + the CommBuffer header or the integer + pointed by CommSize are updated to r= eflect + the maximum payload size the + implementation can accommodate. + @retval EFI_ACCESS_DENIED The CommunicateBuffer parameter + or CommSize parameter, if not omitte= d, + are in address range that cannot be + accessed by the MM environment +**/ +STATIC +EFI_STATUS +EFIAPI +MmCommunicationCommunicate ( + IN CONST EFI_MM_COMMUNICATION_PROTOCOL *This, + IN OUT VOID *CommBuffer, + IN OUT UINTN *CommSize OPTIONAL + ) +{ + EFI_MM_COMMUNICATE_HEADER *CommunicateHeader; + ARM_SMC_ARGS CommunicateSmcArgs; + EFI_STATUS Status; + UINTN BufferSize; + + Status =3D EFI_ACCESS_DENIED; + BufferSize =3D 0; + + ZeroMem (&CommunicateSmcArgs, sizeof (ARM_SMC_ARGS)); + + // + // Check parameters + // + if (CommBuffer =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + CommunicateHeader =3D CommBuffer; + // CommBuffer is a mandatory parameter. Hence, Rely on + // MessageLength + Header to ascertain the + // total size of the communication payload rather than + // rely on optional CommSize parameter + BufferSize =3D CommunicateHeader->MessageLength + + sizeof (CommunicateHeader->HeaderGuid) + + sizeof (CommunicateHeader->MessageLength); + + // If the length of the CommBuffer is 0 then return the expected length. + if (CommSize) { + // This case can be used by the consumer of this driver to find out the + // max size that can be used for allocating CommBuffer. + if ((*CommSize =3D=3D 0) || + (*CommSize > mNsCommBuffMemRegion.Length)) { + *CommSize =3D mNsCommBuffMemRegion.Length; + return EFI_BAD_BUFFER_SIZE; + } + // + // CommSize must match MessageLength + sizeof (EFI_MM_COMMUNICATE_HEAD= ER); + // + if (*CommSize !=3D BufferSize) { + return EFI_INVALID_PARAMETER; + } + } + + // + // If the buffer size is 0 or greater than what can be tolerated by the = MM + // environment then return the expected size. + // + if ((BufferSize =3D=3D 0) || + (BufferSize > mNsCommBuffMemRegion.Length)) { + CommunicateHeader->MessageLength =3D mNsCommBuffMemRegion.Length - + sizeof (CommunicateHeader->HeaderGu= id) - + sizeof (CommunicateHeader->MessageL= ength); + return EFI_BAD_BUFFER_SIZE; + } + + // SMC Function ID + CommunicateSmcArgs.Arg0 =3D ARM_SMC_ID_MM_COMMUNICATE_AARCH64; + + // Reserved for Future. Must be Zero. + CommunicateSmcArgs.Arg1 =3D 0; + + // Copy Communication Payload + CopyMem ((VOID *)mNsCommBuffMemRegion.VirtualBase, CommBuffer, BufferSiz= e); + + // For the SMC64 version, this parameter is a 64-bit Physical Address (P= A) + // or Intermediate Physical Address (IPA). + // For the SMC32 version, this parameter is a 32-bit PA or IPA. + CommunicateSmcArgs.Arg2 =3D (UINTN)mNsCommBuffMemRegion.PhysicalBase; + + // comm_size_address is a PA or an IPA that holds the size of the + // communication buffer being passed in. This parameter is optional + // and can be omitted by passing a zero. + // ARM does not recommend using it since this might require the + // implementation to create a separate memory mapping for the parameter. + // ARM recommends storing the buffer size in the buffer itself. + CommunicateSmcArgs.Arg3 =3D 0; + + // Call the Standalone MM environment. + ArmCallSmc (&CommunicateSmcArgs); + + switch (CommunicateSmcArgs.Arg0) { + case ARM_SMC_MM_RET_SUCCESS: + ZeroMem (CommBuffer, BufferSize); + // On exit, the size of data being returned is inferred from + // MessageLength + Header. + CommunicateHeader =3D (EFI_MM_COMMUNICATE_HEADER *)mNsCommBuffMemRegio= n.VirtualBase; + BufferSize =3D CommunicateHeader->MessageLength + + sizeof (CommunicateHeader->HeaderGuid) + + sizeof (CommunicateHeader->MessageLength); + + // Note: Very important to ensure that the consumer of this driver + // has allocated CommBuffer sufficiently so that the return data + // can be copied. Otherwise, this will lead to buffer overflow. + // Assumption: CommBuffer =3D malloc (mNsCommBuffMemRegion.Length) + // This guidance should be in the PI specification. TODO: ECR. + CopyMem (CommBuffer, + (const VOID *)mNsCommBuffMemRegion.VirtualBase, + BufferSize); + Status =3D EFI_SUCCESS; + break; + + case ARM_SMC_MM_RET_INVALID_PARAMS: + Status =3D EFI_INVALID_PARAMETER; + break; + + case ARM_SMC_MM_RET_DENIED: + Status =3D EFI_ACCESS_DENIED; + break; + + case ARM_SMC_MM_RET_NO_MEMORY: + // Unexpected error since the CommSize was checked for zero length + // prior to issuing the SMC + default: + Status =3D EFI_ACCESS_DENIED; + ASSERT (0); + } + + return Status; +} + +// +// MM Communication Protocol instance +// +EFI_MM_COMMUNICATION_PROTOCOL mMmCommunication =3D { + MmCommunicationCommunicate +}; + +/** + Notification callback on SetVirtualAddressMap event. + + This function notifies the MM communication protocol interface on + SetVirtualAddressMap event and converts pointers used in this driver + from physical to virtual address. + + @param Event SetVirtualAddressMap event. + @param Context A context when the SetVirtualAddressMap triggered. + + @retval EFI_SUCCESS The function executed successfully. + @retval Other Some error occurred when executing this function. + +**/ +STATIC +VOID +EFIAPI +NotifySetVirtualAddressMap ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + EFI_STATUS Status; + + Status =3D gRT->ConvertPointer (EFI_OPTIONAL_PTR, + (VOID **)&mNsCommBuffMemRegion.VirtualBase + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "NotifySetVirtualAddressMap():" + " Unable to convert MM runtime pointer. Status:0x%r\n", Status= )); + } + +} + +STATIC +EFI_STATUS +GetMmVersion () +{ + EFI_STATUS Status; + UINT16 MmMajorVersion; + UINT16 MmMinorVersion; + UINT32 MmVersion; + ARM_SMC_ARGS MmVersionArgs; + + MmVersionArgs.Arg0 =3D ARM_SMC_ID_MM_VERSION_AARCH32; + + ArmCallSmc (&MmVersionArgs); + + MmVersion =3D MmVersionArgs.Arg0; + + MmMajorVersion =3D ((MmVersion & MM_MAJOR_VER_MASK) >> MM_MAJOR_VER_SHIF= T); + MmMinorVersion =3D ((MmVersion & MM_MINOR_VER_MASK) >> 0); + + // Different major revision values indicate possibly incompatible functi= ons. + // For two revisions, A and B, for which the major revision values are + // identical, if the minor revision value of revision B is greater than + // the minor revision value of revision A, then every function in + // revision A must work in a compatible way with revision B. + // However, it is possible for revision B to have a higher + // function count than revision A. + if ((MmMajorVersion =3D=3D MM_MAJOR_VER) && + (MmMinorVersion >=3D MM_MINOR_VER)) + { + DEBUG ((DEBUG_INFO, "MM Version: Major=3D0x%x, Minor=3D0x%x\n", + MmMajorVersion, MmMinorVersion)); + Status =3D EFI_SUCCESS; + } + else + { + DEBUG ((DEBUG_ERROR, "Incompatible MM Versions.\n Current Version: Maj= or=3D0x%x, Minor=3D0x%x.\n Expected: Major=3D0x%x, Minor>=3D0x%x.\n", + MmMajorVersion, MmMinorVersion, MM_MAJOR_VER, MM_MINOR_VER)); + Status =3D EFI_UNSUPPORTED; + } + + return Status; +} + +/** + The Entry Point for MM Communication + + This function installs the MM communication protocol interface and finds= out + what type of buffer management will be required prior to invoking the + communication SMC. + + @param ImageHandle The firmware allocated handle for the EFI image. + @param SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The entry point is executed successfully. + @retval Other Some error occurred when executing this entry poi= nt. + +**/ +EFI_STATUS +EFIAPI +MmCommunicationInitialize ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + // Get Secure Partition Manager Version Information + Status =3D GetMmVersion (); + if (EFI_ERROR(Status)) { + goto ReturnErrorStatus; + } + + mNsCommBuffMemRegion.PhysicalBase =3D PcdGet64 (PcdMmBufferBase); + // During boot , Virtual and Physical are same + mNsCommBuffMemRegion.VirtualBase =3D mNsCommBuffMemRegion.PhysicalBase; + mNsCommBuffMemRegion.Length =3D PcdGet64 (PcdMmBufferSize); + + if (mNsCommBuffMemRegion.PhysicalBase =3D=3D 0) { + DEBUG ((DEBUG_ERROR, "MmCommunicateInitialize: " + "Invalid MM Buffer Base Address.\n")); + goto ReturnErrorStatus; + } + + if (mNsCommBuffMemRegion.Length =3D=3D 0) { + DEBUG ((DEBUG_ERROR, "MmCommunicateInitialize: " + "Maximum Buffer Size is zero.\n")); + goto ReturnErrorStatus; + } + + Status =3D gDS->AddMemorySpace (EfiGcdMemoryTypeSystemMemory, + mNsCommBuffMemRegion.PhysicalBase, + mNsCommBuffMemRegion.Length, + EFI_MEMORY_WB | + EFI_MEMORY_XP | + EFI_MEMORY_RUNTIME); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "MmCommunicateInitialize: " + "Failed to add MM-NS Buffer Memory Space\n")); + goto ReturnErrorStatus; + } + + Status =3D gDS->SetMemorySpaceAttributes (mNsCommBuffMemRegion.PhysicalB= ase, + mNsCommBuffMemRegion.Length, + EFI_MEMORY_WB | EFI_MEMORY_XP); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "MmCommunicateInitialize: " + "Failed to set MM-NS Buffer Memory attributes\n")); + goto CleanAddedMemorySpace; + } + + Status =3D gBS->AllocatePages (AllocateAddress, + EfiRuntimeServicesData, + EFI_SIZE_TO_PAGES (mNsCommBuffMemRegion.Len= gth), + &mNsCommBuffMemRegion.PhysicalBase); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "MmCommunicateInitialize: " + "Failed to allocate MM-NS Buffer Memory Space\n")); + goto CleanAddedMemorySpace; + } + + // Install the communication protocol + Status =3D gBS->InstallProtocolInterface (&mMmCommunicateHandle, + &gEfiMmCommunicationProtocolGuid, + EFI_NATIVE_INTERFACE, + &mMmCommunication); + if (EFI_ERROR(Status)) { + DEBUG ((DEBUG_ERROR, "MmCommunicationInitialize: " + "Failed to install MM communication protocol\n")); + goto CleanAllocatedPages; + } + + // Register notification callback when virtual address is associated + // with the physical address. + // Create a Set Virtual Address Map event. + // + Status =3D gBS->CreateEvent (EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, // Type + TPL_NOTIFY, // Notify= Tpl + NotifySetVirtualAddressMap, // Notify= Function + NULL, // Notify= Context + &mSetVirtualAddressMapEvent // Event + ); + if (Status =3D=3D EFI_SUCCESS) { + return Status; + } + + gBS->UninstallProtocolInterface(mMmCommunicateHandle, + &gEfiMmCommunicationProtocolGuid, + &mMmCommunication); + +CleanAllocatedPages: + gBS->FreePages (mNsCommBuffMemRegion.PhysicalBase, + EFI_SIZE_TO_PAGES (mNsCommBuffMemRegion.Length)); + +CleanAddedMemorySpace: + gDS->RemoveMemorySpace (mNsCommBuffMemRegion.PhysicalBase, + mNsCommBuffMemRegion.Length); + +ReturnErrorStatus: + return EFI_INVALID_PARAMETER; +} diff --git a/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf b/ArmPkg= /Drivers/MmCommunicationDxe/MmCommunication.inf new file mode 100644 index 0000000..7797e3d --- /dev/null +++ b/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf @@ -0,0 +1,50 @@ +#/** @file +# +# DXE MM Communicate driver +# +# Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the B= SD 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 IM= PLIED. +# +#**/ + +[Defines] + INF_VERSION =3D 0x0001001A + BASE_NAME =3D ArmMmCommunication + FILE_GUID =3D 09EE81D3-F15E-43F4-85B4-CB9873DA5D6B + MODULE_TYPE =3D DXE_RUNTIME_DRIVER + VERSION_STRING =3D 1.0 + + ENTRY_POINT =3D MmCommunicationInitialize + +[Sources.AARCH64] + MmCommunication.c + +[Packages] + ArmPkg/ArmPkg.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + ArmLib + ArmSmcLib + BaseMemoryLib + DebugLib + DxeServicesTableLib + HobLib + UefiDriverEntryPoint + +[Protocols] + gEfiMmCommunicationProtocolGuid ## PRODUCES + +[Pcd.common] + gArmTokenSpaceGuid.PcdMmBufferBase + gArmTokenSpaceGuid.PcdMmBufferSize + +[Depex] + gEfiCpuArchProtocolGuid --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue Apr 30 07:08:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1530611766041363.3007481908412; Tue, 3 Jul 2018 02:56:06 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4710A210E38A5; Tue, 3 Jul 2018 02:56:05 -0700 (PDT) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 05DB2210E2A7B for ; Tue, 3 Jul 2018 02:56:03 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CCBC480D; Tue, 3 Jul 2018 02:56:03 -0700 (PDT) Received: from usa.arm.com (a074948-lin.blr.arm.com [10.162.4.138]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0985F3F5A0; Tue, 3 Jul 2018 02:56:01 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Tue, 3 Jul 2018 15:25:12 +0530 Message-Id: <1530611715-9819-4-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> References: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 3/6] ArmPkg/Include: Add MM interface SVC return codes. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch adds the Management Mode(MM) - Secure Partition Manager(SPM) SVC return codes. Also, It corrects SVC ID for retrieving SPM version information. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Achin Gupta Signed-off-by: Supreeth Venkatesh Cc: Leif Lindholm Cc: Ard Biesheuvel --- ArmPkg/Include/IndustryStandard/ArmMmSvc.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h b/ArmPkg/Include/In= dustryStandard/ArmMmSvc.h index 4c7b6c3..a64b9ec 100644 --- a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h +++ b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h @@ -20,7 +20,7 @@ * delegated events and request the Secure partition manager to perform * privileged operations on its behalf. */ -#define ARM_SVC_ID_SPM_VERSION_AARCH64 0xC4000060 +#define ARM_SVC_ID_SPM_VERSION_AARCH32 0x84000060 #define ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64 0xC4000061 #define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64 0xC4000064 #define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64 0xC4000065 @@ -40,4 +40,11 @@ ((((c_perm) & SET_MEM_ATTR_CODE_PERM_MASK) << SET_MEM_ATTR_CODE_PERM_S= HIFT) | \ (( (d_perm) & SET_MEM_ATTR_DATA_PERM_MASK) << SET_MEM_ATTR_DATA_PERM_S= HIFT)) =20 +/* MM SVC Return error codes */ +#define ARM_SVC_SPM_RET_SUCCESS 0 +#define ARM_SVC_SPM_RET_NOT_SUPPORTED -1 +#define ARM_SVC_SPM_RET_INVALID_PARAMS -2 +#define ARM_SVC_SPM_RET_DENIED -3 +#define ARM_SVC_SPM_RET_NO_MEMORY -5 + #endif --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue Apr 30 07:08:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1530611770180473.4443702672529; Tue, 3 Jul 2018 02:56:10 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 775F5210E2DA2; Tue, 3 Jul 2018 02:56:09 -0700 (PDT) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id DA6AE210E2A55 for ; Tue, 3 Jul 2018 02:56:08 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B9EF680D; Tue, 3 Jul 2018 02:56:08 -0700 (PDT) Received: from usa.arm.com (a074948-lin.blr.arm.com [10.162.4.138]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EA3773F5A0; Tue, 3 Jul 2018 02:56:06 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Tue, 3 Jul 2018 15:25:13 +0530 Message-Id: <1530611715-9819-5-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> References: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 4/6] ArmPkg/ArmMmuLib: Add MMU Library suitable for use in S-EL0. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The Standalone MM environment runs in S-EL0 in AArch64 on ARM Standard Platforms. Privileged firmware e.g. ARM Trusted Firmware sets up its architectural context including the initial translation tables for the S-EL1/EL0 translation regime. The MM environment will still request ARM TF to change the memory attributes of memory regions during initialization. The Standalone MM image is a FV that encapsulates the MM foundation and drivers. These are PE-COFF images with data and text segments. To initialise the MM environment, Arm Trusted Firmware has to create translation tables with sane default attributes for the memory occupied by the FV. This library sends SVCs to ARM Trusted Firmware to request memory permissions change for data and text segments. This patch adds a simple MMU library suitable for execution in S-EL0 and requesting memory permissions change operations from Arm Trusted Firmware. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Achin Gupta Signed-off-by: Supreeth Venkatesh Cc: Leif Lindholm Cc: Ard Biesheuvel --- .../ArmMmuLib/AArch64/ArmMmuStandaloneMmCoreLib.c | 195 +++++++++++++++++= ++++ 1 file changed, 195 insertions(+) create mode 100644 ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuStandaloneMmCore= Lib.c diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuStandaloneMmCoreLib.c b= /ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuStandaloneMmCoreLib.c new file mode 100644 index 0000000..0f5e68d --- /dev/null +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuStandaloneMmCoreLib.c @@ -0,0 +1,195 @@ +/** @file +* File managing the MMU for ARMv8 architecture in S-EL0 +* +* Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. +* +* This program and the accompanying materials +* are licensed and made available under the terms and conditions of the B= SD 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 IM= PLIED. +* +**/ + +#include +#include +#include + +#include +#include +#include +#include +#include + +EFI_STATUS +GetMemoryPermissions ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + OUT UINT32 *MemoryAttributes + ) +{ + ARM_SVC_ARGS GetMemoryPermissionsSvcArgs =3D {0}; + + GetMemoryPermissionsSvcArgs.Arg0 =3D ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AA= RCH64; + GetMemoryPermissionsSvcArgs.Arg1 =3D BaseAddress; + GetMemoryPermissionsSvcArgs.Arg2 =3D 0; + GetMemoryPermissionsSvcArgs.Arg3 =3D 0; + + ArmCallSvc (&GetMemoryPermissionsSvcArgs); + if (GetMemoryPermissionsSvcArgs.Arg0 =3D=3D ARM_SVC_SPM_RET_INVALID_PARA= MS) { + *MemoryAttributes =3D 0; + return EFI_INVALID_PARAMETER; + } + + *MemoryAttributes =3D GetMemoryPermissionsSvcArgs.Arg0; + return EFI_SUCCESS; +} + +EFI_STATUS +RequestMemoryPermissionChange ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length, + IN UINTN Permissions + ) +{ + EFI_STATUS Status; + ARM_SVC_ARGS ChangeMemoryPermissionsSvcArgs =3D {0}; + + ChangeMemoryPermissionsSvcArgs.Arg0 =3D ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES= _AARCH64; + ChangeMemoryPermissionsSvcArgs.Arg1 =3D BaseAddress; + ChangeMemoryPermissionsSvcArgs.Arg2 =3D (Length >=3D EFI_PAGE_SIZE) ? \ + Length >> EFI_PAGE_SHIFT : 1; + ChangeMemoryPermissionsSvcArgs.Arg3 =3D Permissions; + + ArmCallSvc (&ChangeMemoryPermissionsSvcArgs); + + Status =3D ChangeMemoryPermissionsSvcArgs.Arg0; + + switch (Status) { + case ARM_SVC_SPM_RET_SUCCESS: + Status =3D EFI_SUCCESS; + break; + + case ARM_SVC_SPM_RET_NOT_SUPPORTED: + Status =3D EFI_UNSUPPORTED; + break; + + case ARM_SVC_SPM_RET_INVALID_PARAMS: + Status =3D EFI_INVALID_PARAMETER; + break; + + case ARM_SVC_SPM_RET_DENIED: + Status =3D EFI_ACCESS_DENIED; + break; + + case ARM_SVC_SPM_RET_NO_MEMORY: + Status =3D EFI_BAD_BUFFER_SIZE; + break; + + default: + Status =3D EFI_ACCESS_DENIED; + ASSERT (0); + } + + return Status; +} + +EFI_STATUS +ArmSetMemoryRegionNoExec ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + EFI_STATUS Status; + UINT32 MemoryAttributes; + + Status =3D GetMemoryPermissions (BaseAddress, &MemoryAttributes); + if (Status !=3D EFI_INVALID_PARAMETER) { + return RequestMemoryPermissionChange (BaseAddress, + Length, + MemoryAttributes | + (SET_MEM_ATTR_CODE_PERM_XN << SE= T_MEM_ATTR_CODE_PERM_SHIFT)); + } + return EFI_INVALID_PARAMETER; +} + +EFI_STATUS +ArmClearMemoryRegionNoExec ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + EFI_STATUS Status; + UINT32 MemoryAttributes; + + Status =3D GetMemoryPermissions (BaseAddress, &MemoryAttributes); + if (Status !=3D EFI_INVALID_PARAMETER) { + return RequestMemoryPermissionChange (BaseAddress, + Length, + MemoryAttributes & + ~(SET_MEM_ATTR_CODE_PERM_XN << S= ET_MEM_ATTR_CODE_PERM_SHIFT)); + } + return EFI_INVALID_PARAMETER; +} + +EFI_STATUS +ArmSetMemoryRegionReadOnly ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + EFI_STATUS Status; + UINT32 MemoryAttributes; + + Status =3D GetMemoryPermissions (BaseAddress, &MemoryAttributes); + if (Status !=3D EFI_INVALID_PARAMETER) { + return RequestMemoryPermissionChange (BaseAddress, + Length, + MemoryAttributes | + (SET_MEM_ATTR_DATA_PERM_RO << SE= T_MEM_ATTR_DATA_PERM_SHIFT)); + } + return EFI_INVALID_PARAMETER; +} + +EFI_STATUS +ArmClearMemoryRegionReadOnly ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + EFI_STATUS Status; + UINT32 MemoryAttributes; + + Status =3D GetMemoryPermissions (BaseAddress, &MemoryAttributes); + if (Status !=3D EFI_INVALID_PARAMETER) { + return RequestMemoryPermissionChange (BaseAddress, + Length, + SET_MEM_ATTR_MAKE_PERM_REQUEST + ( \ + SET_MEM_ATTR_DATA_PERM_RW, \ + MemoryAttributes)); + } + return EFI_INVALID_PARAMETER; +} + +EFI_STATUS +EFIAPI +ArmConfigureMmu ( + IN ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable, + OUT VOID **TranslationTableBase OPTIONAL, + OUT UINTN *TranslationTableSize OPTIONAL + ) +{ + return EFI_UNSUPPORTED; +} + +EFI_STATUS +EFIAPI +ArmMmuStandaloneMmCoreLibConstructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_MM_SYSTEM_TABLE *MmSystemTable + ) +{ + return EFI_SUCCESS; +} --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue Apr 30 07:08:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1530611774372955.7246988761882; Tue, 3 Jul 2018 02:56:14 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A4664210E4363; Tue, 3 Jul 2018 02:56:13 -0700 (PDT) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 89D70210C122D for ; Tue, 3 Jul 2018 02:56:12 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6941080D; Tue, 3 Jul 2018 02:56:12 -0700 (PDT) Received: from usa.arm.com (a074948-lin.blr.arm.com [10.162.4.138]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 986763F5A0; Tue, 3 Jul 2018 02:56:10 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Tue, 3 Jul 2018 15:25:14 +0530 Message-Id: <1530611715-9819-6-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> References: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 5/6] ArmPkg/ArmMmuLib: Add MMU library inf file suitable for use in S-EL0. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch adds the definitions, sources, packages and library classes needed to compile and link MMU Library suitable for use in S-EL0. Currently, this is used only during the Standalone MM Core initialization and hence defined as MM_CORE_STANDALONE Module. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Achin Gupta Signed-off-by: Supreeth Venkatesh Cc: Leif Lindholm Cc: Ard Biesheuvel --- .../ArmMmuLib/ArmMmuStandaloneMmCoreLib.inf | 37 ++++++++++++++++++= ++++ 1 file changed, 37 insertions(+) create mode 100644 ArmPkg/Library/ArmMmuLib/ArmMmuStandaloneMmCoreLib.inf diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuStandaloneMmCoreLib.inf b/ArmPk= g/Library/ArmMmuLib/ArmMmuStandaloneMmCoreLib.inf new file mode 100644 index 0000000..9f5593d --- /dev/null +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuStandaloneMmCoreLib.inf @@ -0,0 +1,37 @@ +#/** @file +# +# Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the B= SD License +# which accompanies this distribution. The full text of the license may b= e 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 IM= PLIED. +# +# +#**/ + +[Defines] + INF_VERSION =3D 0x0001001A + BASE_NAME =3D ArmMmuStandaloneMmCoreLib + FILE_GUID =3D da8f0232-fb14-42f0-922c-63104d2c70bd + MODULE_TYPE =3D MM_CORE_STANDALONE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D ArmMmuStandaloneMmCoreLib|MM_CORE_STA= NDALONE + PI_SPECIFICATION_VERSION =3D 0x00010032 + CONSTRUCTOR =3D ArmMmuStandaloneMmCoreLibConstructor + +[Sources.AARCH64] + AArch64/ArmMmuStandaloneMmCoreLib.c + +[Packages] + ArmPkg/ArmPkg.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + ArmLib + CacheMaintenanceLib + MemoryAllocationLib + + --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue Apr 30 07:08:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1530611778609330.456982310625; Tue, 3 Jul 2018 02:56:18 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D3006210ED0F8; Tue, 3 Jul 2018 02:56:17 -0700 (PDT) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id E32FE210C122D for ; Tue, 3 Jul 2018 02:56:16 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C270380D; Tue, 3 Jul 2018 02:56:16 -0700 (PDT) Received: from usa.arm.com (a074948-lin.blr.arm.com [10.162.4.138]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id F19AB3F5A0; Tue, 3 Jul 2018 02:56:14 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Tue, 3 Jul 2018 15:25:15 +0530 Message-Id: <1530611715-9819-7-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> References: <1530611715-9819-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 6/6] ArmPkg: Extra action to update permissions for S-ELO MM Image. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The Standalone MM drivers runs in S-EL0 in AArch64 on ARM Standard Platforms and is deployed during SEC phase. The memory allocated to the Standalone MM drivers should be marked as RO+X. During PE/COFF Image section parsing, this patch implements extra action "UpdatePeCoffPermissions" to request the privileged firmware in EL3 to update the permissions. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Achin Gupta Signed-off-by: Supreeth Venkatesh Cc: Leif Lindholm Cc: Ard Biesheuvel --- .../DebugPeCoffExtraActionLib.c | 185 +++++++++++++++++= ++-- .../DebugPeCoffExtraActionLib.inf | 7 + 2 files changed, 181 insertions(+), 11 deletions(-) diff --git a/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActio= nLib.c b/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib= .c index f298e58..c87aaf0 100644 --- a/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c +++ b/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c @@ -15,14 +15,165 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EIT= HER EXPRESS OR IMPLIED. **/ =20 #include -#include =20 +#include #include -#include #include +#include +#include +#include #include #include =20 +typedef RETURN_STATUS (*REGION_PERMISSION_UPDATE_FUNC) ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ); + +STATIC +RETURN_STATUS +UpdatePeCoffPermissions ( + IN CONST PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext, + IN REGION_PERMISSION_UPDATE_FUNC NoExecUpdater, + IN REGION_PERMISSION_UPDATE_FUNC ReadOnlyUpdater + ) +{ + RETURN_STATUS Status; + EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr; + EFI_IMAGE_OPTIONAL_HEADER_UNION HdrData; + UINTN Size; + UINTN ReadSize; + UINT32 SectionHeaderOffset; + UINTN NumberOfSections; + UINTN Index; + EFI_IMAGE_SECTION_HEADER SectionHeader; + PE_COFF_LOADER_IMAGE_CONTEXT TmpContext; + EFI_PHYSICAL_ADDRESS Base; + + // + // We need to copy ImageContext since PeCoffLoaderGetImageInfo () + // will mangle the ImageAddress field + // + CopyMem (&TmpContext, ImageContext, sizeof (TmpContext)); + + if (TmpContext.PeCoffHeaderOffset =3D=3D 0) { + Status =3D PeCoffLoaderGetImageInfo (&TmpContext); + if (RETURN_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, + "%a: PeCoffLoaderGetImageInfo () failed (Status =3D %r)\n", + __FUNCTION__, Status)); + return Status; + } + } + + if (TmpContext.IsTeImage && + TmpContext.ImageAddress =3D=3D ImageContext->ImageAddress) { + DEBUG ((DEBUG_INFO, "%a: ignoring XIP TE image at 0x%lx\n", __FUNCTION= __, + ImageContext->ImageAddress)); + return RETURN_SUCCESS; + } + + if (TmpContext.SectionAlignment < EFI_PAGE_SIZE) { + // + // The sections need to be at least 4 KB aligned, since that is the + // granularity at which we can tighten permissions. So just clear the + // noexec permissions on the entire region. + // + if (!TmpContext.IsTeImage) { + DEBUG ((DEBUG_WARN, + "%a: non-TE Image at 0x%lx has SectionAlignment < 4 KB (%lu)\n", + __FUNCTION__, ImageContext->ImageAddress, TmpContext.SectionAlignm= ent)); + } + Base =3D ImageContext->ImageAddress & ~(EFI_PAGE_SIZE - 1); + Size =3D ImageContext->ImageAddress - Base + ImageContext->ImageSize; + return NoExecUpdater (Base, ALIGN_VALUE (Size, EFI_PAGE_SIZE)); + } + + // + // Read the PE/COFF Header. For PE32 (32-bit) this will read in too much + // data, but that should not hurt anything. Hdr.Pe32->OptionalHeader.Mag= ic + // determines if this is a PE32 or PE32+ image. The magic is in the same + // location in both images. + // + Hdr.Union =3D &HdrData; + Size =3D sizeof (EFI_IMAGE_OPTIONAL_HEADER_UNION); + ReadSize =3D Size; + Status =3D TmpContext.ImageRead (TmpContext.Handle, + TmpContext.PeCoffHeaderOffset, &Size, Hdr.Pe32); + if (RETURN_ERROR (Status) || (Size !=3D ReadSize)) { + DEBUG ((DEBUG_ERROR, + "%a: TmpContext.ImageRead () failed (Status =3D %r)\n", + __FUNCTION__, Status)); + return Status; + } + + ASSERT (Hdr.Pe32->Signature =3D=3D EFI_IMAGE_NT_SIGNATURE); + + SectionHeaderOffset =3D TmpContext.PeCoffHeaderOffset + sizeof (UINT32) + + sizeof (EFI_IMAGE_FILE_HEADER); + NumberOfSections =3D (UINTN)(Hdr.Pe32->FileHeader.NumberOfSections); + + switch (Hdr.Pe32->OptionalHeader.Magic) { + case EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC: + SectionHeaderOffset +=3D Hdr.Pe32->FileHeader.SizeOfOptionalHeader; + break; + case EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC: + SectionHeaderOffset +=3D Hdr.Pe32Plus->FileHeader.SizeOfOptionalHead= er; + break; + default: + ASSERT (FALSE); + } + + // + // Iterate over the sections + // + for (Index =3D 0; Index < NumberOfSections; Index++) { + // + // Read section header from file + // + Size =3D sizeof (EFI_IMAGE_SECTION_HEADER); + ReadSize =3D Size; + Status =3D TmpContext.ImageRead (TmpContext.Handle, SectionHeaderOffse= t, + &Size, &SectionHeader); + if (RETURN_ERROR (Status) || (Size !=3D ReadSize)) { + DEBUG ((DEBUG_ERROR, + "%a: TmpContext.ImageRead () failed (Status =3D %r)\n", + __FUNCTION__, Status)); + return Status; + } + + Base =3D TmpContext.ImageAddress + SectionHeader.VirtualAddress; + + if ((SectionHeader.Characteristics & EFI_IMAGE_SCN_MEM_EXECUTE) =3D=3D= 0) { + + if ((SectionHeader.Characteristics & EFI_IMAGE_SCN_MEM_WRITE) =3D=3D= 0 && + TmpContext.ImageType !=3D EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER= ) { + + DEBUG ((DEBUG_INFO, + "%a: Mapping section %d of image at 0x%lx with RO-XN permissions= and size 0x%x\n", + __FUNCTION__, Index, Base, SectionHeader.Misc.VirtualSize)); + ReadOnlyUpdater (Base, SectionHeader.Misc.VirtualSize); + } else { + DEBUG ((DEBUG_WARN, + "%a: Mapping section %d of image at 0x%lx with RW-XN permissions= and size 0x%x\n", + __FUNCTION__, Index, Base, SectionHeader.Misc.VirtualSize)); + } + } else { + DEBUG ((DEBUG_INFO, + "%a: Mapping section %d of image at 0x%lx with RO-XN permissions= and size 0x%x\n", + __FUNCTION__, Index, Base, SectionHeader.Misc.VirtualSize)); + ReadOnlyUpdater (Base, SectionHeader.Misc.VirtualSize); + + DEBUG ((DEBUG_INFO, + "%a: Mapping section %d of image at 0x%lx with RO-X permissions = and size 0x%x\n", + __FUNCTION__, Index, Base, SectionHeader.Misc.VirtualSize)); + NoExecUpdater (Base, SectionHeader.Misc.VirtualSize); + } + + SectionHeaderOffset +=3D sizeof (EFI_IMAGE_SECTION_HEADER); + } + return RETURN_SUCCESS; +} =20 /** If the build is done on cygwin the paths are cygpaths. @@ -83,23 +234,29 @@ PeCoffLoaderRelocateImageExtraAction ( CHAR8 Temp[512]; #endif =20 + if (PcdGetBool(PcdStandaloneMmEnable) =3D=3D TRUE) + { + UpdatePeCoffPermissions (ImageContext, ArmClearMemoryRegionNoExec, + ArmSetMemoryRegionReadOnly); + } + if (ImageContext->PdbPointer) { #ifdef __CC_ARM #if (__ARMCC_VERSION < 500000) // Print out the command for the RVD debugger to load symbols for this= image - DEBUG ((EFI_D_LOAD | EFI_D_INFO, "load /a /ni /np %a &0x%p\n", DeCygwi= nPathIfNeeded (ImageContext->PdbPointer, Temp, sizeof (Temp)), (UINTN)(Imag= eContext->ImageAddress + ImageContext->SizeOfHeaders))); + DEBUG ((DEBUG_LOAD | DEBUG_INFO, "load /a /ni /np %a &0x%p\n", DeCygwi= nPathIfNeeded (ImageContext->PdbPointer, Temp, sizeof (Temp)), (UINTN)(Imag= eContext->ImageAddress + ImageContext->SizeOfHeaders))); #else // Print out the command for the DS-5 to load symbols for this image - DEBUG ((EFI_D_LOAD | EFI_D_INFO, "add-symbol-file %a 0x%p\n", DeCygwin= PathIfNeeded (ImageContext->PdbPointer, Temp, sizeof (Temp)), (UINTN)(Image= Context->ImageAddress + ImageContext->SizeOfHeaders))); + DEBUG ((DEBUG_LOAD | DEBUG_INFO, "add-symbol-file %a 0x%p\n", DeCygwin= PathIfNeeded (ImageContext->PdbPointer, Temp, sizeof (Temp)), (UINTN)(Image= Context->ImageAddress + ImageContext->SizeOfHeaders))); #endif #elif __GNUC__ // This may not work correctly if you generate PE/COFF directlyas then= the Offset would not be required - DEBUG ((EFI_D_LOAD | EFI_D_INFO, "add-symbol-file %a 0x%p\n", DeCygwin= PathIfNeeded (ImageContext->PdbPointer, Temp, sizeof (Temp)), (UINTN)(Image= Context->ImageAddress + ImageContext->SizeOfHeaders))); + DEBUG ((DEBUG_LOAD | DEBUG_INFO, "add-symbol-file %a 0x%p\n", DeCygwin= PathIfNeeded (ImageContext->PdbPointer, Temp, sizeof (Temp)), (UINTN)(Image= Context->ImageAddress + ImageContext->SizeOfHeaders))); #else - DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Loading driver at 0x%11p EntryPoint= =3D0x%11p\n", (VOID *)(UINTN) ImageContext->ImageAddress, FUNCTION_ENTRY_PO= INT (ImageContext->EntryPoint))); + DEBUG ((DEBUG_LOAD | DEBUG_INFO, "Loading driver at 0x%11p EntryPoint= =3D0x%11p\n", (VOID *)(UINTN) ImageContext->ImageAddress, FUNCTION_ENTRY_PO= INT (ImageContext->EntryPoint))); #endif } else { - DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Loading driver at 0x%11p EntryPoint= =3D0x%11p\n", (VOID *)(UINTN) ImageContext->ImageAddress, FUNCTION_ENTRY_PO= INT (ImageContext->EntryPoint))); + DEBUG ((DEBUG_LOAD | DEBUG_INFO, "Loading driver at 0x%11p EntryPoint= =3D0x%11p\n", (VOID *)(UINTN) ImageContext->ImageAddress, FUNCTION_ENTRY_PO= INT (ImageContext->EntryPoint))); } } =20 @@ -125,17 +282,23 @@ PeCoffLoaderUnloadImageExtraAction ( CHAR8 Temp[512]; #endif =20 + if (PcdGetBool(PcdStandaloneMmEnable) =3D=3D TRUE) + { + UpdatePeCoffPermissions (ImageContext, ArmSetMemoryRegionNoExec, + ArmClearMemoryRegionReadOnly); + } + if (ImageContext->PdbPointer) { #ifdef __CC_ARM // Print out the command for the RVD debugger to load symbols for this= image - DEBUG ((EFI_D_ERROR, "unload symbols_only %a\n", DeCygwinPathIfNeeded = (ImageContext->PdbPointer, Temp, sizeof (Temp)))); + DEBUG ((DEBUG_ERROR, "unload symbols_only %a\n", DeCygwinPathIfNeeded = (ImageContext->PdbPointer, Temp, sizeof (Temp)))); #elif __GNUC__ // This may not work correctly if you generate PE/COFF directlyas then= the Offset would not be required - DEBUG ((EFI_D_ERROR, "remove-symbol-file %a 0x%08x\n", DeCygwinPathIfN= eeded (ImageContext->PdbPointer, Temp, sizeof (Temp)), (UINTN)(ImageContext= ->ImageAddress + ImageContext->SizeOfHeaders))); + DEBUG ((DEBUG_ERROR, "remove-symbol-file %a 0x%08x\n", DeCygwinPathIfN= eeded (ImageContext->PdbPointer, Temp, sizeof (Temp)), (UINTN)(ImageContext= ->ImageAddress + ImageContext->SizeOfHeaders))); #else - DEBUG ((EFI_D_ERROR, "Unloading %a\n", ImageContext->PdbPointer)); + DEBUG ((DEBUG_ERROR, "Unloading %a\n", ImageContext->PdbPointer)); #endif } else { - DEBUG ((EFI_D_ERROR, "Unloading driver at 0x%11p\n", (VOID *)(UINTN) I= mageContext->ImageAddress)); + DEBUG ((DEBUG_ERROR, "Unloading driver at 0x%11p\n", (VOID *)(UINTN) I= mageContext->ImageAddress)); } } diff --git a/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActio= nLib.inf b/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionL= ib.inf index c1f717e..38bf399 100644 --- a/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf +++ b/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf @@ -33,7 +33,14 @@ DebugPeCoffExtraActionLib.c =20 [Packages] + ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec + StandaloneMmPkg/StandaloneMmPkg.dec + +[FeaturePcd] + gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable =20 [LibraryClasses] + ArmMmuLib DebugLib + PcdLib --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel