Cbmem pci rb info

DasharoPayloadPkg/BlSupportPei/BlSupportPei.c

@@ -352,8 +352,6 @@ MemInfoCallback (
         if (Size >= PEI_MEM_SIZE) {
           *UsableLowMemTop = Base + Size;
         }
-      } else {
-        Attribute &= ~EFI_RESOURCE_ATTRIBUTE_TESTED;
       }
       BuildResourceDescriptorHob (
         EFI_RESOURCE_SYSTEM_MEMORY,
@@ -689,6 +687,7 @@ BlPeiEntryPoint (
     (
     EFI_RESOURCE_ATTRIBUTE_PRESENT |
     EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
+    EFI_RESOURCE_ATTRIBUTE_TESTED |
     EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |
     EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |
     EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |
@@ -714,6 +713,8 @@ BlPeiEntryPoint (
     );
 
 
+  ParseRootBridgeInfo ();
+
   //
   // Parse memory info
   //
@@ -866,6 +867,21 @@ BlPeiEntryPoint (
     DEBUG ((DEBUG_INFO, "Create acpi board info guid hob\n"));
   }
 
+  //
+  // Reserve MMCONF range
+  //
+  BuildResourceDescriptorHob (
+    EFI_RESOURCE_MEMORY_RESERVED,
+    (
+    EFI_RESOURCE_ATTRIBUTE_PRESENT |
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
+    EFI_RESOURCE_ATTRIBUTE_TESTED |
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE
+    ),
+    AcpiBoardInfo.PcieBaseAddress,
+    AcpiBoardInfo.PcieBaseSize
+    );
+
   // Build SEC Performance Data Hob
   Status =   ParseTimestampTable(&Performance);
   if (!EFI_ERROR (Status)) {

DasharoPayloadPkg/Include/Coreboot.h

@@ -111,13 +111,14 @@ struct cb_memory_range {
   UINT32 type;
 };
 
-#define CB_MEM_RAM    1
-#define CB_MEM_RESERVED     2
-#define CB_MEM_ACPI   3
-#define CB_MEM_NVS    4
-#define CB_MEM_UNUSABLE     5
-#define CB_MEM_VENDOR_RSVD  6
-#define CB_MEM_TABLE       16
+#define CB_MEM_RAM           1
+#define CB_MEM_RESERVED      2
+#define CB_MEM_ACPI          3
+#define CB_MEM_NVS           4
+#define CB_MEM_UNUSABLE      5
+#define CB_MEM_VENDOR_RSVD   6
+#define CB_MEM_TABLE         16
+#define CB_MEM_SOFT_RESERVED 0xefffffff
 
 struct cb_memory {
   UINT32 tag;
@@ -257,11 +258,12 @@ struct cb_smmstorev2 {
 	UINT32 size;
 	UINT32 num_blocks;	/* Number of writeable blocks in SMM */
 	UINT32 block_size;	/* Size of a block in byte. Default: 64 KiB */
-	UINT32 mmap_addr;	/* MMIO address of the store for read only access */
+	UINT32 mmap_addr;	/* MMIO address of the store for read only access (deprecated)*/
 	UINT32 com_buffer;	/* Physical address of the communication buffer */
 	UINT32 com_buffer_size;	/* Size of the communication buffer in byte */
 	UINT8 apm_cmd;	/* The command byte to write to the APM I/O port */
 	UINT8 unused[3];	/* Set to zero */
+	UINT64 mmap_addr64;	/* MMIO address of the store for read only access */
 };
 
 #define CB_TAG_CBMEM_ENTRY      0x0031
@@ -847,4 +849,6 @@ struct tcg_efi_spec_id_event {
   /* UINT8 vendor_info[vendor_info_size]; */
 } __attribute__ ((packed));
 
+#define CB_TAG_RB_INFO  0x0048
+
 #endif // _COREBOOT_PEI_H_INCLUDED_

DasharoPayloadPkg/Include/Library/BlParseLib.h

@@ -267,4 +267,16 @@ ParseInfoString (
   IN UINTN  Id
   );
 
+/**
+  Find the RootBridge info.
+  @param  SmmStoreInfo       Pointer to the SMMSTORE_INFO structure
+  @retval RETURN_SUCCESS     Successfully find the Smm store buffer information.
+  @retval RETURN_NOT_FOUND   Failed to find the Smm store buffer information .
+**/
+RETURN_STATUS
+EFIAPI
+ParseRootBridgeInfo (
+  VOID
+  );
+
 #endif

DasharoPayloadPkg/Library/CbParseLib/CbParseLib.c

@@ -10,16 +10,21 @@
 **/
 
 #include <Uefi/UefiBaseType.h>
+#include <Uefi/UefiMultiPhase.h>
+#include <Pi/PiBootMode.h>
+#include <Pi/PiHob.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
+#include <Library/CpuLib.h>
+#include <Library/HobLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PciLib.h>
 #include <Library/IoLib.h>
 #include <Library/BlParseLib.h>
 #include <IndustryStandard/Acpi.h>
 #include <Coreboot.h>
-
+#include <UniversalPayload/PciRootBridges.h>
 
 /**
   Convert a packed value from cbuint64 to a UINT64 value.
@@ -398,7 +403,10 @@ ParseCbMemTable (
   return Status;
 }
 
-
+#define MSR_TOP_MEM 0xC001001A
+#define MSR_TOM2    0xC001001D
+#define TOLUD       0xBC
+#define TOUUD       0xA8
 
 /**
   Acquire the memory information from the coreboot table in memory.
@@ -421,9 +429,28 @@ ParseMemoryInfo (
   struct cb_memory_range   *Range;
   UINTN                    Index;
   MEMROY_MAP_ENTRY         MemoryMap;
-  UINT32                   Tolud;
+  MEMROY_MAP_ENTRY         NewMemoryMap;
+  UINT64                   Tolud;
+  UINT64                   Touud;
+  UINT64                   PcieBase;
+  UINT64                   PcieBaseEnd;
+
+  PcieBase = PcdGet64(PcdPciExpressBaseAddress);
+  PcieBaseEnd = PcieBase + PcdGet64(PcdPciExpressBaseSize);
+
+  Tolud = 0;
+  Touud = 0;
+
+  if (PciRead16(PCI_LIB_ADDRESS(0, 0, 0, 0x00)) == 0x8086) /* Intel */ {
+    Tolud = PciRead32(PCI_LIB_ADDRESS(0, 0, 0, TOLUD)) & 0xFFF00000;
+    Touud = PciRead32(PCI_LIB_ADDRESS(0, 0, 0, TOUUD)) & 0xFFF00000;
+    Touud |= RShiftU64(PciRead32(PCI_LIB_ADDRESS(0, 0, 0, TOUUD + 4)), 32);
+  } else if (PciRead16(PCI_LIB_ADDRESS(0, 0, 0, 0x00)) == 0x1022) /* AMD */ {
+    Tolud = AsmReadMsr64(MSR_TOP_MEM);
+    Touud = AsmReadMsr64(MSR_TOM2);
+  }
 
-  Tolud = PciRead32(PCI_LIB_ADDRESS(0,0,0,0xbc)) & 0xFFF00000;
+  DEBUG ((DEBUG_INFO, "Tolud: %016lx\nTouud: %016lx\n", Tolud, Touud));
 
   //
   // Get the coreboot memory table
@@ -447,13 +474,46 @@ ParseMemoryInfo (
       /* Only MMIO is marked reserved */
       case CB_MEM_RESERVED:
         /*
-         * Reserved memory Below TOLUD can't be MMIO except legacy VGA which
-         * is reported elsewhere as reserved.
+         * Reserved memory Below TOLUD/TOUUD can't be MMIO except legacy VGA
+         * which is reported elsewhere as reserved.
          */
-        if (MemoryMap.Base < Tolud) {
-          MemoryMap.Type = EFI_RESOURCE_MEMORY_RESERVED;
-          MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
+        if (MemoryMap.Base >= BASE_4GB && Touud != 0) {
+          if (MemoryMap.Base < Touud) {
+            MemoryMap.Type = EFI_RESOURCE_MEMORY_RESERVED;
+            MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
+          } else {
+            MemoryMap.Type = EFI_RESOURCE_MEMORY_MAPPED_IO;
+            MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
+          }
+        } else if (MemoryMap.Base < BASE_4GB && Tolud != 0) {
+          if (MemoryMap.Base < Tolud) {
+            /*
+             * Special case, coreboot tables live near TOLUD. Check if range
+             * needs splitting for reserved memory and MMIO.
+             */
+            if ((MemoryMap.Base + MemoryMap.Size) > Tolud) {
+              MemoryMap.Type = EFI_RESOURCE_MEMORY_RESERVED;
+              MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
+              MemoryMap.Size = Tolud - MemoryMap.Base;
+
+              DEBUG ((DEBUG_INFO, "%d. %016lx - %016lx [%02x]\n",
+                      Index, MemoryMap.Base, MemoryMap.Base + MemoryMap.Size - 1, MemoryMap.Type));
+              MemInfoCallback (&MemoryMap, Params);
+
+              MemoryMap.Base = Tolud;
+              MemoryMap.Size = cb_unpack64(Range->size) - MemoryMap.Size;
+              MemoryMap.Type = EFI_RESOURCE_MEMORY_MAPPED_IO;
+              MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
+            } else {
+              MemoryMap.Type = EFI_RESOURCE_MEMORY_RESERVED;
+              MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
+            }
+          } else {
+            MemoryMap.Type = EFI_RESOURCE_MEMORY_MAPPED_IO;
+            MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
+          }
         } else {
+          /* Fallback, if not Intel/AMD or TOLUD/TOUUD is zero, treat everything as MMIO */
           MemoryMap.Type = EFI_RESOURCE_MEMORY_MAPPED_IO;
           MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
         }
@@ -469,17 +529,48 @@ ParseMemoryInfo (
       /* ACPI/SMBIOS/CBMEM has it's own tag */
       case CB_MEM_ACPI:
       case CB_MEM_TABLE:
+      case CB_MEM_SOFT_RESERVED:
         MemoryMap.Type = EFI_RESOURCE_MEMORY_RESERVED;
         MemoryMap.Flag = EFI_RESOURCE_ATTRIBUTE_PRESENT;
         break;
       default:
         continue;
     }
 
-    DEBUG ((DEBUG_INFO, "%d. %016lx - %016lx [%02x]\n",
-            Index, MemoryMap.Base, MemoryMap.Base + MemoryMap.Size - 1, MemoryMap.Type));
+    /*
+     * PCIe MMCONF must be reserved, so override the type and split the range if needed.
+     */
+    if (MemoryMap.Base == PcieBase && (MemoryMap.Base + MemoryMap.Size) == PcieBaseEnd) {
+      /* Range exactly covers MMCONF, don't report it. It will be done later */
+      continue;
+    } else if (MemoryMap.Base <= PcieBase && (MemoryMap.Base + MemoryMap.Size) >= PcieBaseEnd) {
+      /* Range overlaps MMCONF */
+      if (MemoryMap.Base < PcieBase) {
+        NewMemoryMap.Base = MemoryMap.Base;
+        NewMemoryMap.Size = PcieBase - MemoryMap.Base;
+        NewMemoryMap.Type = MemoryMap.Type;
+        NewMemoryMap.Flag = MemoryMap.Flag;
+
+        DEBUG ((DEBUG_INFO, "%d. %016lx - %016lx [%02x]\n",
+                Index, NewMemoryMap.Base, NewMemoryMap.Base + NewMemoryMap.Size - 1, NewMemoryMap.Type));
+
+        MemInfoCallback (&NewMemoryMap, Params);
+      }
+      if ((MemoryMap.Base + MemoryMap.Size) > PcieBaseEnd) {
+        MemoryMap.Size -= (PcieBaseEnd - MemoryMap.Base);
+        MemoryMap.Base = PcieBaseEnd;
+
+        DEBUG ((DEBUG_INFO, "%d. %016lx - %016lx [%02x]\n",
+                Index, MemoryMap.Base, MemoryMap.Base + MemoryMap.Size - 1, MemoryMap.Type));
+
+        MemInfoCallback (&MemoryMap, Params);
+      }
+    } else {
+      DEBUG ((DEBUG_INFO, "%d. %016lx - %016lx [%02x]\n",
+              Index, MemoryMap.Base, MemoryMap.Base + MemoryMap.Size - 1, MemoryMap.Type));
 
-    MemInfoCallback (&MemoryMap, Params);
+      MemInfoCallback (&MemoryMap, Params);
+    }
   }
 
   return RETURN_SUCCESS;
@@ -674,9 +765,30 @@ ParseSMMSTOREInfo (
   SMMSTOREInfo->ComBufferSize = CbSSRec->com_buffer_size;
   SMMSTOREInfo->BlockSize = CbSSRec->block_size;
   SMMSTOREInfo->NumBlocks = CbSSRec->num_blocks;
-  SMMSTOREInfo->MmioAddress = CbSSRec->mmap_addr;
   SMMSTOREInfo->ApmCmd = CbSSRec->apm_cmd;
 
+  /*
+   * Detect if 64-bit mmap address is available by comapring the LB entry
+   * size. If the entry is smaller by the size of UINT64 than the new
+   * structure size, it means the MMIo is 32-bit, otherwise new structure is
+   * used and 64-bit address.
+   */
+  if (CbSSRec->size == (sizeof (struct cb_smmstorev2) - sizeof (UINT64))) {
+    if (CbSSRec->mmap_addr == 0) {
+      return RETURN_NO_MAPPING;
+    }
+    SMMSTOREInfo->MmioAddress = CbSSRec->mmap_addr;
+  } else {
+    SMMSTOREInfo->MmioAddress = CbSSRec->mmap_addr64;
+    /* If the map is not set, maybe 32-bit address is, try to use it */
+    if (CbSSRec->mmap_addr64 == 0) {
+      if (CbSSRec->mmap_addr == 0) {
+        return RETURN_NO_MAPPING;
+      }
+      SMMSTOREInfo->MmioAddress = CbSSRec->mmap_addr;
+    }
+  }
+
   return RETURN_SUCCESS;
 }
 
@@ -1166,3 +1278,48 @@ ParseInfoString (
 
   return (CONST CHAR8 *)CbString->string;
 }
+
+/**
+  Find the RootBridge info.
+  @param  SmmStoreInfo       Pointer to the SMMSTORE_INFO structure
+  @retval RETURN_SUCCESS     Successfully find the Smm store buffer information.
+  @retval RETURN_NOT_FOUND   Failed to find the Smm store buffer information .
+**/
+RETURN_STATUS
+EFIAPI
+ParseRootBridgeInfo (
+  VOID
+  )
+{
+  RETURN_STATUS                       Status;
+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES  *BlRootBridgesHob = NULL;
+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES  *PldRootBridgesHob;
+  struct cb_cbmem_ref  *CbMemRef;
+
+  Status           = RETURN_NOT_FOUND;
+  CbMemRef         = FindCbTag (CB_TAG_RB_INFO);
+
+  if (CbMemRef != NULL) {
+    BlRootBridgesHob = (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES *)(UINTN)CbMemRef->cbmem_addr;
+  }
+
+  if (BlRootBridgesHob != NULL) {
+    //
+    // Migrate bootloader root bridge info hob from bootloader to payload.
+    //
+    PldRootBridgesHob = BuildGuidHob (
+                          &gUniversalPayloadPciRootBridgeInfoGuid,
+                          BlRootBridgesHob->Header.Length
+                          );
+    ASSERT (PldRootBridgesHob != NULL);
+    if (PldRootBridgesHob != NULL) {
+      CopyMem (PldRootBridgesHob, BlRootBridgesHob, BlRootBridgesHob->Header.Length);
+      DEBUG ((DEBUG_INFO, "Create PCI root bridge info guid hob\n"));
+      Status = RETURN_SUCCESS;
+    } else {
+      Status = RETURN_OUT_OF_RESOURCES;
+    }
+  }
+
+  return Status;
+}

DasharoPayloadPkg/Library/CbParseLib/CbParseLib.inf

@@ -35,7 +35,14 @@
   DebugLib
   PcdLib
   PciLib
+  HobLib
+  CpuLib
 
 [Pcd]
   gDasharoPayloadPkgTokenSpaceGuid.PcdPayloadStackTop
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize
+
+[Guids]
+  gUniversalPayloadPciRootBridgeInfoGuid