Changeset 87242 in vbox for trunk/src

Timestamp:

Jan 13, 2021 4:02:24 PM (4 years ago)

Author:

vboxsync

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

142199

Message:

AMD IOMMU: bugref:9654 Main/API: Adjusted BusAssignmentManager and ConsoleImpl2 to use the newly added API methods.

Location:

trunk/src/VBox/Main

Files:

• include/BusAssignmentManager.h (modified) (1 diff)
• src-client/BusAssignmentManager.cpp (modified) (5 diffs)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/BusAssignmentManager.h

@@ -47 +47 @@
     };
 
-    static BusAssignmentManager *createInstance(ChipsetType_T chipsetType, bool fIommu);
+    static BusAssignmentManager *createInstance(ChipsetType_T chipsetType, IommuType_T iommuType);
     virtual void AddRef();
     virtual void Release();

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

@@ -310 +310 @@
     ChipsetType_T    mChipsetType;
     const char *     mpszBridgeName;
-    bool             mfIommu;
+    IommuType_T      mIommuType;
     PCIMap           mPCIMap;
     ReversePCIMap    mReversePCIMap;
@@ -320 +320 @@
     {}
 
-    HRESULT init(ChipsetType_T chipsetType, bool fIommu);
+    HRESULT init(ChipsetType_T chipsetType, IommuType_T iommuType);
 
     HRESULT record(const char *pszName, PCIBusAddress& GuestAddress, PCIBusAddress HostAddress);
@@ -332 +332 @@
 };
 
-HRESULT BusAssignmentManager::State::init(ChipsetType_T chipsetType, bool fIommu)
-{
+HRESULT BusAssignmentManager::State::init(ChipsetType_T chipsetType, IommuType_T iommuType)
+{
+    /* Currently we only support AMD IOMMU. */
+    Assert(iommuType == IommuType_None || iommuType == IommuType_AMD);
+
     mChipsetType = chipsetType;
-    mfIommu = fIommu;
+    mIommuType   = iommuType;
     switch (chipsetType)
     {
@@ -401 +404 @@
             aArrays[1] = g_aIch9Rules;
 #ifdef VBOX_WITH_IOMMU_AMD
-            if (mfIommu)
+            if (mIommuType == IommuType_AMD)
                 aArrays[2] = g_aIch9IommuLsiRules;
             else
@@ -510 +513 @@
 }
 
-BusAssignmentManager *BusAssignmentManager::createInstance(ChipsetType_T chipsetType, bool fIommu)
+BusAssignmentManager *BusAssignmentManager::createInstance(ChipsetType_T chipsetType, IommuType_T iommuType)
 {
     BusAssignmentManager *pInstance = new BusAssignmentManager();
-    pInstance->pState->init(chipsetType, fIommu);
+    pInstance->pState->init(chipsetType, iommuType);
     Assert(pInstance);
     return pInstance;

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

@@ -802 +802 @@
 
 #ifdef VBOX_WITH_IOMMU_AMD
-    /** @todo Get IOMMU from pMachine and pass info to createInstance() below. */
-    bool const fIommu = RT_BOOL(chipsetType == ChipsetType_ICH9);
+    IommuType_T iommuType;
+    hrc = pMachine->COMGETTER(IommuType)(&iommuType);                                       H();
+
+    /* Resolve 'automatic' type to an Intel or AMD IOMMU based on the host CPU. */
+    if (iommuType == IommuType_Automatic)
+    {
+        if (ASMIsAmdCpu())
+            iommuType = IommuType_AMD;
+        else if (ASMIsIntelCpu())
+        {
+            iommuType = IommuType_None;
+            LogRel(("WARNING! Intel IOMMU implemention is not yet supported. Disabled IOMMU.\n"));
+        }
+        else
+        {
+            /** @todo Should we handle other CPUs like Shanghai, VIA etc. here? */
+            LogRel(("WARNING! Unrecognized CPU type. Disabled IOMMU.\n"));
+            iommuType = IommuType_None;
+        }
+    }
+
+    /* Handle AMD IOMMU specifics. */
+    if (   iommuType == IommuType_AMD
+        && chipsetType != ChipsetType_ICH9)
+        return VMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
+                            N_("AMD IOMMU uses MSIs which requires the ICH9 chipset implementation."));
+
+    /** @todo Handle Intel IOMMU specifics. */
 #else
-    bool const fIommu = false;
+    IommuType_T const iommuType = IommuType_None;
 #endif
-    BusAssignmentManager *pBusMgr = mBusMgr = BusAssignmentManager::createInstance(chipsetType, fIommu);
+    Assert(iommuType != IommuType_Automatic);
+    BusAssignmentManager *pBusMgr = mBusMgr = BusAssignmentManager::createInstance(chipsetType, iommuType);
 
     ULONG cCpus = 1;
@@ -1506 +1533 @@
 
 #ifdef VBOX_WITH_IOMMU_AMD
-            if (fIommu)
+            if (iommuType == IommuType_AMD)
             {
                 /* AMD IOMMU. */
@@ -3267 +3294 @@
             }
 #ifdef VBOX_WITH_IOMMU_AMD
-            if (fIommu)
+            if (iommuType == IommuType_AMD)
             {
                 PCIBusAddress Address;