OvmfPkg: Introduce PcdXenGrantFrames

Introduce PcdXenGrantFrames to replace a define in XenBusDxe and allow
the same value to be used in a different module.

The reason for the number of page to be 4 doesn't exist anymore, so
simply remove the comment.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20190813113119.14804-33-anthony.perard@citrix.com>

diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index 04d5e29272f1ef7581718be1390c8bfe22474a64..d5fee805ef4a12d7c469377be92b157c8d58e813 100644 (file)
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -225,6 +225,9 @@
   gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtr|0x0|UINT32|0x17\r
   gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtrSize|0x0|UINT32|0x32\r
 \r
+  ## Number of page frames to use for storing grant table entries.\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdXenGrantFrames|4|UINT32|0x33\r
+\r
 [PcdsDynamic, PcdsDynamicEx]\r
   gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent|0|UINT64|2\r
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable|FALSE|BOOLEAN|0x10\r

diff --git a/OvmfPkg/XenBusDxe/GrantTable.c b/OvmfPkg/XenBusDxe/GrantTable.c
index 6575e9b88c3af8151c9b163a5e944dfa2d388c26..1130404cd198469f3b4e49034518dfc5e9bd64a8 100644 (file)
--- a/OvmfPkg/XenBusDxe/GrantTable.c
+++ b/OvmfPkg/XenBusDxe/GrantTable.c
@@ -22,8 +22,7 @@
 \r
 #define NR_RESERVED_ENTRIES 8\r
 \r
-/* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */\r
-#define NR_GRANT_FRAMES 4\r
+#define NR_GRANT_FRAMES (FixedPcdGet32 (PcdXenGrantFrames))\r
 #define NR_GRANT_ENTRIES (NR_GRANT_FRAMES * EFI_PAGE_SIZE / sizeof(grant_entry_v1_t))\r
 \r
 STATIC grant_entry_v1_t *GrantTable = NULL;\r

diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.h b/OvmfPkg/XenBusDxe/XenBusDxe.h
index 8510361bca8637ea88a12d92f8c4674d844cc617..b1dcc3549c77793d9f20c82b98c381ab4bc6e5f2 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenBusDxe.h
+++ b/OvmfPkg/XenBusDxe/XenBusDxe.h
@@ -22,6 +22,7 @@
 #include <Library/UefiLib.h>\r
 #include <Library/DevicePathLib.h>\r
 #include <Library/DebugLib.h>\r
+#include <Library/PcdLib.h>\r
 \r
 \r
 //\r

diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.inf b/OvmfPkg/XenBusDxe/XenBusDxe.inf
index 86e0fb822445e4880d83e3ecdd3e2535f5aceb32..536b49fa8c35e935231559a8f4dd5c2abb28ca2b 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenBusDxe.inf
+++ b/OvmfPkg/XenBusDxe/XenBusDxe.inf
@@ -51,6 +51,7 @@
   XenHypercallLib\r
   SynchronizationLib\r
   PrintLib\r
+  PcdLib\r
 \r
 [Protocols]\r
   gEfiDriverBindingProtocolGuid\r
@@ -59,3 +60,5 @@
   gXenBusProtocolGuid\r
   gXenIoProtocolGuid\r
 \r
+[FixedPcd]\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdXenGrantFrames\r