[edk2-devel] [PATCH 09/12] UefiPayloadPkg: Remove assert when reserve MMIO/IO resource for devices

[Guo Dong]

Reviewed-by: Guo Dong <guo.dong at intel.com>

> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu at intel.com>
> Sent: Sunday, June 20, 2021 8:47 AM
> To: devel at edk2.groups.io
> Cc: Ma, Maurice <maurice.ma at intel.com>; Dong, Guo
> <guo.dong at intel.com>; You, Benjamin <benjamin.you at intel.com>
> Subject: [PATCH 09/12] UefiPayloadPkg: Remove assert when reserve
> MMIO/IO resource for devices
> 
> Some boot loader may already reserve MMIO/IO resource for IOAPIC and
> HPET,
> so remove the assert when reserve MMIO/IO resource for IOAPIC and HPET
> 
> Cc: Maurice Ma <maurice.ma at intel.com>
> Cc: Guo Dong <guo.dong at intel.com>
> Cc: Benjamin You <benjamin.you at intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu at intel.com>
> ---
>  UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c
> b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c
> index ffd3427fb3..04e968a232 100644
> --- a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c
> +++ b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c
> @@ -41,13 +41,12 @@ ReserveResourceInGcd (
>                      );
> 
>      if (EFI_ERROR (Status)) {
> 
>        DEBUG ((
> 
> -        DEBUG_ERROR,
> 
> +        DEBUG_WARN,
> 
>          "Failed to add memory space :0x%lx 0x%lx\n",
> 
>          BaseAddress,
> 
>          Length
> 
>          ));
> 
>      }
> 
> -    ASSERT_EFI_ERROR (Status);
> 
>      Status = gDS->AllocateMemorySpace (
> 
>                      EfiGcdAllocateAddress,
> 
>                      GcdType,
> 
> @@ -57,14 +56,20 @@ ReserveResourceInGcd (
>                      ImageHandle,
> 
>                      NULL
> 
>                      );
> 
> -    ASSERT_EFI_ERROR (Status);
> 
>    } else {
> 
>      Status = gDS->AddIoSpace (
> 
>                      GcdType,
> 
>                      BaseAddress,
> 
>                      Length
> 
>                      );
> 
> -    ASSERT_EFI_ERROR (Status);
> 
> +    if (EFI_ERROR (Status)) {
> 
> +      DEBUG ((
> 
> +        DEBUG_WARN,
> 
> +        "Failed to add IO space :0x%lx 0x%lx\n",
> 
> +        BaseAddress,
> 
> +        Length
> 
> +        ));
> 
> +    }
> 
>      Status = gDS->AllocateIoSpace (
> 
>                      EfiGcdAllocateAddress,
> 
>                      GcdType,
> 
> @@ -74,7 +79,6 @@ ReserveResourceInGcd (
>                      ImageHandle,
> 
>                      NULL
> 
>                      );
> 
> -    ASSERT_EFI_ERROR (Status);
> 
>    }
> 
>    return Status;
> 
>  }
> 
> @@ -106,11 +110,9 @@ BlDxeEntryPoint (
>    //
> 
>    // Report MMIO/IO Resources
> 
>    //
> 
> -  Status = ReserveResourceInGcd (TRUE,
> EfiGcdMemoryTypeMemoryMappedIo, 0xFEC00000, SIZE_4KB, 0,
> ImageHandle); // IOAPIC
> 
> -  ASSERT_EFI_ERROR (Status);
> 
> +  ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo,
> 0xFEC00000, SIZE_4KB, 0, ImageHandle); // IOAPIC
> 
> 
> 
> -  Status = ReserveResourceInGcd (TRUE,
> EfiGcdMemoryTypeMemoryMappedIo, 0xFED00000, SIZE_1KB, 0,
> ImageHandle); // HPET
> 
> -  ASSERT_EFI_ERROR (Status);
> 
> +  ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo,
> 0xFED00000, SIZE_1KB, 0, ImageHandle); // HPET
> 
> 
> 
>    //
> 
>    // Find the frame buffer information and update PCDs
> 
> --
> 2.16.2.windows.1



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