From nobody Sun May 19 03:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97874+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97874+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1672758178; cv=none; d=zohomail.com; s=zohoarc; b=TiVWfHPhc9XbxlqV2I0x8nngQ+OL6WzK3dR4+HgxlQjlw+vJjNhqUstDs99FQQkxCjMQrsn714gDDc8zx697e2G/jqd+JA4/WiO6DDI2daAQ4kk4N3OqLNceKc4hBv6Yr857M5PVFZjnz7Hr+Mk0UBA/deScuihTsdDGGBsLdDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672758178; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=1GxmvATX6sgngZuEhG33an3N0TJZZqBAKgSQDSGRp8k=; b=gOye6xwXLUdUEgaGSLeu8mhvVQhEa6Syv7igWY+JvMfx+W59yAj+SQbZmS2JOAE4hY1cjaoU4gk7qGdWT+Ibxl1rhJSRH4vpIpluBouDduMYnFLRCF37oDwRjAWkOU+S17i80imYx6xyvwo5oMDYvk7SwTlR0eND+xKB8djPYDY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97874+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1672758178529619.3605437481581; Tue, 3 Jan 2023 07:02:58 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6StAYY1788612xkEjYTzT5RG; Tue, 03 Jan 2023 07:02:58 -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.65340.1672758177061842198 for ; Tue, 03 Jan 2023 07:02:57 -0800 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-Sr5CkPy_NRujiwGGCaQ7BA-1; Tue, 03 Jan 2023 10:02:53 -0500 X-MC-Unique: Sr5CkPy_NRujiwGGCaQ7BA-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C94B3C025D2; Tue, 3 Jan 2023 15:02:52 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80DF6492C14; Tue, 3 Jan 2023 15:02:51 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao , Jordan Justen Subject: [edk2-devel] [PATCH 1/4] OvmfPkg/QemuVideoDxe/VbeShim.sh: remove end-of-options delimiter for nasm Date: Tue, 3 Jan 2023 16:02:41 +0100 Message-Id: <20230103150244.66835-2-lersek@redhat.com> In-Reply-To: <20230103150244.66835-1-lersek@redhat.com> References: <20230103150244.66835-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: UUvNUO0oXzaQrcGYckooAvdkx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672758178; bh=1GxmvATX6sgngZuEhG33an3N0TJZZqBAKgSQDSGRp8k=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=u9FVUhncERXWN+JNZui//Ad9JUcSqaSvrQdq5Ag8bd2XjyjNuyl48xVIIATv1OdzqBH n5j5zo7Q+zd/OFdtuTfL82GI1LjI0ufiH7eYspmjnbTNf9+MNof+6KhBsxffdZwJ534I0 uKipX5/iGNgNsG1dOmKS9Efx6JVBjmiMjvQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672758179494100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Per my bisection: nasm broke the parsing of the "--" end-of-options delimiter in commit 55568c1193df ("nasm: scan the command line twice", 2016-10-03), part of the nasm-2.13 release. The parsing remains broken in at least nasm-2.15.03. The (invalid) error message is: "more than one input file specified". I've filed the following ticket for upstream nasm (and ndisasm): . Since the delimiter is not necessary in practice (due to $STEM being "VbeShim", i.e., not starting with a hyphen), simply remove the delimiter. Tested by enabling DEBUG in "VbeShim.asm", running the script, building OVMF, booting Windows 7, and checking the firmware log (debug console). Cc: Ard Biesheuvel Cc: Gerd Hoffmann Cc: Jiewen Yao Cc: Jordan Justen Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3876 Signed-off-by: Laszlo Ersek --- OvmfPkg/QemuVideoDxe/VbeShim.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.sh b/OvmfPkg/QemuVideoDxe/VbeShim= .sh index aea28be35f5c..7a0095a813cf 100755 --- a/OvmfPkg/QemuVideoDxe/VbeShim.sh +++ b/OvmfPkg/QemuVideoDxe/VbeShim.sh @@ -27,12 +27,15 @@ trap exit_handler EXIT =20 # # Assemble the source file. +# (nasm doesn't recognize the "--" end-of-options delimiter; +# .) # -nasm -o "$STEM".bin -- "$STEM".asm +nasm -o "$STEM".bin "$STEM".asm =20 # # Disassemble it, in order to get a binary dump associated with the source. -# (ndisasm doesn't recognize the "--" end-of-options delimiter.) +# (ndisasm doesn't recognize the "--" end-of-options delimiter; +# .) # ndisasm "$STEM".bin >"$STEM".disasm =20 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97874): https://edk2.groups.io/g/devel/message/97874 Mute This Topic: https://groups.io/mt/96029299/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 03:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97876+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97876+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1672758184; cv=none; d=zohomail.com; s=zohoarc; b=I239KpJFIGC3lYVZVlHKzAA82wc92/PT6R8L5lG/HUdYJHYCIFeGx08nX91Symzs4NyL2H0godrtD2+QXH+b0JgU+W43SKNjFUVb0vXB9rRcEJFt/g38CY7N2c3JF1jzE+yhTGu4AT0I6UFiBUzmBB5UC+XtxwRu5FgG3qIs2FI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672758184; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=p8Jcr749n6wC1j0VDnXgOOasO/LXZpZ8cb7RFs4jiGI=; b=ai+jTFuv/3byr2M27jl3nvVy9Kvd/BXUrCdszZtR5vBLWqpG/RJ/I0+e3+ZddMCn+61molCKRig8TIjoo4wdez7Qtw9u9vELNOBLaq56s2ZvcwVY2tuqzuicEjDUeqWXY/dSNaJiYy2jIXqC3S5woGDxUL3gir9F3gYSNc7Kxhs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97876+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1672758184596341.1038424494625; Tue, 3 Jan 2023 07:03:04 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NOTXYY1788612x3niVxFbSaC; Tue, 03 Jan 2023 07:03:03 -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.65348.1672758183047123131 for ; Tue, 03 Jan 2023 07:03:03 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-296-pEjDvFUcPkm8gI5DDSsoEA-1; Tue, 03 Jan 2023 10:02:57 -0500 X-MC-Unique: pEjDvFUcPkm8gI5DDSsoEA-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E4C43885621; Tue, 3 Jan 2023 15:02:55 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 407BA492C14; Tue, 3 Jan 2023 15:02:53 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Anthony Perard , Ard Biesheuvel , Brijesh Singh , Erdem Aktas , Gerd Hoffmann , James Bottomley , Jiewen Yao , Jordan Justen , Julien Grall , Min Xu , Peter Grehan , Rebecca Cran , Sebastien Boeuf , Tom Lendacky Subject: [edk2-devel] [PATCH 2/4] OvmfPkg: raise DXEFV size to 13 MB in the traditional platform FDFs Date: Tue, 3 Jan 2023 16:02:42 +0100 Message-Id: <20230103150244.66835-3-lersek@redhat.com> In-Reply-To: <20230103150244.66835-1-lersek@redhat.com> References: <20230103150244.66835-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: UdoGvddep8mz6LSspcgAT1z8x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672758183; bh=p8Jcr749n6wC1j0VDnXgOOasO/LXZpZ8cb7RFs4jiGI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=CzPQbsW2VIBcUIUl3Qo7jtWg7SiCAzT3VfviVRrMElNjSHJVn8GGwv5XnVzPqF5E2cV Z3SRtq/XK5uTSqPBQRCt8QfU/P1vi5nwVAwDhoByMb+qdMffh7FbH55FagjLbzavrQ439 lKr9LRTVfAMdXscz1iQIkaysQx+7KDRqBo4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672758185468100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Similarly to the "cadence" mentioned in commit d272449d9e1e ("OvmfPkg: raise DXEFV size to 11 MB", 2018-05-29), it's been ~1.75 years since commit 5e75c4d1fe4f ("OvmfPkg: raise DXEFV size to 12 MB", 2020-03-11), and we've outgrown DXEFV again (with NOOPT builds). Increase the DXEFV size to 13MB now. Do not modify all platform FDF files under OvmfPkg. "BhyveX64.fdf" is still at 11MB, "OvmfXen.fdf" at 10MB. The "AmdSevX64.fdf", "CloudHvX64.fdf", "IntelTdxX64.fdf" and "MicrovmX64.fdf" flash devices could be modified similarly (from 12MB to 13MB), but I don't use or build those platforms. Tested on: - IA32, q35, SMM_REQUIRE, Fedora 30 guest - X64, pc (i440fx), no SMM, RHEL-7.9 guest - IA32X64, q35, SMM_REQUIRE, RHEL-7.9 guest Test steps: - configure 3 VCPUs - boot - run "taskset -c $I efibootmgr" with $I covering 0..2 - systemctl suspend - resume from virt-manager - run "taskset -c $I efibootmgr" with $I covering 0..2 Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Brijesh Singh Cc: Erdem Aktas Cc: Gerd Hoffmann Cc: James Bottomley Cc: Jiewen Yao Cc: Jordan Justen Cc: Julien Grall Cc: Min Xu Cc: Peter Grehan Cc: Rebecca Cran Cc: Sebastien Boeuf Cc: Tom Lendacky Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4236 Signed-off-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.fdf | 6 +++--- OvmfPkg/OvmfPkgIa32X64.fdf | 6 +++--- OvmfPkg/OvmfPkgX64.fdf | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 72bce02caba1..5451bfb84525 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -62,10 +62,10 @@ [FD.OVMF_CODE] =20 [FD.MEMFD] BaseAddress =3D $(MEMFD_BASE_ADDRESS) -Size =3D 0xD00000 +Size =3D 0xE00000 ErasePolarity =3D 1 BlockSize =3D 0x10000 -NumBlocks =3D 0xD0 +NumBlocks =3D 0xE0 =20 0x000000|0x006000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecPageTablesSize @@ -86,7 +86,7 @@ [FD.MEMFD] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfPeiMemFvSize FV =3D PEIFV =20 -0x100000|0xC00000 +0x100000|0xD00000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfDxeMemFvSize FV =3D DXEFV =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 576c985ae008..4c5bd0dbc3b0 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -62,10 +62,10 @@ [FD.OVMF_CODE] =20 [FD.MEMFD] BaseAddress =3D $(MEMFD_BASE_ADDRESS) -Size =3D 0xD00000 +Size =3D 0xE00000 ErasePolarity =3D 1 BlockSize =3D 0x10000 -NumBlocks =3D 0xD0 +NumBlocks =3D 0xE0 =20 0x000000|0x006000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecPageTablesSize @@ -86,7 +86,7 @@ [FD.MEMFD] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfPeiMemFvSize FV =3D PEIFV =20 -0x100000|0xC00000 +0x100000|0xD00000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfDxeMemFvSize FV =3D DXEFV =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index c4aa88243186..8c02dfe11e37 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -62,10 +62,10 @@ [FD.OVMF_CODE] =20 [FD.MEMFD] BaseAddress =3D $(MEMFD_BASE_ADDRESS) -Size =3D 0xD00000 +Size =3D 0xE00000 ErasePolarity =3D 1 BlockSize =3D 0x10000 -NumBlocks =3D 0xD0 +NumBlocks =3D 0xE0 =20 0x000000|0x006000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecPageTablesSize @@ -101,7 +101,7 @@ [FD.MEMFD] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfPeiMemFvSize FV =3D PEIFV =20 -0x100000|0xC00000 +0x100000|0xD00000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfDxeMemFvSize FV =3D DXEFV =20 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97876): https://edk2.groups.io/g/devel/message/97876 Mute This Topic: https://groups.io/mt/96029301/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 03:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97875+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97875+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1672758180; cv=none; d=zohomail.com; s=zohoarc; b=AA7XsOdhlv2ELKLACySPcUtOwRvP++F4EZtknyBWZFW/VRjenaaBAu9mUSB1IxHvcNgqamT0Nncxs7iAHaqYblb0eAVsgJwzxlCTMXsfJClK5n7Z3grdVd+Z7XTCnc9ziNF+SDh05OZZHAM8pRlp1SEFqtAf0fQyMrSeeOap44k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672758180; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Smr1X2mBVl17hv4TU7cjEap2AlCtB3hK346eIBhvcvc=; b=ZlNGmowM1HoqS+MiFGpMRS5qyo8OEOzKfI66srdVIC4BtHXauiaEswVSYgqOCtSfP8l8ZmDB+D/dXcFjmI3U+h28mRyIW1apXo3v511NcCpPCS6H3AEppEa1RhUucnXskjKUlIKHfS26lIKKl1KQe5mMO/9Z1OAhUigczMRLX7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97875+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 167275818086950.2441280183607; Tue, 3 Jan 2023 07:03:00 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id s2gaYY1788612xJVVPxVOd49; Tue, 03 Jan 2023 07:03:00 -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.65342.1672758179720557442 for ; Tue, 03 Jan 2023 07:02:59 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-168-E8K94iwdMASK2p08Q94UKA-1; Tue, 03 Jan 2023 10:02:57 -0500 X-MC-Unique: E8K94iwdMASK2p08Q94UKA-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 537FD858F09; Tue, 3 Jan 2023 15:02:57 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3923C492C14; Tue, 3 Jan 2023 15:02:56 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Eric Dong , Gerd Hoffmann , Rahul Kumar , Ray Ni Subject: [edk2-devel] [PATCH 3/4] UefiCpuPkg/SmmCpuFeaturesLib: drop obsolete API implementation Date: Tue, 3 Jan 2023 16:02:43 +0100 Message-Id: <20230103150244.66835-4-lersek@redhat.com> In-Reply-To: <20230103150244.66835-1-lersek@redhat.com> References: <20230103150244.66835-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: NI78AhfyswnjuMgATigAxHqXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672758180; bh=Smr1X2mBVl17hv4TU7cjEap2AlCtB3hK346eIBhvcvc=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=HXAbHHNPrRCYLJetO3ZFVh28gXmQTK8kx3Cellt1n+6CuuImQPudMrFp0K7mvVANApP wHfc1tW6QsGGTBMBJWrvfqJ2eGIHDynHwuo5UZ1BjINrY0VUBuy7Zl+CLhyBRg0f6ZeO3 zKIm8sF6BSuH+vmT6s6HQBOIFnn27V7bzSU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672758181641100011 Content-Type: text/plain; charset="utf-8"; x-default="true" Commit 0426115b6738 ("UefiCpuPkg: Remove unused API in SmmCpuFeaturesLib.h", 2022-12-21) removed the declaration of the function SmmCpuFeaturesAllocatePageTableMemory() from the "SmmCpuFeaturesLib.h" library class header. Remove the API's (null-)implementation from UefiCpuPkg/SmmCpuFeaturesLib as well. Build-tested with: build -a IA32 -a X64 -b NOOPT -p UefiCpuPkg/UefiCpuPkg.dsc -t GCC5 Cc: Eric Dong Cc: Gerd Hoffmann Cc: Rahul Kumar Cc: Ray Ni Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4235 Signed-off-by: Laszlo Ersek --- UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibCommon.c | 28 ------= -------------- 1 file changed, 28 deletions(-) diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibCommon.c= b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibCommon.c index 7777e52740eb..5498fda38da4 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibCommon.c +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibCommon.c @@ -186,31 +186,3 @@ SmmCpuFeaturesCompleteSmmReadyToLock ( ) { } - -/** - This API provides a method for a CPU to allocate a specific region for s= toring page tables. - - This API can be called more once to allocate memory for page tables. - - Allocates the number of 4KB pages of type EfiRuntimeServicesData and ret= urns 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 req= uest, then NULL is - returned. - - This function can also return NULL if there is no preference on where th= e page tables are allocated in SMRAM. - - @param Pages The number of 4 KB pages to allocate. - - @return A pointer to the allocated buffer for page tables. - @retval NULL Fail to allocate a specific region for storing page ta= bles, - Or there is no preference on where the page tables are= allocated in SMRAM. - -**/ -VOID * -EFIAPI -SmmCpuFeaturesAllocatePageTableMemory ( - IN UINTN Pages - ) -{ - return NULL; -} -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97875): https://edk2.groups.io/g/devel/message/97875 Mute This Topic: https://groups.io/mt/96029300/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 03:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97877+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97877+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1672758194; cv=none; d=zohomail.com; s=zohoarc; b=g6L2gslfM4OpGpk/z9fTdXliDgKf8rTz95TlmmcjZVXSpmbtYLgrXf5grfbu97CzJkzTfBQ14RE8ZfMZ7UK7i7NgvoGgf+aOfeZjY90pEKVHQRIeZysBngZzGK746TlVGfZ7OOotcyLkayr3nMYI3ZFDE1aJYSV1D4SJF+beWUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672758194; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Vh6Yqt1O9sY+2qcBqXTABnmXmeKWMlie3hOQgTYtRtU=; b=AjV+SnEjNDaW4rJWaCsDxXp+IBE6g6wpzpXlSgcajzN23sisCPD6o9mx4oO4r/2RKnnx1BjA17Ozv7/nmBdyXL/ihEX9eSvKCQmJQOuAyCRxX1YX8CggoC2YzgTetDdDopNE+ZRsBXz+QzqTDudw0i5yY+FdCUgnXM411mQndxM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97877+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1672758194549676.4682997454422; Tue, 3 Jan 2023 07:03:14 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id DYOwYY1788612xMmxWPC1b4Q; Tue, 03 Jan 2023 07:03:13 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.65757.1672758192731999336 for ; Tue, 03 Jan 2023 07:03:13 -0800 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-135-gW6QSOZ8MxuhVHC9OAWrDA-1; Tue, 03 Jan 2023 10:03:05 -0500 X-MC-Unique: gW6QSOZ8MxuhVHC9OAWrDA-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B78B429AA39A; Tue, 3 Jan 2023 15:02:58 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C055492C14; Tue, 3 Jan 2023 15:02:57 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao , Jordan Justen Subject: [edk2-devel] [PATCH 4/4] OvmfPkg/SmmCpuFeaturesLib: drop obsolete API implementation Date: Tue, 3 Jan 2023 16:02:44 +0100 Message-Id: <20230103150244.66835-5-lersek@redhat.com> In-Reply-To: <20230103150244.66835-1-lersek@redhat.com> References: <20230103150244.66835-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: odmov3OvT9gS6MhmDeRjw2FJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672758193; bh=Vh6Yqt1O9sY+2qcBqXTABnmXmeKWMlie3hOQgTYtRtU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Ur6DziF92a8+R5LNSkdaiKxmqC6Pckmj5aLDD88Yidr0VCvrQmFQBlN5gnEJLxrYxXA WaM/ffIYbhbwZiB4fc67SPFHK0Uhj8PCPja7yCYjy2f1ou7ZN4qXcj4Qk++qsfSAz3jFW S5SrANZ4Lpr+sEUry1+NKcFUyPNcnY3FZ6M= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672758195658100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Commit 0426115b6738 ("UefiCpuPkg: Remove unused API in SmmCpuFeaturesLib.h", 2022-12-21) removed the declaration of the function SmmCpuFeaturesAllocatePageTableMemory() from the "SmmCpuFeaturesLib.h" library class header. Remove the API's (null-)implementation from OvmfPkg/SmmCpuFeaturesLib as well. Testing: OVMF builds, boots, and suspends/resumes (see earlier in this series). Cc: Ard Biesheuvel Cc: Gerd Hoffmann Cc: Jiewen Yao Cc: Jordan Justen Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4235 Signed-off-by: Laszlo Ersek --- OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 31 ---------------= ----- 1 file changed, 31 deletions(-) diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPk= g/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index 9297cc5fa93a..6693666d043f 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -1348,34 +1348,3 @@ SmmCpuFeaturesCompleteSmmReadyToLock ( ) { } - -/** - This API provides a method for a CPU to allocate a specific region for - storing page tables. - - This API can be called more once to allocate memory for page tables. - - Allocates the number of 4KB pages of type EfiRuntimeServicesData and ret= urns - 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. - - This function can also return NULL if there is no preference on where the - page tables are allocated in SMRAM. - - @param Pages The number of 4 KB pages to allocate. - - @return A pointer to the allocated buffer for page tables. - @retval NULL Fail to allocate a specific region for storing page ta= bles, - Or there is no preference on where the page tables are - allocated in SMRAM. - -**/ -VOID * -EFIAPI -SmmCpuFeaturesAllocatePageTableMemory ( - IN UINTN Pages - ) -{ - return NULL; -} -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97877): https://edk2.groups.io/g/devel/message/97877 Mute This Topic: https://groups.io/mt/96029305/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-