2 files changed, 12 insertions, 0 deletions
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c
index af8dfd12..3f6dbcec 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c
@@ -164,6 +164,16 @@ PlatformPeim (
   }
 
   Value = 0;
+  Status = ReadGpioInput (Gpio, FixedPcdGet8 (PcdDeferBusMasterEnableGpioPin),
+             &Value);
+  if (!EFI_ERROR (Status) && Value != 0) {
+    DEBUG ((DEBUG_WARN, "%a: deferring PCI bus master enable to PciIo->Map() call\n",
+      __FUNCTION__));
+    Status = PcdSetBoolS (PcdDeferBusMasterEnableToPciIoMap, TRUE);
+    ASSERT_EFI_ERROR (Status);
+  }
+
+  Value = 0;
   Status = ReadGpioInput (Gpio, FixedPcdGet8 (PcdIgnoreFirstMemRegionGpioPin),
              &Value);
   if (!EFI_ERROR (Status) && Value != 0) {
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf
index c4e53767..53124527 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf
@@ -45,6 +45,7 @@
   gSynQuacerTokenSpaceGuid.PcdDramInfoBase
   gSynQuacerTokenSpaceGuid.PcdPcie0PresenceDetectGpioPin
   gSynQuacerTokenSpaceGuid.PcdIgnoreFirstMemRegionGpioPin
+  gSynQuacerTokenSpaceGuid.PcdDeferBusMasterEnableGpioPin
 
 [Ppis]
   gEdkiiEmbeddedGpioPpiGuid             ## CONSUMES
@@ -54,6 +55,7 @@
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize
   gSynQuacerTokenSpaceGuid.PcdPcieEnableMask
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDeferBusMasterEnableToPciIoMap
 
 [Depex]
   gEdkiiEmbeddedGpioPpiGuid