PCI: Cleanup PCI bridge code and add MSI-X support

acidanthera · Oct 14, 2023 · b9c08fb · b9c08fb
1 parent 8f844d6
commit b9c08fb
Show file tree

Hide file tree

Showing 12 changed files with 540 additions and 413 deletions.
diff --git a/MacHyperVSupport/Controller/HyperV.hpp b/MacHyperVSupport/Controller/HyperV.hpp
@@ -32,10 +32,6 @@ typedef enum : UInt32 {
 
 #define kHyperVHypercallRetryCount  100
 
-
-#define kHyperVPCIBusSyntheticGraphics    0xFB
-#define kHyperVPCIBusDummy                0xFE
-
 #if DEBUG
 //
 // Debug logging function.

diff --git a/MacHyperVSupport/GraphicsBridge/HyperVGraphicsBridge.cpp b/MacHyperVSupport/GraphicsBridge/HyperVGraphicsBridge.cpp
@@ -51,7 +51,13 @@ bool HyperVGraphicsBridge::start(IOService *provider) {
   //
   // Locate root PCI bus instance and register ourselves.
   //
-  if (!HyperVPCIRoot::registerChildPCIBridge(this)) {
+  _hvPCIRoot = HyperVPCIRoot::getPCIRootInstance();
+  if (_hvPCIRoot == nullptr) {
+    _hvDevice->release();
+    return false;
+  }
+
+  if (_hvPCIRoot->registerChildPCIBridge(this, &_pciBusNumber) != kIOReturnSuccess) {
     HVSYSLOG("Failed to register with root PCI bus instance");
     OSSafeReleaseNULL(_hvDevice);
     return false;

diff --git a/MacHyperVSupport/GraphicsBridge/HyperVGraphicsBridge.hpp b/MacHyperVSupport/GraphicsBridge/HyperVGraphicsBridge.hpp
@@ -11,15 +11,18 @@
 #include <IOKit/pci/IOPCIBridge.h>
 #include "HyperVVMBusDevice.hpp"
 #include "HyperVGraphicsBridgeRegs.hpp"
+#include "HyperVPCIRoot.hpp"
 
 class HyperVGraphicsBridge : public HV_PCIBRIDGE_CLASS {
   OSDeclareDefaultStructors(HyperVGraphicsBridge);
   HVDeclareLogFunctionsVMBusChild("gfxb");
   typedef HV_PCIBRIDGE_CLASS super;
 
 private:
-  HyperVVMBusDevice *_hvDevice;
+  HyperVVMBusDevice *_hvDevice  = nullptr;
+  HyperVPCIRoot     *_hvPCIRoot = nullptr;
   VMBusVersion      _currentGraphicsVersion = { };
+  UInt8             _pciBusNumber = 0;
 
   //
   // Fake PCI structures.
@@ -62,12 +65,12 @@ class HyperVGraphicsBridge : public HV_PCIBRIDGE_CLASS {
 
   UInt8 firstBusNum() APPLE_KEXT_OVERRIDE {
     HVDBGLOG("start");
-    return kHyperVPCIBusSyntheticGraphics;
+    return _pciBusNumber;
   }
 
   UInt8 lastBusNum() APPLE_KEXT_OVERRIDE {
     HVDBGLOG("start");
-    return kHyperVPCIBusSyntheticGraphics;
+    return _pciBusNumber;
   }
 };
 

diff --git a/MacHyperVSupport/Network/HyperVNetwork.cpp b/MacHyperVSupport/Network/HyperVNetwork.cpp
@@ -50,7 +50,10 @@ bool HyperVNetwork::start(IOService *provider) {
     //
     // Install packet handlers.
     //
-    status = _hvDevice->installPacketActions(this, OSMemberFunctionCast(HyperVVMBusDevice::PacketReadyAction, this, &HyperVNetwork::handlePacket), OSMemberFunctionCast(HyperVVMBusDevice::WakePacketAction, this, &HyperVNetwork::wakePacketHandler), kHyperVNetworkReceivePacketSize);
+    status = _hvDevice->installPacketActions(this,
+                                             OSMemberFunctionCast(HyperVVMBusDevice::PacketReadyAction, this, &HyperVNetwork::handlePacket),
+                                             OSMemberFunctionCast(HyperVVMBusDevice::WakePacketAction, this, &HyperVNetwork::wakePacketHandler),
+                                             kHyperVNetworkReceivePacketSize);
     if (status != kIOReturnSuccess) {
       HVSYSLOG("Failed to install packet handlers with status 0x%X", status);
       break;