[edk2-devel] [PATCH v1 1/1] OvmfPkg/Bhyve: don't exit early if RSDP is not found in memory

[Rebecca Cran]

Reviewed-by: Rebecca Cran <rebecca at bsdio.com>

On 9/7/23 02:34, Corvin Köhne wrote:
> If OVMF fails to find the RSDP in memory, it should fall back installing
> the statically provided ACPI tables.
>
> Signed-off-by: Corvin Köhne <corvink at FreeBSD.org>
> Cc: Ard Biesheuvel <ardb+tianocore at kernel.org>
> Cc: Jiewen Yao <jiewen.yao at intel.com>
> Cc: Jordan Justen <jordan.l.justen at intel.com>
> Cc: Gerd Hoffmann <kraxel at redhat.com>
> Cc: Rebecca Cran <rebecca at bsdio.com>
> Cc: Peter Grehan <grehan at freebsd.org>
> ---
>   OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c | 19 ++++++++-----------
>   1 file changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c
> index fb926a8bd803..57b1e7a99666 100644
> --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c
> +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c
> @@ -259,19 +259,17 @@ InstallAcpiTables (
>                BHYVE_BIOS_PHYSICAL_END,
>                &Rsdp
>                );
> -  if (EFI_ERROR (Status)) {
> -    return Status;
> -  }
> -
> -  Status = InstallAcpiTablesFromRsdp (
> -             AcpiTable,
> -             Rsdp
> -             );
>     if (!EFI_ERROR (Status)) {
> -    return EFI_SUCCESS;
> +    Status = InstallAcpiTablesFromRsdp (
> +               AcpiTable,
> +               Rsdp
> +               );
> +    if (!EFI_ERROR (Status)) {
> +      return EFI_SUCCESS;
> +    }
>     }
>   
> -  if (Status != EFI_NOT_FOUND) {
> +  if (EFI_ERROR (Status)) {
>       DEBUG (
>         (
>          DEBUG_WARN,
> @@ -280,7 +278,6 @@ InstallAcpiTables (
>          Status
>         )
>         );
> -    return Status;
>     }
>   
>     Status = InstallOvmfFvTables (AcpiTable);


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108448): https://edk2.groups.io/g/devel/message/108448
Mute This Topic: https://groups.io/mt/101210702/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-