Merge pull request #11 from VoodooI2C/suspend-resume

Fix Suspend/Resume IRQ issue

Author: ben9923

VoodooGPIO/VoodooGPIO.cpp

@@ -453,14 +453,16 @@ void VoodooGPIO::intel_pinctrl_pm_init() {
     for (int i = 0; i < ncommunities; i++) {
         intel_community *community = &communities[i];
 
-        context.communities[i].intmask = IONew(UInt32, community->ngpps);;
+        context.communities[i].intmask = IONew(UInt32, community->ngpps);
+        context.communities[i].hostown = IONew(UInt32, community->ngpps);
     }
 }
 
 void VoodooGPIO::intel_pinctrl_pm_release() {
     for (int i = 0; i < ncommunities; i++) {
         intel_community *community = &communities[i];
         IOSafeDeleteNULL(context.communities[i].intmask, UInt32, community->ngpps);
+        IOSafeDeleteNULL(context.communities[i].hostown, UInt32, community->ngpps);
     }
 
     IOSafeDeleteNULL(context.communities, intel_community_context, ncommunities);
@@ -500,11 +502,15 @@ void VoodooGPIO::intel_pinctrl_suspend() {
     struct intel_community_context *communityContexts = context.communities;
     for (int i = 0; i < ncommunities; i++) {
         struct intel_community *community = &communities[i];
-        
-        IOVirtualAddress base = community->regs + community->ie_offset;
-        
-        for (unsigned gpp = 0; gpp < community->ngpps; gpp++)
+        IOVirtualAddress base = 0;
+
+        base = community->regs + community->ie_offset;
+        for (unsigned int gpp = 0; gpp < community->ngpps; gpp++)
             communityContexts[i].intmask[gpp] = readl(base + gpp * 4);
+
+        base = community->regs + community->hostown_offset;
+        for (unsigned int gpp = 0; gpp < community->ngpps; gpp++)
+            communityContexts[i].hostown[gpp] = readl(base + gpp * 4);
     }
 }
 
@@ -521,6 +527,37 @@ void VoodooGPIO::intel_gpio_irq_init() {
     }
 }
 
+UInt32 VoodooGPIO::intel_gpio_is_requested(int base, unsigned int size) {
+    UInt32 requested = 0;
+
+    for (unsigned int pin_offset = 0; pin_offset < size; pin_offset++) {
+        UInt32 gpio_pin = base + pin_offset;
+        SInt32 hw_pin = intel_gpio_to_pin(gpio_pin, nullptr, nullptr);
+        if (hw_pin < 0)
+            continue;
+
+        for (unsigned int registered_idx = 0; registered_idx < registered_pin_list->getCount(); registered_idx++) {
+            OSNumber* registered_pin = OSDynamicCast(OSNumber, registered_pin_list->getObject(registered_idx));
+            if (registered_pin && registered_pin->unsigned32BitValue() == hw_pin) {
+                requested |= BIT(pin_offset);
+                break;
+            }
+        }
+    }
+
+    return requested;
+}
+
+UInt32 VoodooGPIO::intel_gpio_update_pad_mode(IOVirtualAddress hostown, UInt32 mask, UInt32 value) {
+    UInt32 curr, updated;
+
+    curr = readl(hostown);
+    updated = (curr & ~mask) | (value & mask);
+    writel(updated, hostown);
+
+    return curr;
+}
+
 void VoodooGPIO::intel_pinctrl_resume() {
     /* Mask all interrupts */
     intel_gpio_irq_init();
@@ -563,12 +600,28 @@ void VoodooGPIO::intel_pinctrl_resume() {
     struct intel_community_context *communityContexts = context.communities;
     for (int i = 0; i < ncommunities; i++) {
         struct intel_community *community = &communities[i];
+        IOVirtualAddress base = 0;
 
-        IOVirtualAddress base = communities->regs + communities->ie_offset;
-        
-        for (unsigned gpp = 0; gpp < community->ngpps; gpp++) {
+        base = communities->regs + communities->ie_offset;
+        for (unsigned int gpp = 0; gpp < community->ngpps; gpp++) {
             writel(communityContexts[i].intmask[gpp], base + gpp * 4);
         }
+
+        base = community->regs + community->hostown_offset;
+        for (unsigned int gpp = 0; gpp < community->ngpps; gpp++) {
+            const struct intel_padgroup *padgrp = &community->gpps[gpp];
+            UInt32 requested = 0, value = 0;
+            UInt32 saved = communityContexts[i].hostown[gpp];
+
+            if (padgrp->gpio_base < 0)
+                continue;
+
+            requested = intel_gpio_is_requested(padgrp->gpio_base, padgrp->size);
+            value = intel_gpio_update_pad_mode(base + gpp * 4, requested, saved);
+            if ((value ^ saved) & requested) {
+                IOLog("%s::restore hostown %d/%u %#8x->%#8x\n", getName(), i, gpp, value, saved);
+            }
+        }
     }
 }
 
@@ -746,37 +799,19 @@ void VoodooGPIO::stop(IOService *provider) {
 }
 
 IOReturn VoodooGPIO::setPowerState(unsigned long powerState, IOService *whatDevice) {
+    if (whatDevice != this)
+        return kIOPMAckImplied;
+
     if (powerState == 0) {
         controllerIsAwake = false;
 
-        for (int i = 0; i < ncommunities; i++) {
-            struct intel_community *community = &communities[i];
-            for (int j = 0; j < community->npins; j++) {
-                OSObject *pinInterruptOwner = community->pinInterruptActionOwners[j];
-                if (pinInterruptOwner) {
-                    int pin = community->pin_base + j;
-                    intel_gpio_irq_mask_unmask(pin, true);
-                }
-            }
-        }
-        
+        intel_pinctrl_suspend();
         IOLog("%s::Going to Sleep!\n", getName());
     } else {
         if (!controllerIsAwake) {
             controllerIsAwake = true;
 
-            for (int i = 0; i < ncommunities; i++) {
-                struct intel_community *community = &communities[i];
-                for (int j = 0; j < community->npins; j++) {
-                    OSObject *pinInterruptOwner = community->pinInterruptActionOwners[j];
-                    if (pinInterruptOwner) {
-                        int pin = community->pin_base + j;
-                        intel_gpio_irq_set_type(pin, community->interruptTypes[j]);
-                        intel_gpio_irq_mask_unmask(pin, false);
-                    }
-                }
-            }
-            
+            intel_pinctrl_resume();
             IOLog("%s::Woke up from Sleep!\n", getName());
         } else {
             IOLog("%s::GPIO Controller is already awake! Not reinitializing.\n", getName());
@@ -931,6 +966,8 @@ IOReturn VoodooGPIO::unregisterInterrupt(int pin) {
     if (hw_pin < 0)
         return kIOReturnNoInterrupt;
 
+    IOLog("%s::Unregistering hardware pin 0x%02X for GPIO IRQ pin 0x%02X\n", getName(), hw_pin, pin);
+
     intel_gpio_irq_mask_unmask(hw_pin, true);
 
     unsigned communityidx = hw_pin - community->pin_base;

VoodooGPIO/VoodooGPIO.hpp

@@ -151,6 +151,7 @@ struct intel_pad_context {
 
 struct intel_community_context {
     uint32_t *intmask;
+    uint32_t *hostown;
 };
 
 struct intel_pinctrl_context {
@@ -241,6 +242,8 @@ class VoodooGPIO : public IOService {
     void intel_pinctrl_pm_release();
     void intel_pinctrl_suspend();
     void intel_gpio_irq_init();
+    UInt32 intel_gpio_is_requested(int base, unsigned int size);
+    UInt32 intel_gpio_update_pad_mode(IOVirtualAddress hostown, UInt32 mask, UInt32 value);
     void intel_pinctrl_resume();
 
     void intel_gpio_community_irq_handler(struct intel_community *community, bool *firstdelay);