From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 6BCA57803CF for ; Thu, 22 Feb 2024 11:54:44 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=IpXnxlt/itz1LukJGSzmj+At9oQqX6m/MpmLHtfoBq0=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1708602883; v=1; b=r0xA0fkIRAd9soEiykMq7oj0TIO2B9DrwJigf2oxJjh01BkeuUB3dY93cF/SDfpzX1q74RQU yozv5JNQiuNOi7Ybdo0042yTkfkDg7lxXYYLfsW+sNyaBJOLKCvgdUPtwJZpcGW0tqHL4xCTFce 9fBjF6UEF/6D8Aj4165CqQBA= X-Received: by 127.0.0.2 with SMTP id 5axmYY7687511x0405yAHkkO; Thu, 22 Feb 2024 03:54:43 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.11051.1708602882135203319 for ; Thu, 22 Feb 2024 03:54:42 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-452-qhpKdOLoOuKOABpFZVuVDA-1; Thu, 22 Feb 2024 06:54:40 -0500 X-MC-Unique: qhpKdOLoOuKOABpFZVuVDA-1 X-Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7CEC382DFE9; Thu, 22 Feb 2024 11:54:39 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.237]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1AD83112131D; Thu, 22 Feb 2024 11:54:39 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 033BE18017F2; Thu, 22 Feb 2024 12:54:36 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Tom Lendacky , Jiewen Yao , Oliver Steffen , Laszlo Ersek , Erdem Aktas , Michael Roth , Ard Biesheuvel , Gerd Hoffmann , Min Xu Subject: [edk2-devel] [PATCH 02/10] OvmfPkg/ResetVector: add ClearOvmfPageTables macro Date: Thu, 22 Feb 2024 12:54:27 +0100 Message-ID: <20240222115435.85794-3-kraxel@redhat.com> In-Reply-To: <20240222115435.85794-1-kraxel@redhat.com> References: <20240222115435.85794-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: wr0ujW1Yd0ceU3tcTB5Gxtnmx7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=r0xA0fkI; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Move code to clear the page tables to a nasm macro. No functional change. Signed-off-by: Gerd Hoffmann --- OvmfPkg/ResetVector/Ia32/PageTables64.asm | 35 ++++++++++++----------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVector/Ia32/PageTables64.asm index 6fec6f2beeea..378ba2feeb4f 100644 --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm @@ -45,6 +45,24 @@ BITS 32 %define TDX_BSP 1 %define TDX_AP 2 +; +; For OVMF, build some initial page tables at +; PcdOvmfSecPageTablesBase - (PcdOvmfSecPageTablesBase + 0x6000). +; +; This range should match with PcdOvmfSecPageTablesSize which is +; declared in the FDF files. +; +; At the end of PEI, the pages tables will be rebuilt into a +; more permanent location by DxeIpl. +; +%macro ClearOvmfPageTables 0 + mov ecx, 6 * 0x1000 / 4 + xor eax, eax +.clearPageTablesMemoryLoop: + mov dword[ecx * 4 + PT_ADDR (0) - 4], eax + loop .clearPageTablesMemoryLoop +%endmacro + ; ; Modified: EAX, EBX, ECX, EDX ; @@ -69,22 +87,7 @@ SetCr3ForPageTables64: OneTimeCall GetSevCBitMaskAbove31 ClearOvmfPageTables: - ; - ; For OVMF, build some initial page tables at - ; PcdOvmfSecPageTablesBase - (PcdOvmfSecPageTablesBase + 0x6000). - ; - ; This range should match with PcdOvmfSecPageTablesSize which is - ; declared in the FDF files. - ; - ; At the end of PEI, the pages tables will be rebuilt into a - ; more permanent location by DxeIpl. - ; - - mov ecx, 6 * 0x1000 / 4 - xor eax, eax -clearPageTablesMemoryLoop: - mov dword[ecx * 4 + PT_ADDR (0) - 4], eax - loop clearPageTablesMemoryLoop + ClearOvmfPageTables ; ; Top level Page Directory Pointers (1 * 512GB entry) -- 2.43.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115803): https://edk2.groups.io/g/devel/message/115803 Mute This Topic: https://groups.io/mt/104506789/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-