From: "Guo Dong" <guo.dong@intel.com>
To: "Liu, Zhiguang" <zhiguang.liu@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Ma, Maurice" <maurice.ma@intel.com>,
"You, Benjamin" <benjamin.you@intel.com>
Subject: Re: [PATCH 09/12] UefiPayloadPkg: Remove assert when reserve MMIO/IO resource for devices
Date: Tue, 22 Jun 2021 22:51:35 +0000 [thread overview]
Message-ID: <BYAPR11MB3622C3C2DFA3E706A17236349E099@BYAPR11MB3622.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20210620154702.2681-10-zhiguang.liu@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>
> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu@intel.com>
> Sent: Sunday, June 20, 2021 8:47 AM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Dong, Guo
> <guo.dong@intel.com>; You, Benjamin <benjamin.you@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@intel.com>
> Cc: Guo Dong <guo.dong@intel.com>
> Cc: Benjamin You <benjamin.you@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@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
next prev parent reply other threads:[~2021-06-22 22:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-20 15:46 [PATCH 00/12] Enable Universal Payload in UefiPayloadPkg Zhiguang Liu
2021-06-20 15:46 ` [PATCH 01/12] UefiPayloadPkg: Add HobLib for UniversalPayload Zhiguang Liu
2021-06-22 22:48 ` Guo Dong
2021-06-20 15:46 ` [PATCH 02/12] MdeModulePkg: Add new structure for the Universal Payload Serial Port Info Zhiguang Liu
2021-06-21 11:09 ` Wu, Hao A
2021-06-20 15:46 ` [PATCH 03/12] UefiPayloadPkg: Add a separate PlatformHookLib for Universal Payload Zhiguang Liu
2021-06-22 22:48 ` Guo Dong
2021-06-20 15:46 ` [PATCH 04/12] UefiPayloadPkg: Update the function definition of HobConstructor Zhiguang Liu
2021-06-22 22:48 ` Guo Dong
2021-06-20 15:46 ` [PATCH 05/12] UefiPayloadPkg: Create separate Payload Entry for UniversalPayload Zhiguang Liu
2021-06-22 22:50 ` Guo Dong
2021-06-20 15:46 ` [PATCH 06/12] UefiPayloadPkg: Get and enter DxeCore for Universal Payload Zhiguang Liu
2021-06-22 22:50 ` Guo Dong
2021-06-20 15:46 ` [PATCH 07/12] UefiPayloadPkg: Fix up UPL Pcd database Zhiguang Liu
2021-06-22 22:49 ` Guo Dong
2021-06-20 15:46 ` [PATCH 08/12] UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc Zhiguang Liu
2021-06-22 22:51 ` Guo Dong
2021-06-20 15:46 ` [PATCH 09/12] UefiPayloadPkg: Remove assert when reserve MMIO/IO resource for devices Zhiguang Liu
2021-06-22 22:51 ` Guo Dong [this message]
2021-06-20 15:47 ` [PATCH 10/12] UefiPayloadPkg: Add macro to disable some drivers Zhiguang Liu
2021-06-22 22:49 ` Guo Dong
2021-06-20 15:47 ` [PATCH 11/12] UefiPayloadPkg: Add PcdInstallAcpiSdtProtocol feature in UefiPayloadPkg Zhiguang Liu
2021-06-22 22:52 ` Guo Dong
2021-06-20 15:47 ` [PATCH 12/12] UefiPayloadPkg: Add PcdResetOnMemoryTypeInformationChange " Zhiguang Liu
2021-06-22 22:51 ` Guo Dong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BYAPR11MB3622C3C2DFA3E706A17236349E099@BYAPR11MB3622.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox