From: "Fan, Jeff" <jeff.fan@intel.com>
To: Laszlo Ersek <lersek@redhat.com>,
"edk2-devel@ml01.01.org" <edk2-devel@ml01.01.org>
Cc: "Zeng, Star" <star.zeng@intel.com>,
"Tian, Feng" <feng.tian@intel.com>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Subject: Re: [PATCH] UefiCpuPkg/CpuDxe: Do not ASSERT on AllocateMemorySpace() error
Date: Mon, 27 Feb 2017 02:22:33 +0000 [thread overview]
Message-ID: <542CF652F8836A4AB8DBFAAD40ED192A4C5494BA@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <1c624860-9079-5c7a-9cfe-db4d3c8d34ec@redhat.com>
Yes. Some platform sets memory allocation HOB. It makes sense. So, I remove ASSERT() from the code.
-----Original Message-----
From: Laszlo Ersek [mailto:lersek@redhat.com]
Sent: Friday, February 24, 2017 5:44 PM
To: Fan, Jeff; edk2-devel@ml01.01.org
Cc: Zeng, Star; Tian, Feng; Kinney, Michael D
Subject: Re: [PATCH] UefiCpuPkg/CpuDxe: Do not ASSERT on AllocateMemorySpace() error
On 02/24/17 07:12, Jeff Fan wrote:
> Platform PEI may add LOCAL APIC memory mapped space into
> EFI_HOB_MEMORY_ALLOCATION. Or platform may allocate this range before.
>
> So, we skip AllocateMemorySpace()'s return status checking. Instead,
> we add one DEBUG message for possible trace.
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=390
>
> This updating is suggested by Ersek's comments at
> https://www.mail-archive.com/edk2-devel@lists.01.org/msg22585.html
>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Feng Tian <feng.tian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jeff Fan <jeff.fan@intel.com>
> ---
> UefiCpuPkg/CpuDxe/CpuDxe.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c
> index 2fd2f31..4a5e282 100644
> --- a/UefiCpuPkg/CpuDxe/CpuDxe.c
> +++ b/UefiCpuPkg/CpuDxe/CpuDxe.c
> @@ -1075,6 +1075,11 @@ AddLocalApicMemorySpace (
> Status = AddMemoryMappedIoSpace (BaseAddress, SIZE_4KB, EFI_MEMORY_UC);
> ASSERT_EFI_ERROR (Status);
>
> + //
> + // Try to allocate APIC memory mapped space, does not check return
> + // status because it may be allocated by other driver, or DXE Core
> + if // this range is built into Memory Allocation HOB.
> + //
> Status = gDS->AllocateMemorySpace (
> EfiGcdAllocateAddress,
> EfiGcdMemoryTypeMemoryMappedIo, @@ -1084,7 +1089,10
> @@ AddLocalApicMemorySpace (
> ImageHandle,
> NULL
> );
> - ASSERT_EFI_ERROR (Status);
> + if (EFI_ERROR (Status)) {
> + DEBUG ((DEBUG_INFO, "%a: %a: AllocateMemorySpace() Status - %r\n",
> + gEfiCallerBaseName, __FUNCTION__, Status));
> + }
> }
>
> /**
>
Did you actually hit the ASSERT on some platform soon after we discussed it? :) Either way,
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks!
Laszlo
prev parent reply other threads:[~2017-02-27 2:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 6:12 [PATCH] UefiCpuPkg/CpuDxe: Do not ASSERT on AllocateMemorySpace() error Jeff Fan
2017-02-24 6:13 ` Tian, Feng
2017-02-24 6:24 ` Zeng, Star
2017-02-24 9:43 ` Laszlo Ersek
2017-02-27 2:22 ` Fan, Jeff [this message]
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=542CF652F8836A4AB8DBFAAD40ED192A4C5494BA@shsmsx102.ccr.corp.intel.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