Fix bug that Duet BDS fail to get PciExpressAddress from guid hob.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7155 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index 5dfa016bbdf3740cbb03264c351891bc36b7dee9..f3fc39675705702589ebe2541c4ca0441eba3bc6 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -422,23 +422,16 @@ Returns:
   UINT32                                   Number;\r
   EFI_PEI_HOB_POINTERS                     GuidHob;\r
 \r
-  BufferSize = 0;\r
-  //\r
-  // Get Hob List from configuration table\r
-  //\r
-  GuidHob.Raw = GetHobList ();\r
-\r
   //\r
   // Get PciExpressAddressInfo Hob\r
   //\r
-  GuidHob.Raw = GetNextGuidHob (&gEfiPciExpressBaseAddressGuid, GuidHob.Raw);\r
-  if (GuidHob.Raw == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "Fail to get gEfiPciExpressBaseAddressGuid from GUID HOB\n"));\r
-    return 0;\r
-  }\r
-  PciExpressBaseAddressInfo = (EFI_PCI_EXPRESS_BASE_ADDRESS_INFORMATION *) GET_GUID_HOB_DATA (GuidHob.Guid);\r
-  if (PciExpressBaseAddressInfo == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "Fail to get gEfiPciExpressBaseAddressGuid from GUID HOB\n"));\r
+  PciExpressBaseAddressInfo = NULL;\r
+  BufferSize                = 0;\r
+  GuidHob.Raw = GetFirstGuidHob (&gEfiPciExpressBaseAddressGuid);\r
+  if (GuidHob.Raw != NULL) {\r
+    PciExpressBaseAddressInfo = GET_GUID_HOB_DATA (GuidHob.Guid);\r
+    BufferSize                = GET_GUID_HOB_DATA_SIZE (GuidHob.Guid);\r
+  } else {\r
     return 0;\r
   }\r
 \r
@@ -456,7 +449,7 @@ Returns:
   //\r
   // Do not find the PciExpress Base Address in the Hob\r
   //\r
-  return 0;\r
+  return 0;  \r
 }\r
 \r
 VOID\r
@@ -469,7 +462,9 @@ PatchPciRootBridgeDevicePath (
   UINT64  PciExpressBase;\r
 \r
   PciExpressBase = GetPciExpressBaseAddressForRootBridge (HostBridgeNumber, RootBridgeNumber);\r
-\r
+  \r
+  DEBUG ((EFI_D_INFO, "Get PciExpress Address from Hob: 0x%X\n", PciExpressBase));\r
+  \r
   if (PciExpressBase != 0) {\r
     RootBridge->PciRootBridge.HID = EISA_PNP_ID(0x0A08);\r
   }\r
@@ -514,6 +509,8 @@ Returns:
                   &gPlatformRootBridges[0], \r
                   &RootHandle\r
                   );\r
+  DEBUG ((EFI_D_INFO, "Pci Root bridge handle is 0x%X\n", RootHandle));\r
+  \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r