JadePkg/Pcie: Enable Root Complex 6 by default

The USB issue was solved by updating ACPI IORT table. Enable this Root Complex to unlock VGA and USB port. Signed-off-by: Vu Nguyen <Vu@amperecomputing.com>
AmpereComputing · May 31, 2021 · e8db07a · e8db07a
1 parent 4fb650d
commit e8db07a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/Platform/Ampere/JadePkg/Jade.dsc b/Platform/Ampere/JadePkg/Jade.dsc
@@ -53,7 +53,7 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE
   DEFINE TPM2_ENABLE             = TRUE
   DEFINE INCLUDE_TFTP_COMMAND    = TRUE
-  DEFINE UEFI_UUID               = 84BC921F-9D4A-4D1D-A1A1-1AE13EDD07E5
+  DEFINE UEFI_UUID               = 27AF4DFF-028B-4237-80B9-828FA74132F4
 
   #
   # Network definition

diff --git a/Platform/Ampere/JadePkg/Library/PcieBoardLib/PcieBoard.c b/Platform/Ampere/JadePkg/Library/PcieBoardLib/PcieBoard.c
@@ -177,7 +177,7 @@ PcieBoardParseRCParams (
   VOID               *Hob;
   UINTN              BufferSize;
   PCIE_VARSTORE_DATA VarStoreConfig = {
-    .RCStatus = {TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE,
+    .RCStatus = {TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,
                  TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE},
     .RCBifurLo = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
     .RCBifurHi = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},

diff --git a/Platform/Ampere/JadePkg/Library/PcieBoardLib/PcieBoardScreen.c b/Platform/Ampere/JadePkg/Library/PcieBoardLib/PcieBoardScreen.c
@@ -493,11 +493,6 @@ PcieRCActiveDefaultSetting (
   VOID               *Hob;
   UINT32             Efuse;
 
-  // FIXME: Disable Root Complex 6 (USB and VGA) as default
-  if (RCIndex == 6) {
-    return FALSE;
-  }
-
   Hob = GetFirstGuidHob (&gPlatformHobGuid);
   if (Hob != NULL) {
     PlatformHob = (PLATFORM_INFO_HOB *)GET_GUID_HOB_DATA (Hob);
@@ -1195,10 +1190,6 @@ PcieBoardScreenInitialize (
       VarStoreConfig->RCStatus[RCIndex] = RC->Active;
       IsUpdated = TRUE;
     }
-    // FIXME: Disable Root Complex 6 (USB and VGA) as default
-    if (EFI_ERROR (Status) && RCIndex == 6) {
-      VarStoreConfig->RCStatus[RCIndex] = 0;
-    }
   }
 
   if (IsUpdated) {