Re: [RFC PATCH 11/12] hvmloader: use libacpi to build MCFG table

[Alexey G <x1917x@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]

On Tue, 13 Mar 2018 04:33:56 +1000
Alexey Gerasimenko <x1917x@gmail.com> wrote:

>This patch extends hvmloader_acpi_build_tables() with code which
>detects if MMCONFIG is available -- i.e. initialized and enabled
>(+we're running on Q35), obtains its base address and size and asks
>libacpi to build MCFG table for it via setting the flag ACPI_HAS_MCFG
>in a manner similar to other optional ACPI tables building.
>
>Signed-off-by: Alexey Gerasimenko <x1917x@gmail.com>
>---
> tools/firmware/hvmloader/util.c | 70
> +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70
> insertions(+)

Looks like I missed the patch for reserving MMCONFIG area in E820 map,
it is required for Linux guests (otherwise MMCONFIG info will be
rejected by linux kernel). Windows guests allow to use MMCONFIG without
a corresponding E820 entry.

Following lines need to be added to /hvmloader/e820.c:

+    /* mark MMCONFIG area */
+    if ( is_mmconfig_used() )
+    {
+        e820[nr].addr = mmconfig_get_base();
+        e820[nr].size = mmconfig_get_size();
+        e820[nr].type = E820_RESERVED;
+        nr++;
+    }

The corresponding patch-file is attached, will include it in v2 patches.

[-- Attachment #2: hvmloader-mark-MMCONFIG-in-E820-map.patch --]
[-- Type: application/octet-stream, Size: 2522 bytes --]

From c16186e0c1ad388362f61136b8da2e02e76d1840 Mon Sep 17 00:00:00 2001
From: Alexey Gerasimenko <x1917x@gmail.com>
Date: Thu, 15 Mar 2018 03:06:39 +1000
Subject: [PATCH] hvmloader: mark MMCONFIG in E820 map

---
 tools/firmware/hvmloader/e820.c | 9 +++++++++
 tools/firmware/hvmloader/util.c | 6 +++---
 tools/firmware/hvmloader/util.h | 5 +++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tools/firmware/hvmloader/e820.c b/tools/firmware/hvmloader/e820.c
index 4d1c955a02..9cfe86e78e 100644
--- a/tools/firmware/hvmloader/e820.c
+++ b/tools/firmware/hvmloader/e820.c
@@ -233,6 +233,15 @@ int build_e820_table(struct e820entry *e820,
         nr++;
     }
 
+    /* mark MMCONFIG area */
+    if ( is_mmconfig_used() )
+    {
+        e820[nr].addr = mmconfig_get_base();
+        e820[nr].size = mmconfig_get_size();
+        e820[nr].type = E820_RESERVED;
+        nr++;
+    }
+
     /* Low RAM goes here. Reserve space for special pages. */
     BUG_ON(low_mem_end < MB(2));
 
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index c6fc81d52a..a32ada9613 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -788,7 +788,7 @@ int get_pc_machine_type(void)
 #define PCIEXBAR_LENGTH_BITS(reg)   (((reg) >> 1) & 3)
 #define PCIEXBAREN                  1
 
-static uint64_t mmconfig_get_base(void)
+uint64_t mmconfig_get_base(void)
 {
     uint64_t base;
     uint32_t reg = pci_readl(PCI_MCH_DEVFN, PCI_MCH_PCIEXBAR);
@@ -813,7 +813,7 @@ static uint64_t mmconfig_get_base(void)
     return base;
 }
 
-static uint32_t mmconfig_get_size(void)
+uint32_t mmconfig_get_size(void)
 {
     uint32_t reg = pci_readl(PCI_MCH_DEVFN, PCI_MCH_PCIEXBAR);
 
@@ -834,7 +834,7 @@ static uint32_t mmconfig_is_enabled(void)
     return pci_readl(PCI_MCH_DEVFN, PCI_MCH_PCIEXBAR) & PCIEXBAREN;
 }
 
-static int is_mmconfig_used(void)
+int is_mmconfig_used(void)
 {
     if (get_pc_machine_type() == MACHINE_TYPE_Q35)
     {
diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
index fd2d885c96..892ab3897a 100644
--- a/tools/firmware/hvmloader/util.h
+++ b/tools/firmware/hvmloader/util.h
@@ -296,6 +296,11 @@ struct acpi_config;
 void hvmloader_acpi_build_tables(struct acpi_config *config,
                                  unsigned int physical);
 
+/* MMCONFIG-related */
+uint64_t mmconfig_get_base(void);
+uint32_t mmconfig_get_size(void);
+int is_mmconfig_used(void);
+
 #endif /* __HVMLOADER_UTIL_H__ */
 
 /*
-- 
2.11.0


[-- Attachment #3: Type: text/plain, Size: 157 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel