From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com []) by mx.groups.io with SMTP id smtpd.web08.34931.1624204037148521455 for ; Sun, 20 Jun 2021 08:47:29 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: zhiguang.liu@intel.com) IronPort-SDR: pbc8LkjknTg8WUWvFdGL0xBT4+ifE8mjXI7i1xpL2QI+chatklLbp4k9KfZfcUReevsbUlJipQ e8bzniqmhx1Q== X-IronPort-AV: E=McAfee;i="6200,9189,10021"; a="194044457" X-IronPort-AV: E=Sophos;i="5.83,287,1616482800"; d="scan'208";a="194044457" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2021 08:47:28 -0700 IronPort-SDR: BXJAEOYuJMbKejgxvWYo7UacibEmtaTIg1l7oBrLDHPQ3sY42DWD7mL+99apxavCKEVO+8rJwg aNwOv7RaEOmQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,287,1616482800"; d="scan'208";a="451932680" Received: from fieedk002.ccr.corp.intel.com ([10.239.158.144]) by orsmga008.jf.intel.com with ESMTP; 20 Jun 2021 08:47:27 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Maurice Ma , Guo Dong , Benjamin You Subject: [PATCH 09/12] UefiPayloadPkg: Remove assert when reserve MMIO/IO resource for devices Date: Sun, 20 Jun 2021 23:46:59 +0800 Message-Id: <20210620154702.2681-10-zhiguang.liu@intel.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20210620154702.2681-1-zhiguang.liu@intel.com> References: <20210620154702.2681-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Cc: Guo Dong Cc: Benjamin You Signed-off-by: Zhiguang Liu --- UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c b/UefiPayloadPkg/Bl= SupportDxe/BlSupportDxe.c index ffd3427fb3..04e968a232 100644 --- a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c +++ b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c @@ -41,13 +41,12 @@ ReserveResourceInGcd ( );=0D if (EFI_ERROR (Status)) {=0D DEBUG ((=0D - DEBUG_ERROR,=0D + DEBUG_WARN,=0D "Failed to add memory space :0x%lx 0x%lx\n",=0D BaseAddress,=0D Length=0D ));=0D }=0D - ASSERT_EFI_ERROR (Status);=0D Status =3D gDS->AllocateMemorySpace (=0D EfiGcdAllocateAddress,=0D GcdType,=0D @@ -57,14 +56,20 @@ ReserveResourceInGcd ( ImageHandle,=0D NULL=0D );=0D - ASSERT_EFI_ERROR (Status);=0D } else {=0D Status =3D gDS->AddIoSpace (=0D GcdType,=0D BaseAddress,=0D Length=0D );=0D - ASSERT_EFI_ERROR (Status);=0D + if (EFI_ERROR (Status)) {=0D + DEBUG ((=0D + DEBUG_WARN,=0D + "Failed to add IO space :0x%lx 0x%lx\n",=0D + BaseAddress,=0D + Length=0D + ));=0D + }=0D Status =3D gDS->AllocateIoSpace (=0D EfiGcdAllocateAddress,=0D GcdType,=0D @@ -74,7 +79,6 @@ ReserveResourceInGcd ( ImageHandle,=0D NULL=0D );=0D - ASSERT_EFI_ERROR (Status);=0D }=0D return Status;=0D }=0D @@ -106,11 +110,9 @@ BlDxeEntryPoint ( //=0D // Report MMIO/IO Resources=0D //=0D - Status =3D ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo, 0= xFEC00000, SIZE_4KB, 0, ImageHandle); // IOAPIC=0D - ASSERT_EFI_ERROR (Status);=0D + ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo, 0xFEC00000, = SIZE_4KB, 0, ImageHandle); // IOAPIC=0D =0D - Status =3D ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo, 0= xFED00000, SIZE_1KB, 0, ImageHandle); // HPET=0D - ASSERT_EFI_ERROR (Status);=0D + ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo, 0xFED00000, = SIZE_1KB, 0, ImageHandle); // HPET=0D =0D //=0D // Find the frame buffer information and update PCDs=0D --=20 2.16.2.windows.1