]> git.proxmox.com Git - mirror_edk2.git/commitdiff
EmulatorPkg: Fix VS20xx IA32 boot failure
authorMichael D Kinney <michael.d.kinney@intel.com>
Tue, 6 Aug 2019 19:37:19 +0000 (12:37 -0700)
committerMichael D Kinney <michael.d.kinney@intel.com>
Mon, 19 Aug 2019 16:49:47 +0000 (09:49 -0700)
https://bugzilla.tianocore.org/show_bug.cgi?id=2056

The IA32 build of the EmulatorPkg for VS20xx does not boot
because the default value of PCD PcdPeiServicesTablePage
rarely succeeds to be mapped on IA32 Windows Host Environments.
Change the DEC default value for this PCD to a value that
is compatible with Windows and POSIX host environments for
IA32 and X64.  For IA32 builds, this 64-bit PCD is truncated
to a 32-bit value.

PcdPeiServicesTablePage is changed from 0x1003000000 to
0x1013000000.  With this new value, no boot failures are
observed.  However, the use of this hard coded value can
potentially cause a boot failure if this address specified
by the PCD is already allocated in the user process.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Andrew Fish <afish@apple.com>
EmulatorPkg/EmulatorPkg.dec

index c36f2c4186c54315554d5eca520e85c0538ed634..99250d9fe5b87e78c261d3565c84301cd21278b0 100644 (file)
@@ -2,7 +2,7 @@
 #\r
 # This is the Emu Emulation Environment Platform\r
 #\r
-# Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
 #\r
 #    SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -66,7 +66,7 @@
   gEmulatorPkgTokenSpaceGuid.PcdEmuApCount|L"0"|VOID*|0x00001019\r
 \r
   ## Magic page to implement PEI Services Table Pointer Lib\r
-  gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage|0x1003000000|UINT64|0x0000101b\r
+  gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage|0x1013000000|UINT64|0x0000101b\r
 \r
   ## Size of the packet filter\r
   gEmulatorPkgTokenSpaceGuid.PcdNetworkPacketFilterSize|524288|UINT32|0x0000101c\r