Changeset 106955 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 12, 2024 10:24:17 AM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165882

Message:

Main/SystemTableBuilder: Some fixes to the generated ACPI tables, MMIO ranges which are below 4GiB can be described in a 32 bit fixed memory range descriptor, set the maximum PCI bus number to what the ECAM region can describe, the TPM2 table holds the address to the CRB control request register and not the start of the TPM MMIO region, bugref:10732

File:

• trunk/src/VBox/Main/src-client/SystemTableBuilder.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-client/SystemTableBuilder.cpp

@@ -42 +42 @@
 
 /*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+
+/** Locality CRB request register. */
+#define TPM_CRB_LOCALITY_REG_CTRL_REQ                        0x40
+
+
+/*********************************************************************************************************************************
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
@@ -89 +97 @@
 
     RTAcpiResourceReset(hAcpiRes);
-    int vrc = RTAcpiResourceAddQWordMemoryRange(hAcpiRes, kAcpiResMemRangeCacheability_NonCacheable, kAcpiResMemType_Memory, true /*fRw*/,
+    int vrc;
+    if (u64AddrBase + cbMmio <= _4G)
+        vrc = RTAcpiResourceAdd32BitFixedMemoryRange(hAcpiRes, u64AddrBase, cbMmio, true /*fRw*/);
+    else
+        vrc = RTAcpiResourceAddQWordMemoryRange(hAcpiRes, kAcpiResMemRangeCacheability_NonCacheable, kAcpiResMemType_Memory, true /*fRw*/,
                                                 fAddrSpace, u64AddrBase, u64AddrBase + cbMmio - 1, 0 /*u64OffTrans*/, 0 /*u64Granularity*/,
                                                 cbMmio);
@@ -235 +247 @@
     ACPIRSDP Xsdp; RT_ZERO(Xsdp);
 
-    /* ACPI 1.0 part (RSDT) */
+    /* ACPI 1.0 part (RSDP) */
     memcpy(Xsdp.abSignature, "RSD PTR ", 8);
     memcpy(Xsdp.abOemId,     "ORCLVB", 6);
@@ -242 +254 @@
     Xsdp.bChkSum      = RTAcpiChecksumGenerate(&Xsdp, RT_OFFSETOF(ACPIRSDP, cbRsdp));
 
-    /* ACPI 2.0 part (XSDT) */
+    /* ACPI 2.0 part (XSDP) */
     Xsdp.cbRsdp       = RT_H2LE_U32(sizeof(ACPIRSDP));
     Xsdp.u64AddrXsdt  = RT_H2LE_U64(GCPhysXsdt);
@@ -348 +360 @@
 
     m_GCPhysPciMmioEcam = GCPhysMmioEcam; /* Need that for MCFG later. */
+    m_bPciBusMax        = 15; /** @todo Make parameter. */
 
     RTAcpiTblDeviceStartF(m_hAcpiDsdt, "%s%RX32", pSysTblDev->pszAcpiName, 0);
@@ -370 +383 @@
 
     RTAcpiResourceReset(m_hAcpiRes);
-    int vrc = RTAcpiResourceAddWordBusNumber(m_hAcpiRes, fAddrSpace, 0 /*u16BusMin*/, 0xff /*u16BusMax*/,
-                                             0 /*u16OffTrans*/, 0 /*u16Granularity*/, 256 /*u16Length*/);
+    int vrc = RTAcpiResourceAddWordBusNumber(m_hAcpiRes, fAddrSpace, 0 /*u16BusMin*/, m_bPciBusMax /*u16BusMax*/,
+                                             0 /*u16OffTrans*/, 0 /*u16Granularity*/, m_bPciBusMax + 1 /*u16Length*/);
     AssertRCReturn(vrc, vrc);
 
@@ -531 +544 @@
     pAlloc->u16PciSegGrpNr  = 0;
     pAlloc->bPciBusFirst    = 0;
-    pAlloc->bPciBusLast     = 0xff;
+    pAlloc->bPciBusLast     = m_bPciBusMax;
 
     /* Finalize the MADT. */
@@ -642 +655 @@
 
     Tpm2.u32StartMethod       = m_fCrb ? ACPITBL_TPM20_START_METHOD_CRB : ACPITBL_TPM20_START_METHOD_TIS12;
-    Tpm2.u64BaseAddrCrbOrFifo = m_GCPhysTpm20Mmio;
+    Tpm2.u64BaseAddrCrbOrFifo = m_fCrb ? m_GCPhysTpm20Mmio + TPM_CRB_LOCALITY_REG_CTRL_REQ : m_GCPhysTpm20Mmio;
     Tpm2.u16PlatCls           = ACPITBL_TPM20_PLAT_CLS_CLIENT;
 
@@ -679 +692 @@
     RTAcpiTblStringAppend(m_hAcpiDsdt, "TPM 2.0 Device");
 
+    RTAcpiTblNameAppend(m_hAcpiDsdt, "_UID");
+    RTAcpiTblIntegerAppend(m_hAcpiDsdt, 0);
+
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_CRS");
     int vrc = systemTableAcpiMmioDevResource(m_hAcpiDsdt, m_hAcpiRes, GCPhysMmioStart, cbMmio, u32Irq + GIC_INTID_RANGE_SPI_START);