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 <ler...@redhat.com> > Cc: Star Zeng <star.z...@intel.com> > Cc: Feng Tian <feng.t...@intel.com> > Cc: Michael D Kinney <michael.d.kin...@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jeff Fan <jeff....@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 <ler...@redhat.com> Thanks! Laszlo _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
