From nobody Mon Dec 23 09:14:36 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1519949065672332.88579719002473; Thu, 1 Mar 2018 16:04:25 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6A8F0224E6916; Thu, 1 Mar 2018 15:58:11 -0800 (PST) Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 80ADB22485A98 for ; Thu, 1 Mar 2018 15:58:09 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CDF198182D2E; Fri, 2 Mar 2018 00:04:17 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-4.rdu2.redhat.com [10.10.120.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id E749610AF9D2; Fri, 2 Mar 2018 00:04:16 +0000 (UTC) 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=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org From: Laszlo Ersek To: edk2-devel-01 Date: Fri, 2 Mar 2018 01:03:51 +0100 Message-Id: <20180302000408.14201-4-lersek@redhat.com> In-Reply-To: <20180302000408.14201-1-lersek@redhat.com> References: <20180302000408.14201-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 02 Mar 2018 00:04:17 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 02 Mar 2018 00:04:17 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: [edk2] [PATCH 03/20] OvmfPkg/MemEncryptSevLib: clean up MemEncryptSevClearPageEncMask() decl X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Justen , Brijesh Singh , Ard Biesheuvel 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 declaration and the definition(s) of the function should have identical leading comments and/or identical parameter lists. Also remove any excess space in the comment block, and unindent the trailing "**/" if necessary. Correct several parameter references. Cc: Ard Biesheuvel Cc: Brijesh Singh Cc: Jordan Justen Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek --- OvmfPkg/Include/Library/MemEncryptSevLib.h | 34 ++++++++= +++--------- OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c | 34 ++++++++= ++---------- OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c | 7 ++-- 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index 88b272ebedef..2d574dd30676 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -15,63 +15,65 @@ **/ =20 #ifndef _MEM_ENCRYPT_SEV_LIB_H_ #define _MEM_ENCRYPT_SEV_LIB_H_ =20 #include =20 /** Returns a boolean to indicate whether SEV is enabled =20 @retval TRUE SEV is enabled @retval FALSE SEV is not enabled **/ BOOLEAN EFIAPI MemEncryptSevIsEnabled ( VOID ); =20 /** - This function clears memory encryption bit for the memory region specifi= ed - by BaseAddress and Number of pages from the current page table context. + This function clears memory encryption bit for the memory region specifi= ed by + BaseAddress and NumPages from the current page table context. =20 - @param[in] BaseAddress The physical address that is the start - address of a memory region. - @param[in] NumberOfPages The number of pages from start memory - region. - @param[in] Flush Flush the caches before clearing the b= it - (mostly TRUE except MMIO addresses) + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress The physical address that is the sta= rt + address of a memory region. + @param[in] NumPages The number of pages from start memory + region. + @param[in] Flush Flush the caches before clearing the= bit + (mostly TRUE except MMIO addresses) =20 - @retval RETURN_SUCCESS The attributes were cleared for the me= mory - region. - @retval RETURN_INVALID_PARAMETER Number of pages is zero. - @retval RETURN_UNSUPPORTED Clearing memory encryption attribute i= s not - supported - **/ + @retval RETURN_SUCCESS The attributes were cleared for the + memory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encryption attri= bute + is not supported +**/ RETURN_STATUS EFIAPI MemEncryptSevClearPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, - IN UINTN NumberOfPages, - IN BOOLEAN CacheFlush + IN UINTN NumPages, + IN BOOLEAN Flush ); =20 /** This function sets memory encryption bit for the memory region specified= by BaseAddress and Number of pages from the current page table context. =20 @param[in] BaseAddress The physical address that is the start address of a memory region. @param[in] NumberOfPages The number of pages from start memory region. @param[in] Flush Flush the caches before clearing the b= it (mostly TRUE except MMIO addresses) =20 @retval RETURN_SUCCESS The attributes were set for the memory region. @retval RETURN_INVALID_PARAMETER Number of pages is zero. @retval RETURN_UNSUPPORTED Clearing memory encryption attribute i= s not supported **/ RETURN_STATUS diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c b= /OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c index d1130df2d0e7..d6067c52aacd 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c @@ -5,64 +5,64 @@ Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 This program and the accompanying materials are licensed and made availa= ble 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 =20 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. =20 **/ =20 #include #include #include #include #include #include =20 /** - This function clears memory encryption bit for the memory region specifi= ed - by BaseAddress and Number of pages from the current page table context. + This function clears memory encryption bit for the memory region specifi= ed by + BaseAddress and NumPages from the current page table context. =20 - @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use cur= rent - CR3) - @param[in] BaseAddress The physical address that is the start - address of a memory region. - @param[in] NumberOfPages The number of pages from start memory - region. - @param[in] Flush Flush the caches before clearing the b= it - (mostly TRUE except MMIO addresses) + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress The physical address that is the sta= rt + address of a memory region. + @param[in] NumPages The number of pages from start memory + region. + @param[in] Flush Flush the caches before clearing the= bit + (mostly TRUE except MMIO addresses) =20 - @retval RETURN_SUCCESS The attributes were cleared for the me= mory - region. - @retval RETURN_INVALID_PARAMETER Number of pages is zero. - @retval RETURN_UNSUPPORTED Clearing memory encryption attribute i= s not - supported - **/ + @retval RETURN_SUCCESS The attributes were cleared for the + memory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encryption attri= bute + is not supported +**/ RETURN_STATUS EFIAPI MemEncryptSevClearPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, - IN UINTN NumberOfPages, + IN UINTN NumPages, IN BOOLEAN Flush ) { // // Memory encryption bit is not accessible in 32-bit mode // return RETURN_UNSUPPORTED; } =20 /** This function sets memory encryption bit for the memory region specified= by BaseAddress and Number of pages from the current page table context. =20 @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use cur= rent CR3) @param[in] BaseAddress The physical address that is the start address of a memory region. @param[in] NumberOfPages The number of pages from start memory region. @param[in] Flush Flush the caches before clearing the b= it diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c index 4b7fdf7d044d..5b8bc737645c 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c @@ -7,59 +7,58 @@ This program and the accompanying materials are licensed and made availa= ble 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 =20 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. =20 **/ =20 #include #include #include #include #include #include =20 #include "VirtualMemory.h" =20 /** - This function clears memory encryption bit for the memory region specifi= ed by - BaseAddress and Number of pages from the current page table context. + BaseAddress and NumPages from the current page table context. =20 @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use current CR3) @param[in] BaseAddress The physical address that is the sta= rt address of a memory region. - @param[in] NumberOfPages The number of pages from start memory + @param[in] NumPages The number of pages from start memory region. @param[in] Flush Flush the caches before clearing the= bit (mostly TRUE except MMIO addresses) =20 @retval RETURN_SUCCESS The attributes were cleared for the memory region. @retval RETURN_INVALID_PARAMETER Number of pages is zero. @retval RETURN_UNSUPPORTED Clearing the memory encryption attri= bute is not supported - **/ +**/ RETURN_STATUS EFIAPI MemEncryptSevClearPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, IN UINTN NumPages, IN BOOLEAN Flush ) { return InternalMemEncryptSevSetMemoryDecrypted ( Cr3BaseAddress, BaseAddress, EFI_PAGES_TO_SIZE (NumPages), Flush ); } =20 /** =20 This function clears memory encryption bit for the memory region specifi= ed by --=20 2.14.1.3.gb7cf6e02401b _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel