From nobody Mon Feb 9 08:56:46 2026 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+75680+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+75680+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622060795; cv=none; d=zohomail.com; s=zohoarc; b=kq9RwGrEWzFn+1HRT7TztG/pLkvG8/MtiibhPTPqPK+0PeukBP0TSX3ihv6gwTSBeRFSJ+k+u80oLvBwZDl+3WV/z0tI6C/GxyU93gRNatTGqE+PDvcErUZLBdEd3Dnr9JjTNB1WU3TvOiEhqg3131o8zQHzBSfNiI5bfJGRDXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622060795; 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=mFsMjStanVhdMrfd+jLlucy6MMt1MkFvg+inynMC1us=; b=cO71f0moEQbsKMuMQ95eLpDt+WzqhQpBubZxJCxDM8Ljx0wgiTXuvb/wF39KvMCemKcwBiBRuQhhSlpqPYqeZqCFvsj0MYWE4vitQXWVJmE2GjvWYhIpNbSGWrXhmuCqBkpi2XeeXXJUmYxPZ7WqyotzoeRz0WcmcgWl/9VFIXA= 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+75680+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1622060795147786.5546899324956; Wed, 26 May 2021 13:26:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jDiwYY1788612xNp6idgnZBu; Wed, 26 May 2021 13:26:34 -0700 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.web08.2986.1622060788911209241 for ; Wed, 26 May 2021 13:26:29 -0700 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-588-LXGphXpsMIyj4yN_vDamQg-1; Wed, 26 May 2021 16:26:26 -0400 X-MC-Unique: LXGphXpsMIyj4yN_vDamQg-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B9156415B; Wed, 26 May 2021 20:26:25 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-61.ams2.redhat.com [10.36.114.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05F9D70BAB; Wed, 26 May 2021 20:26:22 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Andrew Fish , Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , Leif Lindholm , Michael D Kinney , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [PATCH 11/43] OvmfPkg/XenAcpiPlatformDxe: create from AcpiPlatformDxe Date: Wed, 26 May 2021 22:14:14 +0200 Message-Id: <20210526201446.12554-12-lersek@redhat.com> In-Reply-To: <20210526201446.12554-1-lersek@redhat.com> References: <20210526201446.12554-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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: VYsmKzOtCjG4iuPw0eeOksY1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1622060794; bh=mFsMjStanVhdMrfd+jLlucy6MMt1MkFvg+inynMC1us=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=u2qhI8U8meUj+NO3KxnITGWGaHF4vNVgVatJo9+3X06Ibba/opT44fjOpL+m77Ugr32 QQ/3QJ0Z/vViyttP72t5Cj06L3DBRn/i+RRm2ylpD6o3wmEMzAa5EJAI4oHotbe3WOalD Wb61w33NXGutWAtPs1YdimWyZJFqgR8lLUc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Create an almost verbatim copy of the "OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf" driver for the OvmfXen platform. We're going to trim the driver in subsequent patches. Ultimately, the XenAcpiPlatformDxe driver will duplicate a negligible amount of code that is currently present in the QemuFwCfgAcpiPlatformDxe driver. List the new driver in "Maintainers.txt", in the "OvmfPkg: Xen-related modules" section. Switch the OvmfXen platform to the new driver at once. This patch should be reviewed with "git show --find-copies-harder". Cc: Andrew Fish Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Julien Grall Cc: Leif Lindholm Cc: Michael D Kinney Cc: Philippe Mathieu-Daud=C3=A9 Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2122 Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/OvmfXen.dsc = | 2 +- OvmfPkg/OvmfXen.fdf = | 2 +- OvmfPkg/{AcpiPlatformDxe/AcpiPlatformDxe.inf =3D> XenAcpiPlatformDxe/XenAc= piPlatformDxe.inf} | 7 ++++--- Maintainers.txt = | 1 + OvmfPkg/{AcpiPlatformDxe =3D> XenAcpiPlatformDxe}/AcpiPlatform.h = | 3 ++- OvmfPkg/{AcpiPlatformDxe =3D> XenAcpiPlatformDxe}/AcpiPlatform.c = | 3 ++- OvmfPkg/{AcpiPlatformDxe =3D> XenAcpiPlatformDxe}/BootScript.c = | 2 +- OvmfPkg/{AcpiPlatformDxe =3D> XenAcpiPlatformDxe}/EntryPoint.c = | 4 ++-- OvmfPkg/{AcpiPlatformDxe =3D> XenAcpiPlatformDxe}/PciDecoding.c = | 2 +- OvmfPkg/{AcpiPlatformDxe =3D> XenAcpiPlatformDxe}/Qemu.c = | 3 +-- OvmfPkg/{AcpiPlatformDxe =3D> XenAcpiPlatformDxe}/QemuFwCfgAcpi.c = | 2 +- OvmfPkg/{AcpiPlatformDxe =3D> XenAcpiPlatformDxe}/Xen.c = | 1 + 12 files changed, 18 insertions(+), 14 deletions(-) diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index e535503e385d..4d5171cd43c1 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -649,13 +649,13 @@ [Components] OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf =20 # # ACPI Support # MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf - OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf + OvmfPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf OvmfPkg/AcpiTables/AcpiTables.inf MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.= inf MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf =20 # diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index c7d4d1853027..85306245b50f 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -349,13 +349,13 @@ [FV.DXEFV] INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf =20 INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf =20 INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf -INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf +INF OvmfPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf INF RuleOverride=3DACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorD= xe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphics= ResourceTableDxe.inf =20 INF FatPkg/EnhancedFatDxe/Fat.inf diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/XenAcpiP= latformDxe/XenAcpiPlatformDxe.inf similarity index 85% copy from OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf copy to OvmfPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf index 77607298cbea..379b5d56d565 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/OvmfPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf @@ -1,18 +1,19 @@ ## @file -# OVMF ACPI Platform Driver +# OVMF ACPI Platform Driver for Xen guests # +# Copyright (C) 2021, Red Hat, Inc. # Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## =20 [Defines] INF_VERSION =3D 0x00010005 - BASE_NAME =3D AcpiPlatform - FILE_GUID =3D 49970331-E3FA-4637-9ABC-3B7868676970 + BASE_NAME =3D XenAcpiPlatform + FILE_GUID =3D fa0a48ac-767d-4c88-b70c-ec54c8b900c4 MODULE_TYPE =3D DXE_DRIVER VERSION_STRING =3D 1.0 ENTRY_POINT =3D AcpiPlatformEntryPoint =20 # # The following information is for reference only and not required by the = build tools. diff --git a/Maintainers.txt b/Maintainers.txt index cafe6b1ab85d..50c87d1ac29a 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -503,12 +503,13 @@ F: OvmfPkg/Library/XenRealTimeClockLib/ F: OvmfPkg/OvmfXen.* F: OvmfPkg/OvmfXenElfHeaderGenerator.c F: OvmfPkg/PlatformPei/MemDetect.c F: OvmfPkg/PlatformPei/Platform.* F: OvmfPkg/PlatformPei/Xen.* F: OvmfPkg/SmbiosPlatformDxe/*Xen.c +F: OvmfPkg/XenAcpiPlatformDxe/ F: OvmfPkg/XenBusDxe/ F: OvmfPkg/XenIoPciDxe/ F: OvmfPkg/XenIoPvhDxe/ F: OvmfPkg/XenPlatformPei/ F: OvmfPkg/XenPvBlkDxe/ F: OvmfPkg/XenResetVector/ diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/XenAcpiPlatfo= rmDxe/AcpiPlatform.h similarity index 91% copy from OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h copy to OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h index d98b79baab40..6259697c4b2d 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h +++ b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h @@ -1,9 +1,10 @@ /** @file - OVMF ACPI Platform Driver + OVMF ACPI Platform Driver for Xen guests =20 + Copyright (C) 2021, Red Hat, Inc. Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #ifndef ACPI_PLATFORM_H_ diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/XenAcpiPlatfo= rmDxe/AcpiPlatform.c similarity index 95% copy from OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c copy to OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c index efbbfab89d2b..2b2dc576754b 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c +++ b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c @@ -1,9 +1,10 @@ /** @file - OVMF ACPI Platform Driver + OVMF ACPI Platform Driver for Xen guests =20 + Copyright (C) 2021, Red Hat, Inc. Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include // ASSERT_EFI_ERROR() diff --git a/OvmfPkg/AcpiPlatformDxe/BootScript.c b/OvmfPkg/XenAcpiPlatform= Dxe/BootScript.c similarity index 96% copy from OvmfPkg/AcpiPlatformDxe/BootScript.c copy to OvmfPkg/XenAcpiPlatformDxe/BootScript.c index f2d1089e91ce..14d1e68694cb 100644 --- a/OvmfPkg/AcpiPlatformDxe/BootScript.c +++ b/OvmfPkg/XenAcpiPlatformDxe/BootScript.c @@ -1,11 +1,11 @@ /** @file Append an ACPI S3 Boot Script fragment from the QEMU_LOADER_WRITE_POINTER commands of QEMU's fully processed table linker/loader script. =20 - Copyright (C) 2017, Red Hat, Inc. + Copyright (C) 2017-2021, Red Hat, Inc. =20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 #include // CpuDeadLoop() #include // DEBUG() diff --git a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c b/OvmfPkg/XenAcpiPlatform= Dxe/EntryPoint.c similarity index 93% copy from OvmfPkg/AcpiPlatformDxe/EntryPoint.c copy to OvmfPkg/XenAcpiPlatformDxe/EntryPoint.c index bb5fe82c18d4..b6d0835fe3d4 100644 --- a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c +++ b/OvmfPkg/XenAcpiPlatformDxe/EntryPoint.c @@ -1,10 +1,10 @@ /** @file - Entry point of OVMF ACPI Platform Driver + Entry point of OVMF ACPI Platform Driver for Xen guests =20 - Copyright (C) 2015, Red Hat, Inc. + Copyright (C) 2015-2021, Red Hat, Inc. Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 #include // gRootBridgesConnectedE= ve... diff --git a/OvmfPkg/AcpiPlatformDxe/PciDecoding.c b/OvmfPkg/XenAcpiPlatfor= mDxe/PciDecoding.c similarity index 96% copy from OvmfPkg/AcpiPlatformDxe/PciDecoding.c copy to OvmfPkg/XenAcpiPlatformDxe/PciDecoding.c index 6ba4c936ad8e..00fc57eb13eb 100644 --- a/OvmfPkg/AcpiPlatformDxe/PciDecoding.c +++ b/OvmfPkg/XenAcpiPlatformDxe/PciDecoding.c @@ -1,11 +1,11 @@ /** @file Temporarily enable IO and MMIO decoding for all PCI devices while QEMU regenerates the ACPI tables. =20 - Copyright (C) 2016, Red Hat, Inc. + Copyright (C) 2016-2021, Red Hat, Inc. =20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 #include // DEBUG() #include // AllocatePool() diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/XenAcpiPlatformDxe/Qe= mu.c similarity index 96% copy from OvmfPkg/AcpiPlatformDxe/Qemu.c copy to OvmfPkg/XenAcpiPlatformDxe/Qemu.c index bdcc46b7186a..b4a407c41b71 100644 --- a/OvmfPkg/AcpiPlatformDxe/Qemu.c +++ b/OvmfPkg/XenAcpiPlatformDxe/Qemu.c @@ -1,13 +1,12 @@ /** @file OVMF ACPI QEMU support =20 + Copyright (C) 2012-2021, Red Hat, Inc. Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.
=20 - Copyright (C) 2012-2014, Red Hat, Inc. - SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include // EFI_ACPI_1_0_IO_APIC_STRUCTURE #include // CopyMem() diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/XenAcpiPlatf= ormDxe/QemuFwCfgAcpi.c similarity index 97% copy from OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c copy to OvmfPkg/XenAcpiPlatformDxe/QemuFwCfgAcpi.c index df800b149275..521c06cf546f 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/XenAcpiPlatformDxe/QemuFwCfgAcpi.c @@ -1,11 +1,11 @@ /** @file OVMF ACPI support using QEMU's fw-cfg interface =20 + Copyright (C) 2012-2021, Red Hat, Inc. Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.
- Copyright (C) 2012-2014, Red Hat, Inc. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include // EFI_ACPI_DESCRIPTION_HEAD= ER diff --git a/OvmfPkg/AcpiPlatformDxe/Xen.c b/OvmfPkg/XenAcpiPlatformDxe/Xen= .c similarity index 96% copy from OvmfPkg/AcpiPlatformDxe/Xen.c copy to OvmfPkg/XenAcpiPlatformDxe/Xen.c index be2c5d695846..e8395db548d9 100644 --- a/OvmfPkg/AcpiPlatformDxe/Xen.c +++ b/OvmfPkg/XenAcpiPlatformDxe/Xen.c @@ -1,9 +1,10 @@ /** @file OVMF ACPI Xen support =20 + Copyright (C) 2021, Red Hat, Inc. Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
Copyright (c) 2012, Bei Guan =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ --=20 2.19.1.3.g30247aa5d201 -=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 (#75680): https://edk2.groups.io/g/devel/message/75680 Mute This Topic: https://groups.io/mt/83110483/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-