summaryrefslogtreecommitdiffstats
path: root/ArmVirtPkg
diff options
context:
space:
mode:
authorSunil V L <sunilvl@ventanamicro.com>2022-09-21 06:36:37 +0530
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-02-16 05:53:28 +0000
commit09cd17b0deef4920a1845f70b0e4859f57726e6a (patch)
tree60595c05ce73d0c9ac088c780d1659ae74834d5a /ArmVirtPkg
parenta7dec790dc11427abc841d5a938df3319aad07fb (diff)
downloadedk2-09cd17b0deef4920a1845f70b0e4859f57726e6a.tar.gz
edk2-09cd17b0deef4920a1845f70b0e4859f57726e6a.tar.bz2
edk2-09cd17b0deef4920a1845f70b0e4859f57726e6a.zip
ArmVirtPkg/PlatformHasAcpiDtDxe: Move to OvmfPkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4076 This module is required by other architectures like RISC-V. Hence, move this to OvmfPkg. Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> Reviewed-by: Andrei Warkentin <andrei.warkentin@intel.com>
Diffstat (limited to 'ArmVirtPkg')
-rw-r--r--ArmVirtPkg/ArmVirtPkg.dec9
-rw-r--r--ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c83
-rw-r--r--ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf44
3 files changed, 0 insertions, 136 deletions
diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
index 89d21ec3a3..4645c91a83 100644
--- a/ArmVirtPkg/ArmVirtPkg.dec
+++ b/ArmVirtPkg/ArmVirtPkg.dec
@@ -34,8 +34,6 @@
gEarly16550UartBaseAddressGuid = { 0xea67ca3e, 0x1f54, 0x436b, { 0x97, 0x88, 0xd4, 0xeb, 0x29, 0xc3, 0x42, 0x67 } }
gArmVirtSystemMemorySizeGuid = { 0x504eccb9, 0x1bf0, 0x4420, { 0x86, 0x5d, 0xdc, 0x66, 0x06, 0xd4, 0x13, 0xbf } }
- gArmVirtVariableGuid = { 0x50bea1e5, 0xa2c5, 0x46e9, { 0x9b, 0x3a, 0x59, 0x59, 0x65, 0x16, 0xb0, 0x0a } }
-
[PcdsFeatureFlag]
#
# Feature Flag PCD that defines whether TPM2 support is enabled
@@ -69,10 +67,3 @@
# Cloud Hypervisor has no other way to pass Rsdp address to the guest except use a PCD.
#
gArmVirtTokenSpaceGuid.PcdCloudHvAcpiRsdpBaseAddress|0x0|UINT64|0x00000005
-
-[PcdsDynamic]
- #
- # Whether to force disable ACPI, regardless of the fw_cfg settings
- # exposed by QEMU
- #
- gArmVirtTokenSpaceGuid.PcdForceNoAcpi|0x0|BOOLEAN|0x00000003
diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c
deleted file mode 100644
index 952d9bfc1f..0000000000
--- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/** @file
- Decide whether the firmware should expose an ACPI- and/or a Device Tree-based
- hardware description to the operating system.
-
- Copyright (c) 2017, Red Hat, Inc.
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-**/
-
-#include <Guid/PlatformHasAcpi.h>
-#include <Guid/PlatformHasDeviceTree.h>
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
-#include <Library/QemuFwCfgLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-
-EFI_STATUS
-EFIAPI
-PlatformHasAcpiDt (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
- )
-{
- EFI_STATUS Status;
- FIRMWARE_CONFIG_ITEM FwCfgItem;
- UINTN FwCfgSize;
-
- //
- // If we fail to install any of the necessary protocols below, the OS will be
- // unbootable anyway (due to lacking hardware description), so tolerate no
- // errors here.
- //
- if ((MAX_UINTN == MAX_UINT64) &&
- !PcdGetBool (PcdForceNoAcpi) &&
- !EFI_ERROR (
- QemuFwCfgFindFile (
- "etc/table-loader",
- &FwCfgItem,
- &FwCfgSize
- )
- ))
- {
- //
- // Only make ACPI available on 64-bit systems, and only if QEMU generates
- // (a subset of) the ACPI tables.
- //
- Status = gBS->InstallProtocolInterface (
- &ImageHandle,
- &gEdkiiPlatformHasAcpiGuid,
- EFI_NATIVE_INTERFACE,
- NULL
- );
- if (EFI_ERROR (Status)) {
- goto Failed;
- }
-
- return Status;
- }
-
- //
- // Expose the Device Tree otherwise.
- //
- Status = gBS->InstallProtocolInterface (
- &ImageHandle,
- &gEdkiiPlatformHasDeviceTreeGuid,
- EFI_NATIVE_INTERFACE,
- NULL
- );
- if (EFI_ERROR (Status)) {
- goto Failed;
- }
-
- return Status;
-
-Failed:
- ASSERT_EFI_ERROR (Status);
- CpuDeadLoop ();
- //
- // Keep compilers happy.
- //
- return Status;
-}
diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
deleted file mode 100644
index e900aa9926..0000000000
--- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
+++ /dev/null
@@ -1,44 +0,0 @@
-## @file
-# Decide whether the firmware should expose an ACPI- and/or a Device Tree-based
-# hardware description to the operating system.
-#
-# Copyright (c) 2017, Red Hat, Inc.
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-
-[Defines]
- INF_VERSION = 1.25
- BASE_NAME = PlatformHasAcpiDtDxe
- FILE_GUID = 9d1dd27f-6d7f-427b-aec4-b62f6279c2f1
- MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
- ENTRY_POINT = PlatformHasAcpiDt
-
-[Sources]
- PlatformHasAcpiDtDxe.c
-
-[Packages]
- ArmVirtPkg/ArmVirtPkg.dec
- EmbeddedPkg/EmbeddedPkg.dec
- MdeModulePkg/MdeModulePkg.dec
- MdePkg/MdePkg.dec
- OvmfPkg/OvmfPkg.dec
-
-[LibraryClasses]
- BaseLib
- DebugLib
- PcdLib
- QemuFwCfgLib
- UefiBootServicesTableLib
- UefiDriverEntryPoint
-
-[Guids]
- gEdkiiPlatformHasAcpiGuid ## SOMETIMES_PRODUCES ## PROTOCOL
- gEdkiiPlatformHasDeviceTreeGuid ## SOMETIMES_PRODUCES ## PROTOCOL
-
-[Pcd]
- gArmVirtTokenSpaceGuid.PcdForceNoAcpi
-
-[Depex]
- gEfiVariableArchProtocolGuid