Changeset 82410 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 5, 2019 12:06:44 PM (5 years ago)

Author:

vboxsync

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

135247

Message:

ACPI/Main: Report NVMe controller in ACPI tables to convince OS X it's an internal (built-in) device. Largely cosmetic.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (6 diffs)
• vbox.dsl (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -195 +195 @@
     SYSTEM_INFO_INDEX_PARALLEL1_IRQ     = 29,
     SYSTEM_INFO_INDEX_PREF64_MEMORY_MAX = 30,
-    SYSTEM_INFO_INDEX_END               = 31,
+    SYSTEM_INFO_INDEX_NVME_ADDRESS      = 31, /**< First NVMe controller PCI address, or 0 */
+    SYSTEM_INFO_INDEX_END               = 32,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -365 +366 @@
     /** Primary NIC PCI address. */
     uint32_t            u32NicPciAddress;
-    /** Primary audio card PCI address. */
+    /** HD Audio PCI address. */
     uint32_t            u32AudioPciAddress;
+    /** Primary NVMe controller PCI address. */
+    uint32_t            u32NvmePciAddress;
     /** Flag whether S1 power state is enabled. */
     bool                fS1Enabled;
@@ -1439 +1442 @@
             break;
 
+        case SYSTEM_INFO_INDEX_NVME_ADDRESS:
+            *pu32 = pThis->u32NvmePciAddress;
+            break;
+
         case SYSTEM_INFO_INDEX_POWER_STATES:
             *pu32 = RT_BIT(0) | RT_BIT(5);  /* S1 and S5 always exposed */
@@ -1447 +1454 @@
             break;
 
-       case SYSTEM_INFO_INDEX_IOC_ADDRESS:
+        case SYSTEM_INFO_INDEX_IOC_ADDRESS:
             *pu32 = pThis->u32IocPciAddress;
             break;
@@ -3690 +3697 @@
                                   "|NicPciAddress"
                                   "|AudioPciAddress"
+                                  "|NvmePciAddress"
                                   "|IocPciAddress"
                                   "|HostBusPciAddress"
@@ -3773 +3781 @@
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"ShowCpu\""));
 
-    /* query primary NIC PCI address */
+    /* query primary NIC PCI address (GIGE) */
     rc = pHlp->pfnCFGMQueryU32Def(pCfg, "NicPciAddress", &pThis->u32NicPciAddress, 0);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"NicPciAddress\""));
 
-    /* query primary NIC PCI address */
+    /* query HD Audio PCI address (HDAA) */
     rc = pHlp->pfnCFGMQueryU32Def(pCfg, "AudioPciAddress", &pThis->u32AudioPciAddress, 0);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"AudioPciAddress\""));
+
+    /* query NVMe PCI address (NVMA) */
+    rc = pHlp->pfnCFGMQueryU32Def(pCfg, "NvmePciAddress", &pThis->u32NvmePciAddress, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"NvmePciAddress\""));
 
     /* query IO controller (southbridge) PCI address */

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -371 +371 @@
         PP1I,  32, // Parallel1 IRQ
         PMNX,  32, // limit of 64-bit prefetch window (64KB units)
+        NVMA,  32, // Primary NVMe controller PCI address
         Offset (0x80),
         ININ, 32,
@@ -1220 +1221 @@
                  }
              }
+
+            // NVMe controller. Required to convince OS X that
+            // the controller is an internal (built-in) device.
+            Device (SSD0)
+            {
+                Method(_ADR, 0, NotSerialized)
+                {
+                     Return (NVMA)
+                }
+                Method (_STA, 0, NotSerialized)
+                {
+                    if (LEqual (NVMA, Zero)) {
+                        Return (0x00)
+                    }
+                    else {
+                        Return (0x0F)
+                    }
+                }
+                // Port 0
+                Device (PRT0)
+                {
+                    Name (_ADR, 0xffff)
+                }
+            }
 
             // NIC