Use both powesStateWill and powerStateDidChangeTo, check whatDevice parameter in both

Author: averycblack

VoodooRMI/Transports/SMBus/RMISMBus.cpp

@@ -58,7 +58,7 @@ bool RMISMBus::start(IOService *provider)
     IOService *ps2 = OSDynamicCast(IOService, device_nub->getProperty("PS/2 Parent"));
     if (ps2) {
         (void) ps2->registerInterestedDriver(this);
-        ps2PowerDriver = true;
+        ps2Parent = ps2;
     }
 
     // Receive power notifications for sleep/wake
@@ -286,22 +286,28 @@ IOReturn RMISMBus::setPowerState(unsigned long whichState, IOService* whatDevice
     return processPowerState(whichState);
 }
 
-IOReturn RMISMBus::powerStateDidChangeTo(IOPMPowerFlags capabilities, unsigned long stateNumber, IOService *whatDevice) {
-    unsigned long newState;
+IOReturn RMISMBus::powerStateWillChangeTo(IOPMPowerFlags capabilities, unsigned long stateNumber, IOService *whatDevice) {
+    // Shut down touchpad before PS/2 starts disabling PS/2 ports
+    if ((capabilities & kIOPMDeviceUsable) || whatDevice != ps2Parent)
+        return kIOPMAckImplied;
 
     IOLogInfo("Received PS2 Power State Change: 0x%lx", capabilities);
-    ps2Awake = capabilities & kIOPMDeviceUsable;
-    if (capabilities & kIOPMDeviceUsable) {
-        newState = RMI_POWER_ON;
-    } else {
-        newState = RMI_POWER_OFF;
-    }
+    ps2Awake = false;
+    return processPowerState(RMI_POWER_OFF);
+}
+
+IOReturn RMISMBus::powerStateDidChangeTo(IOPMPowerFlags capabilities, unsigned long stateNumber, IOService *whatDevice) {
+    // Start up SMBus interface after PS/2 reset/reinit
+    if (!(capabilities & kIOPMDeviceUsable) || whatDevice != ps2Parent)
+        return kIOPMAckImplied;
 
-    return processPowerState(newState);
+    IOLogInfo("Received PS2 Power State Change: 0x%lx", capabilities);
+    ps2Awake = true;
+    return processPowerState(RMI_POWER_ON);
 }
 
 IOReturn RMISMBus::processPowerState(unsigned long whichState) {
-    if (ps2PowerDriver && ps2Awake != smbusAwake) {
+    if (ps2Parent && ps2Awake != smbusAwake) {
         IOLogDebug("PS2 Power State (%b) != SMB Power State (%b) - Waiting!",
                    ps2Awake, smbusAwake);
         return kIOPMAckImplied;

VoodooRMI/Transports/SMBus/RMISMBus.hpp

@@ -34,6 +34,7 @@ class RMISMBus : public RMITransport {
     bool start(IOService *provider) override;
     IOReturn message(UInt32 type, IOService *provider, void *argument = 0) override;
     IOReturn setPowerState(unsigned long whichState, IOService* whatDevice) override;
+    IOReturn powerStateWillChangeTo(IOPMPowerFlags capabilities, unsigned long stateNumber, IOService *whatDevice) override;
     IOReturn powerStateDidChangeTo(IOPMPowerFlags capabilities, unsigned long stateNumber, IOService *whatDevice) override;
     void stop(IOService *provider) override;
     void free() override;
@@ -47,11 +48,11 @@ class RMISMBus : public RMITransport {
     VoodooSMBusDeviceNub *device_nub;
     IOLock *page_mutex;
     IOLock *mapping_table_mutex;
+    IOService *ps2Parent {nullptr};
 
     struct mapping_table_entry mapping_table[RMI_SMB2_MAP_SIZE];
     UInt8 table_index {0};
 
-    bool ps2PowerDriver {false};
     bool ps2Awake {true};
     bool smbusAwake {true};
     bool vrmiAwake {true};