diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2017-09-19 17:05:08 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2017-09-20 20:25:19 +0200 |
| commit | 947f3737abf65fda63f3ffd97fddfa6986986868 (patch) | |
| tree | af60b3953b895c6a1e5f0f36d92c08420325f4f2 /OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf | |
| parent | ce461ae240a72ff6b0d8a407f004c5db354d91ae (diff) | |
| download | edk2-947f3737abf65fda63f3ffd97fddfa6986986868.tar.gz edk2-947f3737abf65fda63f3ffd97fddfa6986986868.tar.bz2 edk2-947f3737abf65fda63f3ffd97fddfa6986986868.zip | |
OvmfPkg/QemuVideoDxe/VbeShim: handle PAM1 register on Q35 correctly
In commit db27e9f3d8f0 ("OvmfPkg/LegacyRegion: Support legacy region
manipulation of Q35", 2016-03-15), Ray extended the
OvmfPkg/Csm/CsmSupportLib PAM register manipulation to Q35. However, we
missed that the same should be done to the QemuVideoDxe VBE Shim as well.
The omission has caused no problems in practice on Q35, because QEMU has
let us write to the ROM area, regardless of the PAM1 setting, all this
time. This has now changed with recent QEMU commit 208fa0e43645 ("pc: make
'pc.rom' readonly when machine has PCI enabled", 2017-07-28). The QEMU
commit exposes the OVMF bug when Windows 7 is started on Q35, using QEMU
2.10 -- the VBE Shim is no longer put in place and Windows 7 cannot find
it.
To remedy this, assign the "Pam1Address" local variable a PciLib address
that matches the board type (i440fx vs. q35).
Regarding the PcdLib dependency: QemuVideoDxe already uses PcdLib, both
directly (see "PcdDriverSupportedEfiVersion") and indirectly (e.g. via the
DxePciLibI440FxQ35 PciLib instance). Add PcdLib to [LibraryClasses] for
completeness.
Cc: Aleksei Kovura <alex3kov@zoho.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Ref: https://bugs.launchpad.net/qemu/+bug/1715700
Reported-by: Aleksei Kovura <alex3kov@zoho.com>
Special-thanks-to: Gerd Hoffmann <kraxel@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Aleksei Kovura <alex3kov@zoho.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf')
| -rw-r--r-- | OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf index 7c7d429bca..577e07b0a8 100644 --- a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +++ b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf @@ -60,6 +60,7 @@ DebugLib
DevicePathLib
MemoryAllocationLib
+ PcdLib
PciLib
PrintLib
TimerLib
@@ -75,4 +76,4 @@ [Pcd]
gOptionRomPkgTokenSpaceGuid.PcdDriverSupportedEfiVersion
-
+ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
|