|
 |
7fdf80 |
From d362291ada9ee22316e3c069dc788c4c801b0796 Mon Sep 17 00:00:00 2001
|
|
|
7fdf80 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
7fdf80 |
Date: Tue, 4 Jun 2019 11:06:44 +0200
|
|
|
7fdf80 |
Subject: [PATCH 2/3] OvmfPkg: raise the PCIEXBAR base to 2816 MB on Q35
|
|
|
7fdf80 |
MIME-Version: 1.0
|
|
|
7fdf80 |
Content-Type: text/plain; charset=UTF-8
|
|
|
7fdf80 |
Content-Transfer-Encoding: 8bit
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Message-id: <20190604090645.2847-3-lersek@redhat.com>
|
|
|
7fdf80 |
Patchwork-id: 88481
|
|
|
7fdf80 |
O-Subject: [RHEL-8.1.0 edk2 PATCH v2 2/3] OvmfPkg: raise the PCIEXBAR base to
|
|
|
7fdf80 |
2816 MB on Q35
|
|
|
7fdf80 |
Bugzilla: 1666941
|
|
|
7fdf80 |
Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
7fdf80 |
Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
7fdf80 |
|
|
|
7fdf80 |
(This is a replacement for commit 75136b29541b, "OvmfPkg/PlatformPei:
|
|
|
7fdf80 |
reorder the 32-bit PCI window vs. the PCIEXBAR on q35", 2019-05-16).
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Commit 7b8fe63561b4 ("OvmfPkg: PlatformPei: enable PCIEXBAR (aka MMCONFIG
|
|
|
7fdf80 |
/ ECAM) on Q35", 2016-03-10) claimed that,
|
|
|
7fdf80 |
|
|
|
7fdf80 |
On Q35 machine types that QEMU intends to support in the long term, QEMU
|
|
|
7fdf80 |
never lets the RAM below 4 GB exceed 2 GB.
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Alas, this statement came from a misunderstanding that occurred while we
|
|
|
7fdf80 |
worked out the interface contract. In fact QEMU does allow the 32-bit RAM
|
|
|
7fdf80 |
extend up to 0xB000_0000 (exclusive), in case the RAM size falls in the
|
|
|
7fdf80 |
range (0x8000_0000, 0xB000_0000) (i.e., the RAM size is greater than
|
|
|
7fdf80 |
2048MB and smaller than 2816MB).
|
|
|
7fdf80 |
|
|
|
7fdf80 |
In turn, such a RAM size (justifiedly) triggers
|
|
|
7fdf80 |
|
|
|
7fdf80 |
ASSERT (TopOfLowRam <= PciExBarBase);
|
|
|
7fdf80 |
|
|
|
7fdf80 |
in MemMapInitialization(), because we placed the 256MB PCIEXBAR at
|
|
|
7fdf80 |
0x8000_0000 (2GB) exactly, relying on the interface contract. (And, the
|
|
|
7fdf80 |
32-bit PCI window would follow the PCIEXBAR, covering the [0x9000_0000,
|
|
|
7fdf80 |
0xFC00_0000) range.)
|
|
|
7fdf80 |
|
|
|
7fdf80 |
In order to fix this, place the PCIEXBAR at 2816MB (0xB000_0000), and
|
|
|
7fdf80 |
start the 32-bit PCI window at 3 GB (0xC000_0000). This shrinks the 32-bit
|
|
|
7fdf80 |
PCI window to
|
|
|
7fdf80 |
|
|
|
7fdf80 |
0xFC00_0000 - 0xC000_0000 = 0x3C00_0000 = 960 MB.
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
|
7fdf80 |
Cc: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
7fdf80 |
Cc: Jordan Justen <jordan.l.justen@intel.com>
|
|
|
7fdf80 |
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1859
|
|
|
7fdf80 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
7fdf80 |
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
|
|
|
7fdf80 |
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
|
7fdf80 |
(cherry picked from commit b07de0974b65a6a393c2d477427d1d6c7acce002)
|
|
|
7fdf80 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
7fdf80 |
---
|
|
|
7fdf80 |
OvmfPkg/OvmfPkgIa32.dsc | 4 ++--
|
|
|
7fdf80 |
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++--
|
|
|
7fdf80 |
OvmfPkg/OvmfPkgX64.dsc | 4 ++--
|
|
|
7fdf80 |
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
7fdf80 |
|
|
|
7fdf80 |
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
7fdf80 |
index bbf5e38..cf5f2ea 100644
|
|
|
7fdf80 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
7fdf80 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
7fdf80 |
@@ -497,8 +497,8 @@
|
|
|
7fdf80 |
# the PCIEXBAR register.
|
|
|
7fdf80 |
#
|
|
|
7fdf80 |
# On Q35 machine types that QEMU intends to support in the long term, QEMU
|
|
|
7fdf80 |
- # never lets the RAM below 4 GB exceed 2 GB.
|
|
|
7fdf80 |
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x80000000
|
|
|
7fdf80 |
+ # never lets the RAM below 4 GB exceed 2816 MB.
|
|
|
7fdf80 |
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000
|
|
|
7fdf80 |
|
|
|
7fdf80 |
!ifdef $(SOURCE_DEBUG_ENABLE)
|
|
|
7fdf80 |
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2
|
|
|
7fdf80 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
7fdf80 |
index 3ec1b91..5a24065 100644
|
|
|
7fdf80 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
7fdf80 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
7fdf80 |
@@ -502,8 +502,8 @@
|
|
|
7fdf80 |
# the PCIEXBAR register.
|
|
|
7fdf80 |
#
|
|
|
7fdf80 |
# On Q35 machine types that QEMU intends to support in the long term, QEMU
|
|
|
7fdf80 |
- # never lets the RAM below 4 GB exceed 2 GB.
|
|
|
7fdf80 |
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x80000000
|
|
|
7fdf80 |
+ # never lets the RAM below 4 GB exceed 2816 MB.
|
|
|
7fdf80 |
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000
|
|
|
7fdf80 |
|
|
|
7fdf80 |
!ifdef $(SOURCE_DEBUG_ENABLE)
|
|
|
7fdf80 |
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2
|
|
|
7fdf80 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
7fdf80 |
index ea54b4b..6ab50c9 100644
|
|
|
7fdf80 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
7fdf80 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
7fdf80 |
@@ -502,8 +502,8 @@
|
|
|
7fdf80 |
# the PCIEXBAR register.
|
|
|
7fdf80 |
#
|
|
|
7fdf80 |
# On Q35 machine types that QEMU intends to support in the long term, QEMU
|
|
|
7fdf80 |
- # never lets the RAM below 4 GB exceed 2 GB.
|
|
|
7fdf80 |
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x80000000
|
|
|
7fdf80 |
+ # never lets the RAM below 4 GB exceed 2816 MB.
|
|
|
7fdf80 |
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000
|
|
|
7fdf80 |
|
|
|
7fdf80 |
!ifdef $(SOURCE_DEBUG_ENABLE)
|
|
|
7fdf80 |
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2
|
|
|
7fdf80 |
--
|
|
|
7fdf80 |
1.8.3.1
|
|
|
7fdf80 |
|