Hi Ard, Leif, Do you see any issues with this migration?
Thanks! Sunil On Sun, Jan 29, 2023 at 12:47:58AM +0530, Sunil V L via groups.io wrote: > 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+tianoc...@kernel.org> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Signed-off-by: Sunil V L <suni...@ventanamicro.com> > --- > ArmVirtPkg/ArmVirtPkg.dec | 9 > --------- > OvmfPkg/OvmfPkg.dec | 7 > +++++++ > {ArmVirtPkg => OvmfPkg}/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf | 3 +-- > {ArmVirtPkg => OvmfPkg}/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c | 0 > 4 files changed, 8 insertions(+), 11 deletions(-) > > diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec > index 89d21ec3a364..4645c91a8375 100644 > --- a/ArmVirtPkg/ArmVirtPkg.dec > +++ b/ArmVirtPkg/ArmVirtPkg.dec > @@ -34,8 +34,6 @@ [Guids.common] > 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 @@ [PcdsFixedAtBuild, PcdsPatchableInModule] > # 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/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec > index a22eb246c625..e52602db5b79 100644 > --- a/OvmfPkg/OvmfPkg.dec > +++ b/OvmfPkg/OvmfPkg.dec > @@ -157,6 +157,7 @@ [Guids] > gVMMBootOrderGuid = {0x668f4529, 0x63d0, 0x4bb5, > {0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}} > gUefiOvmfPkgTdxAcpiHobGuid = {0x6a0c5870, 0xd4ed, 0x44f4, > {0xa1, 0x35, 0xdd, 0x23, 0x8b, 0x6f, 0x0c, 0x8d}} > gEfiNonCcFvGuid = {0xae047c6d, 0xbce9, 0x426c, > {0xae, 0x03, 0xa6, 0x8e, 0x3b, 0x8a, 0x04, 0x88}} > + gOvmfVariableGuid = {0x50bea1e5, 0xa2c5, 0x46e9, > {0x9b, 0x3a, 0x59, 0x59, 0x65, 0x16, 0xb0, 0x0a}} > > [Ppis] > # PPI whose presence in the PPI database signals that the TPM base address > @@ -463,6 +464,12 @@ [PcdsDynamic, PcdsDynamicEx] > # 2 - set by GOP Driver. > gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0|UINT8|0x64 > > + # > + # Whether to force disable ACPI, regardless of the fw_cfg settings > + # exposed by QEMU > + # > + gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|0x0|BOOLEAN|0x69 > + > [PcdsFeatureFlag] > gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE|BOOLEAN|0x1c > > gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|BOOLEAN|0x1d > diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > b/OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > similarity index 89% > rename from ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > rename to OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > index e900aa992661..85873f73b2eb 100644 > --- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > +++ b/OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > @@ -19,7 +19,6 @@ [Sources] > PlatformHasAcpiDtDxe.c > > [Packages] > - ArmVirtPkg/ArmVirtPkg.dec > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > @@ -38,7 +37,7 @@ [Guids] > gEdkiiPlatformHasDeviceTreeGuid ## SOMETIMES_PRODUCES ## PROTOCOL > > [Pcd] > - gArmVirtTokenSpaceGuid.PcdForceNoAcpi > + gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi > > [Depex] > gEfiVariableArchProtocolGuid > diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c > b/OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c > similarity index 100% > rename from ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c > rename to OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c > -- > 2.38.0 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#99305): https://edk2.groups.io/g/devel/message/99305 Mute This Topic: https://groups.io/mt/96627737/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
