]> git.saurik.com Git - apple/xnu.git/blobdiff - iokit/Kernel/IOService.cpp
xnu-4570.71.2.tar.gz
[apple/xnu.git] / iokit / Kernel / IOService.cpp
index a23e683ec9a0a1824e0bc8f819f3e2d1d6e82f63..5d4be71a60f65b42fbd9da7efd34bebdf7a02393 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2014 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
 #include <IOKit/IOHibernatePrivate.h>
 #include <IOKit/IOInterruptAccountingPrivate.h>
 #include <IOKit/IOKernelReporters.h>
+#include <IOKit/AppleKeyStoreInterface.h>
+#include <IOKit/pwr_mgt/RootDomain.h>
+#include <IOKit/IOCPU.h>
 #include <mach/sync_policy.h>
 #include <IOKit/assert.h>
 #include <sys/errno.h>
+#include <sys/kdebug.h>
+#include <string.h>
 
 #include <machine/pal_routines.h>
 
 #define LOG kprintf
 //#define LOG IOLog
 #define MATCH_DEBUG    0
-#define OBFUSCATE(x) ((void *)(VM_KERNEL_ADDRPERM(x)))
+#define IOSERVICE_OBFUSCATE(x) ((void *)(VM_KERNEL_ADDRPERM(x)))
+
+// disabled since lockForArbitration() can be held externally
+#define DEBUG_NOTIFIER_LOCKED  0
 
 #include "IOServicePrivate.h"
 #include "IOKitKernelInternal.h"
@@ -73,6 +81,7 @@
 OSDefineMetaClassAndStructors(IOService, IORegistryEntry)
 
 OSDefineMetaClassAndStructors(_IOServiceNotifier, IONotifier)
+OSDefineMetaClassAndStructors(_IOServiceNullNotifier, IONotifier)
 
 OSDefineMetaClassAndStructors(_IOServiceInterestNotifier, IONotifier)
 
@@ -98,16 +107,21 @@ const OSSymbol *           gIOInterruptSpecifiersKey;
 
 const OSSymbol *               gIOResourcesKey;
 const OSSymbol *               gIOResourceMatchKey;
+const OSSymbol *               gIOResourceMatchedKey;
 const OSSymbol *               gIOProviderClassKey;
 const OSSymbol *               gIONameMatchKey;
 const OSSymbol *               gIONameMatchedKey;
 const OSSymbol *               gIOPropertyMatchKey;
+const OSSymbol *               gIOPropertyExistsMatchKey;
 const OSSymbol *               gIOLocationMatchKey;
 const OSSymbol *               gIOParentMatchKey;
 const OSSymbol *               gIOPathMatchKey;
 const OSSymbol *               gIOMatchCategoryKey;
 const OSSymbol *               gIODefaultMatchCategoryKey;
 const OSSymbol *               gIOMatchedServiceCountKey;
+#if !CONFIG_EMBEDDED
+const OSSymbol *               gIOServiceLegacyMatchingRegistryIDKey;
+#endif
 
 const OSSymbol *               gIOMapperIDKey;
 const OSSymbol *               gIOUserClientClassKey;
@@ -124,10 +138,11 @@ const OSSymbol *          gIOConsoleSessionOnConsoleKey;
 const OSSymbol *               gIOConsoleSessionLoginDoneKey;
 const OSSymbol *               gIOConsoleSessionSecureInputPIDKey;
 const OSSymbol *               gIOConsoleSessionScreenLockedTimeKey;
-
+const OSSymbol *               gIOConsoleSessionScreenIsLockedKey;
 clock_sec_t                    gIOConsoleLockTime;
 static bool                    gIOConsoleLoggedIn;
 #if HIBERNATION
+static OSBoolean *             gIOConsoleBooterLockState;
 static uint32_t                        gIOScreenLockState;
 #endif
 static IORegistryEntry *        gIOChosenEntry;
@@ -140,6 +155,7 @@ const OSSymbol *            gIOFirstPublishNotification;
 const OSSymbol *               gIOMatchedNotification;
 const OSSymbol *               gIOFirstMatchNotification;
 const OSSymbol *               gIOTerminatedNotification;
+const OSSymbol *               gIOWillTerminateNotification;
 
 const OSSymbol *               gIOGeneralInterest;
 const OSSymbol *               gIOBusyInterest;
@@ -147,6 +163,17 @@ const OSSymbol *           gIOAppPowerStateInterest;
 const OSSymbol *               gIOPriorityPowerStateInterest;
 const OSSymbol *               gIOConsoleSecurityInterest;
 
+const OSSymbol *               gIOBSDKey;
+const OSSymbol *               gIOBSDNameKey;
+const OSSymbol *               gIOBSDMajorKey;
+const OSSymbol *               gIOBSDMinorKey;
+const OSSymbol *               gIOBSDUnitKey;
+
+const  OSSymbol *               gAKSGetKey;
+#if defined(__i386__) || defined(__x86_64__)
+const OSSymbol *                gIOCreateEFIDevicePathSymbol;
+#endif
+
 static OSDictionary *          gNotifications;
 static IORecursiveLock *       gNotificationLock;
 
@@ -160,8 +187,10 @@ static int                 gOutstandingJobs;
 static int                     gNumConfigThreads;
 static int                     gNumWaitingThreads;
 static IOLock *                        gIOServiceBusyLock;
+bool                           gCPUsRunning;
 
 static thread_t                        gIOTerminateThread;
+static thread_t                        gIOTerminateWorkerThread;
 static UInt32                  gIOTerminateWork;
 static OSArray *               gIOTerminatePhase2List;
 static OSArray *               gIOStopList;
@@ -173,16 +202,11 @@ static OSData *                   gIOConsoleUsersSeedValue;
 
 extern const OSSymbol *                gIODTPHandleKey;
 
-const OSSymbol *               gIOPlatformSleepActionKey;
-const OSSymbol *               gIOPlatformWakeActionKey;
-const OSSymbol *               gIOPlatformQuiesceActionKey;
-const OSSymbol *               gIOPlatformActiveActionKey;
-const OSSymbol *               gIOPlatformHaltRestartActionKey;
-
 const OSSymbol *               gIOPlatformFunctionHandlerSet;
 
 static IOLock *                        gIOConsoleUsersLock;
 static thread_call_t           gIOConsoleLockCallout;
+static IONotifier *             gIOServiceNullNotifier;
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@@ -266,6 +290,7 @@ static IORecursiveLock *sCpuDelayLock = IORecursiveLockAlloc();
 static OSArray         *sCpuLatencyHandlers[kCpuNumDelayTypes];
 const OSSymbol         *sCPULatencyFunctionName[kCpuNumDelayTypes];
 static OSNumber * sCPULatencyHolder[kCpuNumDelayTypes];
+static char sCPULatencyHolderName[kCpuNumDelayTypes][128];
 static OSNumber * sCPULatencySet[kCpuNumDelayTypes];
 
 static void
@@ -288,6 +313,7 @@ void IOService::initialize( void )
     gIONameMatchKey    = OSSymbol::withCStringNoCopy( kIONameMatchKey );
     gIONameMatchedKey  = OSSymbol::withCStringNoCopy( kIONameMatchedKey );
     gIOPropertyMatchKey        = OSSymbol::withCStringNoCopy( kIOPropertyMatchKey );
+    gIOPropertyExistsMatchKey = OSSymbol::withCStringNoCopy( kIOPropertyExistsMatchKey );
     gIOPathMatchKey    = OSSymbol::withCStringNoCopy( kIOPathMatchKey );
     gIOLocationMatchKey        = OSSymbol::withCStringNoCopy( kIOLocationMatchKey );
     gIOParentMatchKey  = OSSymbol::withCStringNoCopy( kIOParentMatchKey );
@@ -297,11 +323,16 @@ void IOService::initialize( void )
                                        kIODefaultMatchCategoryKey );
     gIOMatchedServiceCountKey  = OSSymbol::withCStringNoCopy( 
                                        kIOMatchedServiceCountKey );
+#if !CONFIG_EMBEDDED
+    gIOServiceLegacyMatchingRegistryIDKey = OSSymbol::withCStringNoCopy(
+                                       kIOServiceLegacyMatchingRegistryIDKey );
+#endif
 
     gIOUserClientClassKey = OSSymbol::withCStringNoCopy( kIOUserClientClassKey );
 
-    gIOResourcesKey    = OSSymbol::withCStringNoCopy( kIOResourcesClass );
-    gIOResourceMatchKey        = OSSymbol::withCStringNoCopy( kIOResourceMatchKey );
+    gIOResourcesKey      = OSSymbol::withCStringNoCopy( kIOResourcesClass );
+    gIOResourceMatchKey          = OSSymbol::withCStringNoCopy( kIOResourceMatchKey );
+    gIOResourceMatchedKey = OSSymbol::withCStringNoCopy( kIOResourceMatchedKey );
 
     gIODeviceMemoryKey = OSSymbol::withCStringNoCopy( "IODeviceMemory" );
     gIOInterruptControllersKey
@@ -321,6 +352,12 @@ void IOService::initialize( void )
     gIOPriorityPowerStateInterest      = OSSymbol::withCStringNoCopy( kIOPriorityPowerStateInterest );
     gIOConsoleSecurityInterest         = OSSymbol::withCStringNoCopy( kIOConsoleSecurityInterest );
 
+    gIOBSDKey     = OSSymbol::withCStringNoCopy(kIOBSDKey);
+    gIOBSDNameKey  = OSSymbol::withCStringNoCopy(kIOBSDNameKey);
+    gIOBSDMajorKey = OSSymbol::withCStringNoCopy(kIOBSDMajorKey);
+    gIOBSDMinorKey = OSSymbol::withCStringNoCopy(kIOBSDMinorKey);
+    gIOBSDUnitKey  = OSSymbol::withCStringNoCopy(kIOBSDUnitKey);
+
     gNotifications             = OSDictionary::withCapacity( 1 );
     gIOPublishNotification     = OSSymbol::withCStringNoCopy(
                                                 kIOPublishNotification );
@@ -332,6 +369,8 @@ void IOService::initialize( void )
                                                 kIOFirstMatchNotification );
     gIOTerminatedNotification  = OSSymbol::withCStringNoCopy(
                                                 kIOTerminatedNotification );
+    gIOWillTerminateNotification = OSSymbol::withCStringNoCopy(
+                                                kIOWillTerminateNotification );
     gIOServiceKey              = OSSymbol::withCStringNoCopy( kIOServiceClass);
 
     gIOConsoleLockedKey                = OSSymbol::withCStringNoCopy( kIOConsoleLockedKey);
@@ -344,14 +383,9 @@ void IOService::initialize( void )
     gIOConsoleSessionLoginDoneKey        = OSSymbol::withCStringNoCopy(kIOConsoleSessionLoginDoneKey);
     gIOConsoleSessionSecureInputPIDKey   = OSSymbol::withCStringNoCopy(kIOConsoleSessionSecureInputPIDKey);
     gIOConsoleSessionScreenLockedTimeKey = OSSymbol::withCStringNoCopy(kIOConsoleSessionScreenLockedTimeKey);
+    gIOConsoleSessionScreenIsLockedKey   = OSSymbol::withCStringNoCopy(kIOConsoleSessionScreenIsLockedKey);
 
     gIOConsoleUsersSeedValue          = OSData::withBytesNoCopy(&gIOConsoleUsersSeed, sizeof(gIOConsoleUsersSeed));
-       
-    gIOPlatformSleepActionKey      = OSSymbol::withCStringNoCopy(kIOPlatformSleepActionKey);
-    gIOPlatformWakeActionKey       = OSSymbol::withCStringNoCopy(kIOPlatformWakeActionKey);
-    gIOPlatformQuiesceActionKey            = OSSymbol::withCStringNoCopy(kIOPlatformQuiesceActionKey);
-    gIOPlatformActiveActionKey     = OSSymbol::withCStringNoCopy(kIOPlatformActiveActionKey);
-    gIOPlatformHaltRestartActionKey = OSSymbol::withCStringNoCopy(kIOPlatformHaltRestartActionKey);
 
     gIOPlatformFunctionHandlerSet              = OSSymbol::withCStringNoCopy(kIOPlatformFunctionHandlerSet);
 #if defined(__i386__) || defined(__x86_64__)
@@ -364,9 +398,12 @@ void IOService::initialize( void )
        sCPULatencyHolder[idx] = OSNumber::withNumber(0ULL, 64);
         assert(sCPULatencySet[idx] && sCPULatencyHolder[idx]);
     }
+    gIOCreateEFIDevicePathSymbol = OSSymbol::withCString("CreateEFIDevicePath");
 #endif
     gNotificationLock          = IORecursiveLockAlloc();
 
+    gAKSGetKey                   = OSSymbol::withCStringNoCopy(AKS_PLATFORM_FUNCTION_GETKEY);
+
     assert( gIOServicePlane && gIODeviceMemoryKey
         && gIOInterruptControllersKey && gIOInterruptSpecifiersKey
         && gIOResourcesKey && gNotifications && gNotificationLock
@@ -397,6 +434,9 @@ void IOService::initialize( void )
     gIOResources = IOResources::resources();
     assert( gIOResources );
 
+    gIOServiceNullNotifier = OSTypeAlloc(_IOServiceNullNotifier);
+    assert(gIOServiceNullNotifier);
+
     gArbitrationLockQueueLock = IOLockAlloc();
     queue_init(&gArbitrationLockQueueActive);
     queue_init(&gArbitrationLockQueueWaiting);
@@ -409,10 +449,31 @@ void IOService::initialize( void )
     gIOStopProviderList    = OSArray::withCapacity( 16 );
     gIOFinalizeList       = OSArray::withCapacity( 16 );
     assert( gIOTerminatePhase2List && gIOStopList && gIOStopProviderList && gIOFinalizeList );
+
+    // worker thread that is responsible for terminating / cleaning up threads
+    kernel_thread_start(&terminateThread, NULL, &gIOTerminateWorkerThread);
+    assert(gIOTerminateWorkerThread);
+    thread_set_thread_name(gIOTerminateWorkerThread, "IOServiceTerminateThread");
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#if defined(__i386__) || defined(__x86_64__)
+extern "C" {
+
+const char *getCpuDelayBusStallHolderName(void);
+const char *getCpuDelayBusStallHolderName(void) {
+    return sCPULatencyHolderName[kCpuDelayBusStall];
+}
+
+const char *getCpuInterruptDelayHolderName(void);
+const char *getCpuInterruptDelayHolderName(void) {
+    return sCPULatencyHolderName[kCpuDelayInterrupt];
+}
+
+}
+#endif
+
 #if IOMATCHDEBUG
 static UInt64 getDebugFlags( OSDictionary * props )
 {
@@ -428,6 +489,24 @@ static UInt64 getDebugFlags( OSDictionary * props )
 
     return( debugFlags );
 }
+
+static UInt64 getDebugFlags( IOService * inst )
+{
+    OSObject *  prop;
+    OSNumber *  debugProp;
+    UInt64     debugFlags;
+
+    prop = inst->copyProperty(gIOKitDebugKey);
+    debugProp = OSDynamicCast(OSNumber, prop);
+    if( debugProp)
+       debugFlags = debugProp->unsigned64BitValue();
+    else
+       debugFlags = gIOKitDebug;
+
+    OSSafeReleaseNULL(prop);
+
+    return( debugFlags );
+}
 #endif
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -453,20 +532,14 @@ void IOService::stop( IOService * provider )
 
 bool IOService::init( OSDictionary * dictionary )
 {
-    bool ret = false;
+    bool ret;
 
     ret = super::init(dictionary);
-
-    if (!ret)
-        goto done;
+    if (!ret)     return (false);
+    if (reserved) return (true);
 
     reserved = IONew(ExpansionData, 1);
-
-    if (!reserved) {
-        ret = false;
-        goto done;
-    }
-
+    if (!reserved) return (false);
     bzero(reserved, sizeof(*reserved));
 
     /*
@@ -480,33 +553,22 @@ bool IOService::init( OSDictionary * dictionary )
      * which should be unlikely).
      */
     reserved->interruptStatisticsLock = IOLockAlloc(); 
+    if (!reserved->interruptStatisticsLock) return (false);
 
-    if (!reserved->interruptStatisticsLock) {
-        ret = false;
-        goto done;
-    }
-
-done:
-    return ret;
+    return (true);
 }
 
 bool IOService::init( IORegistryEntry * from,
                       const IORegistryPlane * inPlane )
 {
-    bool ret = false;
+    bool ret;
 
     ret = super::init(from, inPlane);
-
-    if (!ret)
-        goto done;
+    if (!ret)     return (false);
+    if (reserved) return (true);
 
     reserved = IONew(ExpansionData, 1);
-
-    if (!reserved) {
-        ret = false;
-        goto done;
-    }
-
+    if (!reserved) return (false);
     bzero(reserved, sizeof(*reserved));
 
     /*
@@ -520,14 +582,9 @@ bool IOService::init( IORegistryEntry * from,
      * which should be unlikely).
      */
     reserved->interruptStatisticsLock = IOLockAlloc(); 
+    if (!reserved->interruptStatisticsLock) return (false);
 
-    if (!reserved->interruptStatisticsLock) {
-        ret = false;
-        goto done;
-    }
-
-done:
-    return ret;
+    return (true);
 }
 
 void IOService::free( void )
@@ -554,6 +611,12 @@ void IOService::free( void )
         IODelete(reserved, ExpansionData, 1);
     }
 
+    if (_numInterruptSources && _interruptSources)
+    {
+       IOFree(_interruptSources, _numInterruptSources * sizeof(IOInterruptSource));
+       _interruptSources = 0;
+    }
+
     super::free();
 }
 
@@ -562,7 +625,11 @@ void IOService::free( void )
  */
 bool IOService::attach( IOService * provider )
 {
-    bool       ok;
+    bool         ok;
+    uint32_t     count;
+    AbsoluteTime deadline;
+    int                 waitResult = THREAD_AWAKENED;
+    bool        wait, computeDeadline = true;
 
     if( provider) {
 
@@ -570,12 +637,39 @@ bool IOService::attach( IOService * provider )
             LOG( "%s::attach(%s)\n", getName(),
                     provider->getName());
 
-        provider->lockForArbitration();
-        if( provider->__state[0] & kIOServiceInactiveState)
-            ok = false;
-        else
-            ok = attachToParent( provider, gIOServicePlane);
-        provider->unlockForArbitration();
+       ok   = false;
+       do
+       {
+            wait = false;
+           provider->lockForArbitration();
+           if (provider->__state[0] & kIOServiceInactiveState) ok = false;
+           else
+           {
+               count = provider->getChildCount(gIOServicePlane);
+               wait = (count > (kIOServiceBusyMax - 4));
+               if (!wait) ok = attachToParent(provider, gIOServicePlane);
+               else
+               {
+                   IOLog("stalling for detach from %s\n", provider->getName());
+                   IOLockLock( gIOServiceBusyLock );
+                   provider->__state[1] |= kIOServiceWaitDetachState;
+               }
+           }
+           provider->unlockForArbitration();
+           if (wait)
+           {
+                if (computeDeadline)
+                {
+                    clock_interval_to_deadline(15, kSecondScale, &deadline);
+                    computeDeadline = false;
+                }
+                assert_wait_deadline((event_t)&provider->__provider, THREAD_UNINT, deadline);
+                IOLockUnlock( gIOServiceBusyLock );
+               waitResult = thread_block(THREAD_CONTINUE_NULL);
+               wait = (waitResult != THREAD_TIMED_OUT);
+           }
+       }
+       while (wait);
 
     } else {
        gIOServiceRoot = this;
@@ -603,6 +697,15 @@ void IOService::detach( IOService * provider )
 
     lockForArbitration();
 
+    uint64_t regID1 = provider->getRegistryEntryID();
+    uint64_t regID2 = getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_DETACH,
+       (uintptr_t) regID1,
+       (uintptr_t) (regID1 >> 32),
+       (uintptr_t) regID2,
+       (uintptr_t) (regID2 >> 32));
+
     adjParent = ((busy = (__state[1] & kIOServiceBusyStateMask))
                && (provider == getProvider()));
 
@@ -616,6 +719,7 @@ void IOService::detach( IOService * provider )
 
     if (kIOServiceInactiveState & __state[0]) {
        getMetaClass()->removeInstance(this);
+       IORemoveServicePlatformActions(this);
     }
 
     unlockForArbitration();
@@ -636,8 +740,17 @@ void IOService::detach( IOService * provider )
         if( adjParent) provider->_adjustBusy( -1 );
         if( (provider->__state[1] & kIOServiceTermPhase3State)
          && (0 == provider->getClient())) {
-            provider->scheduleFinalize();
+            provider->scheduleFinalize(false);
         }
+
+        IOLockLock( gIOServiceBusyLock );
+       if (kIOServiceWaitDetachState & provider->__state[1])
+       {
+           provider->__state[1] &= ~kIOServiceWaitDetachState;
+           thread_wakeup(&provider->__provider);
+       }
+        IOLockUnlock( gIOServiceBusyLock );
+
         provider->unlockForArbitration();
     }
 }
@@ -669,6 +782,8 @@ void IOService::registerService( IOOptionBits options )
     if( gIOPlatform && (!gIOPlatform->platformAdjustService(this)))
        return;
 
+    IOInstallServicePlatformActions(this);
+
     if( (this != gIOResources)
      && (kIOLogRegister & gIOKitDebug)) {
 
@@ -718,7 +833,7 @@ void IOService::startMatching( IOOptionBits options )
        if ( options & kIOServiceAsynchronous )
                sync = false;
 
-    needConfig =  (0 == (__state[1] & (kIOServiceNeedConfigState | kIOServiceConfigState)))
+    needConfig =  (0 == (__state[1] & (kIOServiceNeedConfigState | kIOServiceConfigRunning)))
               && (0 == (__state[0] & kIOServiceInactiveState));
 
     __state[1] |= kIOServiceNeedConfigState;
@@ -890,7 +1005,7 @@ IOService * IOService::getProvider( void ) const
     IOService *        parent;
     SInt32     generation;
 
-    generation = getGenerationCount();
+    generation = getRegistryEntryGenerationCount();
     if( __providerGeneration == generation)
        return( __provider );
 
@@ -1477,6 +1592,41 @@ void IOService::unlockForArbitration( void )
     IOUnlock( gArbitrationLockQueueLock );
 }
 
+uint32_t IOService::isLockedForArbitration(IOService * service)
+{
+#if DEBUG_NOTIFIER_LOCKED
+    uint32_t                      count;
+    ArbitrationLockQueueElement * active;
+
+    // lock global access
+    IOLockLock(gArbitrationLockQueueLock);
+
+    // determine whether this object is already locked (ie. on active queue)
+    count = 0;
+    queue_iterate(&gArbitrationLockQueueActive,
+                  active,
+                  ArbitrationLockQueueElement *,
+                  link)
+    {
+        if ((active->thread == IOThreadSelf())
+            && (!service || (active->service == service)))
+        {
+            count += 0x10000;
+            count += active->count;
+        }
+    }
+
+    IOLockUnlock(gArbitrationLockQueueLock);
+
+    return (count);
+
+#else /* DEBUG_NOTIFIER_LOCKED */
+
+    return (0);
+
+#endif /* DEBUG_NOTIFIER_LOCKED */
+}
+
 void IOService::applyToProviders( IOServiceApplierFunction applier,
                                   void * context )
 {
@@ -1553,12 +1703,13 @@ applyToInterestNotifiers(const IORegistryEntry *target,
                         OSObjectApplierFunction applier,
                         void * context )
 {
-    OSArray *          copyArray = 0;
+    OSArray *  copyArray = 0;
+    OSObject * prop;
 
     LOCKREADNOTIFY();
 
-    IOCommand *notifyList =
-       OSDynamicCast( IOCommand, target->getProperty( typeOfInterest ));
+    prop = target->copyProperty(typeOfInterest);
+    IOCommand *notifyList = OSDynamicCast(IOCommand, prop);
 
     if( notifyList) {
         copyArray = OSArray::withCapacity(1);
@@ -1581,6 +1732,8 @@ applyToInterestNotifiers(const IORegistryEntry *target,
            (*applier)(next, context);
        copyArray->release();
     }
+
+    OSSafeReleaseNULL(prop);
 }
 
 void IOService::applyToInterested( const OSSymbol * typeOfInterest,
@@ -1645,7 +1798,7 @@ IONotifier * IOService::registerInterest( const OSSymbol * typeOfInterest,
     if (!notify) return NULL;
 
     if(notify->init()) {
-        rc = registerInterestForNotifer(notify, typeOfInterest,
+        rc = registerInterestForNotifier(notify, typeOfInterest,
                               handler, target, ref);
     }
 
@@ -1657,7 +1810,7 @@ IONotifier * IOService::registerInterest( const OSSymbol * typeOfInterest,
     return( notify );
 }
 
-IOReturn IOService::registerInterestForNotifer( IONotifier *svcNotify, const OSSymbol * typeOfInterest,
+IOReturn IOService::registerInterestForNotifier( IONotifier *svcNotify, const OSSymbol * typeOfInterest,
                   IOServiceInterestHandler handler, void * target, void * ref )
 {
     IOReturn rc = kIOReturnSuccess;
@@ -1686,15 +1839,18 @@ IOReturn IOService::registerInterestForNotifer( IONotifier *svcNotify, const OSS
         LOCKWRITENOTIFY();
 
         // Get the head of the notifier linked list
-        IOCommand *notifyList = (IOCommand *) getProperty( typeOfInterest );
-        if (!notifyList || !OSDynamicCast(IOCommand, notifyList)) {
+        IOCommand * notifyList;
+        OSObject  * obj = copyProperty( typeOfInterest );
+        if (!(notifyList = OSDynamicCast(IOCommand, obj))) {
             notifyList = OSTypeAlloc(IOCommand);
             if (notifyList) {
                 notifyList->init();
-                setProperty( typeOfInterest, notifyList);
+                bool ok = setProperty( typeOfInterest, notifyList);
                 notifyList->release();
+                if (!ok) notifyList = 0;
             }
         }
+        if (obj) obj->release();
 
         if (notifyList) {
             enqueue(&notifyList->fCommandChain, &notify->chain);
@@ -1731,11 +1887,27 @@ static void cleanInterestList( OSObject * head )
 
 void IOService::unregisterAllInterest( void )
 {
-    cleanInterestList( getProperty( gIOGeneralInterest ));
-    cleanInterestList( getProperty( gIOBusyInterest ));
-    cleanInterestList( getProperty( gIOAppPowerStateInterest ));
-    cleanInterestList( getProperty( gIOPriorityPowerStateInterest ));
-    cleanInterestList( getProperty( gIOConsoleSecurityInterest ));
+    OSObject * prop;
+
+    prop = copyProperty(gIOGeneralInterest);
+    cleanInterestList(prop);
+    OSSafeReleaseNULL(prop);
+
+    prop = copyProperty(gIOBusyInterest);
+    cleanInterestList(prop);
+    OSSafeReleaseNULL(prop);
+
+    prop = copyProperty(gIOAppPowerStateInterest);
+    cleanInterestList(prop);
+    OSSafeReleaseNULL(prop);
+
+    prop = copyProperty(gIOPriorityPowerStateInterest);
+    cleanInterestList(prop);
+    OSSafeReleaseNULL(prop);
+
+    prop = copyProperty(gIOConsoleSecurityInterest);
+    cleanInterestList(prop);
+    OSSafeReleaseNULL(prop);
 }
 
 /*
@@ -1858,7 +2030,7 @@ bool IOService::requestTerminate( IOService * provider, IOOptionBits options )
     // -- compat
     if( ok) {
         provider->terminateClient( this, options | kIOServiceRecursing );
-        ok = (0 != (__state[1] & kIOServiceRecursing));
+        ok = (0 != (kIOServiceInactiveState & __state[0]));
     }
     // --
 
@@ -1871,8 +2043,9 @@ bool IOService::terminatePhase1( IOOptionBits options )
     IOService *         client;
     OSIterator * iter;
     OSArray *   makeInactive;
-       int          waitResult = THREAD_AWAKENED;
-       bool         wait;
+    OSArray *   waitingInactive;
+    int          waitResult = THREAD_AWAKENED;
+    bool         wait;
     bool                ok;
     bool                didInactive;
     bool                startPhase2 = false;
@@ -1890,71 +2063,90 @@ bool IOService::terminatePhase1( IOOptionBits options )
     // -- compat
     if( options & kIOServiceRecursing) {
         lockForArbitration();
-       __state[0] |= kIOServiceInactiveState;
-        __state[1] |= kIOServiceRecursing;
+       if (0 == (kIOServiceInactiveState & __state[0]))
+       {
+           __state[0] |= kIOServiceInactiveState;
+           __state[1] |= kIOServiceRecursing | kIOServiceTermPhase1State;
+       }
         unlockForArbitration();
 
         return( true );
     }
     // -- 
 
-    makeInactive = OSArray::withCapacity( 16 );
-    if( !makeInactive)
-        return( false );
+    makeInactive    = OSArray::withCapacity( 16 );
+    waitingInactive = OSArray::withCapacity( 16 );
+    if(!makeInactive || !waitingInactive) return( false );
 
     victim = this;
     victim->retain();
 
-    while( victim ) {
-
+    while( victim )
+    {
        didInactive = victim->lockForArbitration( true );
-        if( didInactive) {
-            didInactive = (0 == (victim->__state[0] & kIOServiceInactiveState))
-                        || (victim->__state[1] & kIOServiceRecursing);
-            if( didInactive) {
-                victim->__state[0] |= kIOServiceInactiveState;
-                victim->__state[0] &= ~(kIOServiceRegisteredState | kIOServiceMatchedState
-                                        | kIOServiceFirstPublishState | kIOServiceFirstMatchState);
-                victim->__state[1] &= ~kIOServiceRecursing;
+        if( didInactive)
+        {
+           uint64_t regID1 = victim->getRegistryEntryID();
+           IOServiceTrace(IOSERVICE_TERM_SET_INACTIVE,
+               (uintptr_t) regID1, 
+               (uintptr_t) (regID1 >> 32),
+               (uintptr_t) victim->__state[1], 
+               (uintptr_t) 0);
+
+           enum { kRP1 = kIOServiceRecursing | kIOServiceTermPhase1State };
+            didInactive = (kRP1 == (victim->__state[1] & kRP1))
+                        || (0 == (victim->__state[0] & kIOServiceInactiveState));
 
+           if (!didInactive)
+           {
+               // a multiply attached IOService can be visited twice
+               if (-1U == waitingInactive->getNextIndexOfObject(victim, 0)) do
+               {
+                   IOLockLock(gIOServiceBusyLock);
+                   wait = (victim->__state[1] & kIOServiceTermPhase1State);
+                   if( wait) {
+                       TLOG("%s[0x%qx]::waitPhase1(%s[0x%qx])\n", 
+                           getName(), getRegistryEntryID(), victim->getName(), victim->getRegistryEntryID());
+                       victim->__state[1] |= kIOServiceTerm1WaiterState;
+                       victim->unlockForArbitration();
+                       assert_wait((event_t)&victim->__state[1], THREAD_UNINT);
+                   }
+                   IOLockUnlock(gIOServiceBusyLock);
+                   if( wait) {
+                       waitResult = thread_block(THREAD_CONTINUE_NULL);
+                       TLOG("%s[0x%qx]::did waitPhase1(%s[0x%qx])\n", 
+                           getName(), getRegistryEntryID(), victim->getName(), victim->getRegistryEntryID());
+                       victim->lockForArbitration();
+                   }
+               }
+               while (wait && (waitResult != THREAD_TIMED_OUT));
+           }
+           else
+           {
+               victim->__state[0] |= kIOServiceInactiveState;
+               victim->__state[0] &= ~(kIOServiceRegisteredState | kIOServiceMatchedState
+                                       | kIOServiceFirstPublishState | kIOServiceFirstMatchState);
+               victim->__state[1] &= ~kIOServiceRecursing;
+               victim->__state[1] |= kIOServiceTermPhase1State;
+               waitingInactive->headQ(victim);
                if (victim == this)
                {
-                   victim->__state[1] |= kIOServiceTermPhase1State;
                    if (kIOServiceTerminateNeedWillTerminate & options)
                    {
                        victim->__state[1] |= kIOServiceNeedWillTerminate;
                    }
                }
-
-                victim->_adjustBusy( 1 );
-
-            } else if (victim != this) do {
-
-               IOLockLock(gIOServiceBusyLock);
-               wait = (victim->__state[1] & kIOServiceTermPhase1State);
-               if( wait) {
-                   TLOG("%s[0x%qx]::waitPhase1(%s[0x%qx])\n", 
-                       getName(), getRegistryEntryID(), victim->getName(), victim->getRegistryEntryID());
-                       victim->__state[1] |= kIOServiceTerm1WaiterState;
-                       victim->unlockForArbitration();
-                       assert_wait((event_t)&victim->__state[1], THREAD_UNINT);
-               }
-               IOLockUnlock(gIOServiceBusyLock);
-               if( wait) {
-                   waitResult = thread_block(THREAD_CONTINUE_NULL);
-                   TLOG("%s[0x%qx]::did waitPhase1(%s[0x%qx])\n", 
-                       getName(), getRegistryEntryID(), victim->getName(), victim->getRegistryEntryID());
-                       victim->lockForArbitration();
-               }
-           } while( wait && (waitResult != THREAD_TIMED_OUT));
-
+               victim->_adjustBusy( 1 );
+           }
            victim->unlockForArbitration();
         }
-        if( victim == this)
-            startPhase2 = didInactive;
-        if( didInactive) {
+        if( victim == this) startPhase2 = didInactive;
+        if (didInactive)
+        {
+            OSArray * notifiers;
+            notifiers = victim->copyNotifiers(gIOTerminatedNotification, 0, 0xffffffff);
+            victim->invokeNotifiers(&notifiers);
 
-            victim->deliverNotification( gIOTerminatedNotification, 0, 0xffffffff );
             IOUserClient::destroyUserReferences( victim );
 
             iter = victim->getClientIterator();
@@ -1991,23 +2183,35 @@ bool IOService::terminatePhase1( IOOptionBits options )
             makeInactive->removeObject(0);
         }
     }
-
     makeInactive->release();
 
-    if( startPhase2)
+    while ((victim = (IOService *) waitingInactive->getObject(0)))
     {
-       lockForArbitration();
-       __state[1] &= ~kIOServiceTermPhase1State;
-       if (kIOServiceTerm1WaiterState & __state[1])
+       victim->retain();
+       waitingInactive->removeObject(0);
+
+       victim->lockForArbitration();
+       victim->__state[1] &= ~kIOServiceTermPhase1State;
+       if (kIOServiceTerm1WaiterState & victim->__state[1])
        {
-           __state[1] &= ~kIOServiceTerm1WaiterState;
-           TLOG("%s[0x%qx]::wakePhase1\n", getName(), getRegistryEntryID());
+           victim->__state[1] &= ~kIOServiceTerm1WaiterState;
+           TLOG("%s[0x%qx]::wakePhase1\n", victim->getName(), victim->getRegistryEntryID());
            IOLockLock( gIOServiceBusyLock );
-           thread_wakeup( (event_t) &__state[1]);
+           thread_wakeup( (event_t) &victim->__state[1]);
            IOLockUnlock( gIOServiceBusyLock );
        }
+       victim->unlockForArbitration();
+        victim->release();
+    }
+    waitingInactive->release();
+
+    if( startPhase2)
+    {
+        retain();
+       lockForArbitration();
+       scheduleTerminatePhase2(options);
        unlockForArbitration();
-       scheduleTerminatePhase2( options );
+        release();
     }
 
     return( true );
@@ -2028,34 +2232,49 @@ void IOService::setTerminateDefer(IOService * provider, bool defer)
     }
 }
 
+// Must call this while holding gJobsLock
+void IOService::waitToBecomeTerminateThread(void)
+{
+    IOLockAssert(gJobsLock, kIOLockAssertOwned);
+    bool wait;
+    do {
+        wait = (gIOTerminateThread != THREAD_NULL);
+        if (wait) {
+            IOLockSleep(gJobsLock, &gIOTerminateThread, THREAD_UNINT);
+        }
+    } while (wait);
+    gIOTerminateThread = current_thread();
+}
+
 // call with lockForArbitration
 void IOService::scheduleTerminatePhase2( IOOptionBits options )
 {
     AbsoluteTime       deadline;
+    uint64_t           regID1;
     int                        waitResult = THREAD_AWAKENED;
-    bool               wait, haveDeadline = false;
+    bool               wait = false, haveDeadline = false;
 
-    if (!(__state[0] & kIOServiceInactiveState)
-      || (__state[1] & kIOServiceTermPhase1State))             return;
+    if (!(__state[0] & kIOServiceInactiveState)) return;
 
-    options |= kIOServiceRequired;
+    regID1 = getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERM_SCHED_PHASE2,
+       (uintptr_t) regID1,
+       (uintptr_t) (regID1 >> 32),
+       (uintptr_t) __state[1],
+       (uintptr_t) options);
 
-    retain();
+    if (__state[1] & kIOServiceTermPhase1State)                return;
 
+    retain();
+    unlockForArbitration();
+    options |= kIOServiceRequired;
     IOLockLock( gJobsLock );
 
     if( (options & kIOServiceSynchronous)
         && (current_thread() != gIOTerminateThread)) {
 
-        do {
-            wait = (gIOTerminateThread != 0);
-            if( wait) {
-                // wait to become the terminate thread
-                IOLockSleep( gJobsLock, &gIOTerminateThread, THREAD_UNINT);
-            }
-        } while( wait );
-
-        gIOTerminateThread = current_thread();
+        waitToBecomeTerminateThread();
         gIOTerminatePhase2List->setObject( this );
         gIOTerminateWork++;
 
@@ -2064,16 +2283,20 @@ void IOService::scheduleTerminatePhase2( IOOptionBits options )
                terminateWorker( options );
             wait = (0 != (__state[1] & kIOServiceBusyStateMask));
             if( wait) {
-                // wait for the victim to go non-busy
+                /* wait for the victim to go non-busy */
                 if( !haveDeadline) {
                     clock_interval_to_deadline( 15, kSecondScale, &deadline );
                     haveDeadline = true;
                 }
+                /* let others do work while we wait */
+                gIOTerminateThread = 0;
+                IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);
                 waitResult = IOLockSleepDeadline( gJobsLock, &gIOTerminateWork,
                                                   deadline, THREAD_UNINT );
-                if( waitResult == THREAD_TIMED_OUT) {
-                    IOLog("%s[0x%qx]::terminate(kIOServiceSynchronous) timeout\n", getName(), getRegistryEntryID());
-               }
+                if (__improbable(waitResult == THREAD_TIMED_OUT)) {
+                    panic("%s[0x%qx]::terminate(kIOServiceSynchronous) timeout\n", getName(), getRegistryEntryID());
+                }
+                waitToBecomeTerminateThread();
             }
         } while(gIOTerminateWork || (wait && (waitResult != THREAD_TIMED_OUT)));
 
@@ -2085,30 +2308,33 @@ void IOService::scheduleTerminatePhase2( IOOptionBits options )
 
         gIOTerminatePhase2List->setObject( this );
         if( 0 == gIOTerminateWork++) {
-           if( !gIOTerminateThread)
-               kernel_thread_start(&terminateThread, (void *)(uintptr_t) options, &gIOTerminateThread);
-           else
-               IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
-       }
+            assert(gIOTerminateWorkerThread);
+            IOLockWakeup(gJobsLock, (event_t)&gIOTerminateWork, /* one-thread */ false );
+        }
     }
 
     IOLockUnlock( gJobsLock );
-
+    lockForArbitration();
     release();
 }
 
+__attribute__((__noreturn__))
 void IOService::terminateThread( void * arg, wait_result_t waitResult )
 {
-    IOLockLock( gJobsLock );
-
-    while (gIOTerminateWork)
-       terminateWorker( (uintptr_t) arg );
+    // IOLockSleep re-acquires the lock on wakeup, so we only need to do this once
+    IOLockLock(gJobsLock);
+    while (true) {
+        if (gIOTerminateThread != gIOTerminateWorkerThread) {
+            waitToBecomeTerminateThread();
+        }
 
-    thread_deallocate(gIOTerminateThread);
-    gIOTerminateThread = 0;
-    IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);
+        while (gIOTerminateWork)
+            terminateWorker( (uintptr_t)arg );
 
-    IOLockUnlock( gJobsLock );
+        gIOTerminateThread = 0;
+        IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);
+        IOLockSleep(gJobsLock, &gIOTerminateWork, THREAD_UNINT);
+    }
 }
 
 void IOService::scheduleStop( IOService * provider )
@@ -2129,16 +2355,14 @@ void IOService::scheduleStop( IOService * provider )
     gIOStopProviderList->tailQ( provider );
 
     if( 0 == gIOTerminateWork++) {
-        if( !gIOTerminateThread)
-           kernel_thread_start(&terminateThread, (void *) 0, &gIOTerminateThread);
-        else
-            IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
+        assert(gIOTerminateWorkerThread);
+        IOLockWakeup(gJobsLock, (event_t)&gIOTerminateWork, /* one-thread */ false );
     }
 
     IOLockUnlock( gJobsLock );
 }
 
-void IOService::scheduleFinalize( void )
+void IOService::scheduleFinalize(bool now)
 {
     uint64_t regID1 = getRegistryEntryID();
 
@@ -2149,17 +2373,16 @@ void IOService::scheduleFinalize( void )
        (uintptr_t) (regID1 >> 32),
        0, 0);
 
-    IOLockLock( gJobsLock );
-    gIOFinalizeList->tailQ( this );
-
-    if( 0 == gIOTerminateWork++) {
-        if( !gIOTerminateThread)
-           kernel_thread_start(&terminateThread, (void *) 0, &gIOTerminateThread);
-        else
-            IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
+    if (now || IOUserClient::finalizeUserReferences(this))
+    {
+       IOLockLock( gJobsLock );
+       gIOFinalizeList->tailQ(this);
+       if( 0 == gIOTerminateWork++) {
+           assert(gIOTerminateWorkerThread);
+           IOLockWakeup(gJobsLock, (event_t)&gIOTerminateWork, /* one-thread */ false );
+       }
+       IOLockUnlock( gJobsLock );
     }
-
-    IOLockUnlock( gJobsLock );
 }
 
 bool IOService::willTerminate( IOService * provider, IOOptionBits options )
@@ -2226,7 +2449,7 @@ void IOService::actionDidTerminate( IOService * victim, IOOptionBits options,
 {
     OSIterator * iter;
     IOService *         client;
-    bool defer = false;
+    bool         defer;
     uint64_t     regID1, regID2 = victim->getRegistryEntryID();
 
     victim->messageClients( kIOMessageServiceIsTerminated, (void *)(uintptr_t) options );
@@ -2239,6 +2462,7 @@ void IOService::actionDidTerminate( IOService * victim, IOOptionBits options,
             TLOG("%s[0x%qx]::didTerminate(%s[0x%qx], %08llx)\n",
                     client->getName(), regID1, 
                     victim->getName(), regID2, (long long)options);
+            defer = false;
             client->didTerminate( victim, options, &defer );
 
            IOServiceTrace(
@@ -2394,22 +2618,50 @@ void IOService::terminateWorker( IOOptionBits options )
             gIOTerminatePhase2List->removeObject(0);
             IOLockUnlock( gJobsLock );
 
+           uint64_t regID1 = victim->getRegistryEntryID();
+           IOServiceTrace(
+               IOSERVICE_TERM_START_PHASE2,
+               (uintptr_t) regID1,
+               (uintptr_t) (regID1 >> 32),
+               (uintptr_t) 0,
+               (uintptr_t) 0);
+
             while( victim ) {
         
                 doPhase2 = victim->lockForArbitration( true );
                 if( doPhase2) {
                     doPhase2 = (0 != (kIOServiceInactiveState & victim->__state[0]));
                     if( doPhase2) {
-                        doPhase2 = (0 == (victim->__state[1] & kIOServiceTermPhase2State))
-                                && (0 == (victim->__state[1] & kIOServiceConfigState));
+
+                       uint64_t regID1 = victim->getRegistryEntryID();
+                       IOServiceTrace(
+                           IOSERVICE_TERM_TRY_PHASE2,
+                           (uintptr_t) regID1,
+                           (uintptr_t) (regID1 >> 32),
+                           (uintptr_t) victim->__state[1],
+                           (uintptr_t) 0);
+
+                       doPhase2 = (0 == (victim->__state[1] &
+                                   (kIOServiceTermPhase1State
+                                   | kIOServiceTermPhase2State
+                                   | kIOServiceConfigState)));
 
                        if (doPhase2 && (iter = victim->getClientIterator())) {
                            while (doPhase2 && (client = (IOService *) iter->getNextObject())) {
                                doPhase2 = (0 == (client->__state[1] & kIOServiceStartState));
-
-                               if (!doPhase2) TLOG("%s[0x%qx]::defer phase2(%s[0x%qx])\n", 
-                                              victim->getName(), victim->getRegistryEntryID(), 
-                                              client->getName(), client->getRegistryEntryID());
+                               if (!doPhase2)
+                               {
+                                   uint64_t regID1 = client->getRegistryEntryID();
+                                   IOServiceTrace(
+                                       IOSERVICE_TERM_UC_DEFER,
+                                       (uintptr_t) regID1,
+                                       (uintptr_t) (regID1 >> 32),
+                                       (uintptr_t) client->__state[1],
+                                       (uintptr_t) 0);
+                                   TLOG("%s[0x%qx]::defer phase2(%s[0x%qx])\n",
+                                          victim->getName(), victim->getRegistryEntryID(),
+                                          client->getName(), client->getRegistryEntryID());
+                               }
                            }
                            iter->release();
                        }
@@ -2425,15 +2677,13 @@ void IOService::terminateWorker( IOOptionBits options )
                                             victim, (void *)(uintptr_t) options, NULL );
                    }
 
-                    if( 0 == victim->getClient()) {
-                        // no clients - will go to finalize
-                        IOLockLock( gJobsLock );
-                        gIOFinalizeList->tailQ( victim );
-                        IOLockUnlock( gJobsLock );
-                    } else {
-                        _workLoopAction( (IOWorkLoop::Action) &actionWillTerminate,
+                   OSArray * notifiers;
+                   notifiers = victim->copyNotifiers(gIOWillTerminateNotification, 0, 0xffffffff);
+                   victim->invokeNotifiers(&notifiers);
+
+                    _workLoopAction( (IOWorkLoop::Action) &actionWillTerminate,
                                             victim, (void *)(uintptr_t) options, (void *)(uintptr_t) doPhase2List );
-                    }
+
                     didPhase2List->headQ( victim );
                 }
                 victim->release();
@@ -2445,9 +2695,10 @@ void IOService::terminateWorker( IOOptionBits options )
             }
         
             while( (victim = (IOService *) didPhase2List->getObject(0)) ) {
-    
-                if( victim->lockForArbitration( true )) {
+               bool scheduleFinalize = false;
+               if( victim->lockForArbitration( true )) {
                     victim->__state[1] |= kIOServiceTermPhase3State;
+                    scheduleFinalize = (0 == victim->getClient());
                     victim->unlockForArbitration();
                 }
                 _workLoopAction( (IOWorkLoop::Action) &actionDidTerminate,
@@ -2456,6 +2707,8 @@ void IOService::terminateWorker( IOOptionBits options )
                    _workLoopAction( (IOWorkLoop::Action) &actionDidStop,
                                        victim, (void *)(uintptr_t) options, NULL );
                }
+                // no clients - will go to finalize
+                if (scheduleFinalize) victim->scheduleFinalize(false);
                 didPhase2List->removeObject(0);
             }
             IOLockLock( gJobsLock );
@@ -2466,10 +2719,17 @@ void IOService::terminateWorker( IOOptionBits options )
             doPhase3 = false;
             // finalize leaves
             while( (victim = (IOService *) gIOFinalizeList->getObject(0))) {
-    
+                bool sendFinal = false;
                 IOLockUnlock( gJobsLock );
-                _workLoopAction( (IOWorkLoop::Action) &actionFinalize,
+                if (victim->lockForArbitration(true)) {
+                    sendFinal = (0 == (victim->__state[1] & kIOServiceFinalized));
+                    if (sendFinal) victim->__state[1] |= kIOServiceFinalized;
+                    victim->unlockForArbitration();
+                }
+                if (sendFinal) {
+                    _workLoopAction( (IOWorkLoop::Action) &actionFinalize,
                                     victim, (void *)(uintptr_t) options );
+                }
                 IOLockLock( gJobsLock );
                 // hold off free
                 freeList->setObject( victim );
@@ -2498,22 +2758,26 @@ void IOService::terminateWorker( IOOptionBits options )
 
                 } else {
                     // a terminated client is not ready for stop if it has clients, skip it
-                    if( (kIOServiceInactiveState & client->__state[0]) && client->getClient()) {
-                        TLOG("%s[0x%qx]::defer stop(%s[0x%qx])\n", 
-                               client->getName(), regID2, 
-                               client->getClient()->getName(), client->getClient()->getRegistryEntryID());
-                       IOServiceTrace(
-                           IOSERVICE_TERMINATE_STOP_DEFER,
-                           (uintptr_t) regID1, 
-                           (uintptr_t) (regID1 >> 32),
-                           (uintptr_t) regID2, 
-                           (uintptr_t) (regID2 >> 32));
-
-                        idx++;
-                        continue;
-                    }
-        
+                    bool deferStop = (0 != (kIOServiceInactiveState & client->__state[0]));
                     IOLockUnlock( gJobsLock );
+                    if (deferStop && client->lockForArbitration(true)) {
+                        deferStop = (0 == (client->__state[1] & kIOServiceFinalized));
+                        //deferStop = (!deferStop && (0 != client->getClient()));
+                        //deferStop = (0 != client->getClient());
+                        client->unlockForArbitration();
+                        if (deferStop) {
+                            TLOG("%s[0x%qx]::defer stop()\n", client->getName(), regID2);
+                            IOServiceTrace(IOSERVICE_TERMINATE_STOP_DEFER,
+                               (uintptr_t) regID1,
+                               (uintptr_t) (regID1 >> 32),
+                               (uintptr_t) regID2,
+                               (uintptr_t) (regID2 >> 32));
+
+                            idx++;
+                            IOLockLock( gJobsLock );
+                            continue;
+                        }
+                    }
                     _workLoopAction( (IOWorkLoop::Action) &actionStop,
                                      provider, (void *) client );
                     IOLockLock( gJobsLock );
@@ -2790,23 +3054,30 @@ static SInt32 IOServiceObjectOrder( const OSObject * entry, void * ref)
     _IOServiceNotifier * notify;
     OSSymbol *         key = (OSSymbol *) ref;
     OSNumber *         offset;
+    OSObject *          prop;
+    SInt32              result;
 
+    prop = 0;
+    result = kIODefaultProbeScore;
     if( (dict = OSDynamicCast( OSDictionary, entry)))
         offset = OSDynamicCast(OSNumber, dict->getObject( key ));
     else if( (notify = OSDynamicCast( _IOServiceNotifier, entry)))
        return( notify->priority );
-
     else if( (service = OSDynamicCast( IOService, entry)))
-        offset = OSDynamicCast(OSNumber, service->getProperty( key ));
+    {
+        prop = service->copyProperty(key);
+        offset = OSDynamicCast(OSNumber, prop);
+    }
     else {
        assert( false );
        offset = 0;
     }
 
-    if( offset)
-        return( (SInt32) offset->unsigned32BitValue());
-    else
-        return( kIODefaultProbeScore );
+    if (offset) result = offset->unsigned32BitValue();
+
+    OSSafeReleaseNULL(prop);
+
+    return (result);
 }
 
 SInt32 IOServiceOrdering( const OSMetaClassBase * inObj1, const OSMetaClassBase * inObj2, void * ref )
@@ -2861,14 +3132,22 @@ IOService * IOService::getClientWithCategory( const OSSymbol * category )
     return (service);
 }
 
-bool IOService::invokeNotifer( _IOServiceNotifier * notify )
+bool IOService::invokeNotifier( _IOServiceNotifier * notify )
 {
     _IOServiceNotifierInvocation invocation;
     bool                        willNotify;
     bool                        ret = true;
-
     invocation.thread = current_thread();
 
+#if DEBUG_NOTIFIER_LOCKED
+    uint32_t count;
+    if ((count = isLockedForArbitration(0)))
+    {
+        IOLog("[%s, 0x%x]\n", notify->type->getCStringNoCopy(), count);
+        panic("[%s, 0x%x]\n", notify->type->getCStringNoCopy(), count);
+    }
+#endif /* DEBUG_NOTIFIER_LOCKED */
+
     LOCKWRITENOTIFY();
     willNotify = (0 != (kIOServiceNotifyEnable & notify->state));
 
@@ -2895,6 +3174,27 @@ bool IOService::invokeNotifer( _IOServiceNotifier * notify )
     return( ret );
 }
 
+bool IOService::invokeNotifiers(OSArray ** willSend)
+{
+    OSArray *            array;
+    _IOServiceNotifier * notify;
+    bool                 ret = true;
+
+    array = *willSend;
+    if (!array) return (true);
+    *willSend = 0;
+
+    for( unsigned int idx = 0;
+         (notify = (_IOServiceNotifier *) array->getObject(idx));
+         idx++) {
+        ret &= invokeNotifier(notify);
+    }
+    array->release();
+
+    return (ret);
+}
+
+
 /*
  * Alloc and probe matching classes,
  * called on the provider instance
@@ -2932,10 +3232,7 @@ void IOService::probeCandidates( OSOrderedSet * matches )
         
         if( (notify = OSDynamicCast( _IOServiceNotifier, nextMatch ))) {
 
-            lockForArbitration();
-            if( 0 == (__state[0] & kIOServiceInactiveState))
-                invokeNotifer( notify );
-            unlockForArbitration();
+            if (0 == (__state[0] & kIOServiceInactiveState)) invokeNotifier( notify );
             nextMatch->release();
             nextMatch = 0;
             continue;
@@ -3032,12 +3329,12 @@ void IOService::probeCandidates( OSOrderedSet * matches )
                 if( !symbol)
                     continue;
     
-                //IOLog("%s alloc (symbol %p props %p)\n", symbol->getCStringNoCopy(), OBFUSCATE(symbol), OBFUSCATE(props));
+                //IOLog("%s alloc (symbol %p props %p)\n", symbol->getCStringNoCopy(), IOSERVICE_OBFUSCATE(symbol), IOSERVICE_OBFUSCATE(props));
 
                 // alloc the driver instance
                 inst = (IOService *) OSMetaClass::allocClassWithName( symbol);
     
-                if( !inst) {
+                if( !inst || !OSDynamicCast(IOService, inst)) {
                     IOLog("Couldn't alloc class \"%s\"\n",
                         symbol->getCStringNoCopy());
                     continue;
@@ -3138,7 +3435,7 @@ void IOService::probeCandidates( OSOrderedSet * matches )
                startList->removeObject(inst);
 
 #if IOMATCHDEBUG
-               debugFlags = getDebugFlags( inst->getPropertyTable() );
+                debugFlags = getDebugFlags( inst );
 
                 if( debugFlags & kIOLogStart) {
                     if( started)
@@ -3280,11 +3577,15 @@ bool IOService::addNeededResource( const char * key )
     OSString * newKey;
     bool ret;
 
-    resourcesProp = getProperty( gIOResourceMatchKey );
+    resourcesProp = copyProperty( gIOResourceMatchKey );
+    if (!resourcesProp) return(false);
 
     newKey = OSString::withCString( key );
-    if( (0 == resourcesProp) || (0 == newKey))
+    if (!newKey)
+    {
+       resourcesProp->release();
        return( false);
+    }
 
     set = OSDynamicCast( OSSet, resourcesProp );
     if( !set) {
@@ -3299,6 +3600,7 @@ bool IOService::addNeededResource( const char * key )
     newKey->release();
     ret = setProperty( gIOResourceMatchKey, set );
     set->release();
+    resourcesProp->release();
 
     return( ret );
 }
@@ -3325,12 +3627,12 @@ bool IOService::checkResource( OSObject * matching )
     }
 
     if( gIOKitDebug & kIOLogConfig)
-        LOG("config(%p): stalling %s\n", OBFUSCATE(IOThreadSelf()), getName());
+        LOG("config(%p): stalling %s\n", IOSERVICE_OBFUSCATE(IOThreadSelf()), getName());
 
     waitForService( table );
 
     if( gIOKitDebug & kIOLogConfig)
-        LOG("config(%p): waking\n", OBFUSCATE(IOThreadSelf()) );
+        LOG("config(%p): waking\n", IOSERVICE_OBFUSCATE(IOThreadSelf()) );
 
     return( true );
 }
@@ -3342,7 +3644,7 @@ bool IOService::checkResources( void )
     OSIterator *       iter;
     bool               ok;
 
-    resourcesProp = getProperty( gIOResourceMatchKey );
+    resourcesProp = copyProperty( gIOResourceMatchKey );
     if( 0 == resourcesProp)
         return( true );
 
@@ -3358,6 +3660,8 @@ bool IOService::checkResources( void )
     } else
        ok = checkResource( resourcesProp );
 
+    OSSafeReleaseNULL(resourcesProp);
+
     return( ok );
 }
 
@@ -3396,10 +3700,12 @@ void IOService::doServiceMatch( IOOptionBits options )
     _IOServiceNotifier * notify;
     OSIterator *       iter;
     OSOrderedSet *     matches;
+    OSArray *           resourceKeys = 0;
     SInt32             catalogGeneration;
     bool               keepGuessing = true;
     bool               reRegistered = true;
     bool               didRegister;
+    OSArray *           notifiers[2] = {0};
 
 //    job->nub->deliverNotification( gIOPublishNotification,
 //                             kIOServiceRegisteredState, 0xffffffff );
@@ -3413,12 +3719,12 @@ void IOService::doServiceMatch( IOOptionBits options )
             lockForArbitration();
             if( 0 == (__state[0] & kIOServiceFirstPublishState)) {
                getMetaClass()->addInstance(this);
-                deliverNotification( gIOFirstPublishNotification,
+                notifiers[0] = copyNotifiers(gIOFirstPublishNotification,
                                      kIOServiceFirstPublishState, 0xffffffff );
             }
            LOCKREADNOTIFY();
             __state[1] &= ~kIOServiceNeedConfigState;
-            __state[1] |= kIOServiceConfigState;
+            __state[1] |= kIOServiceConfigState | kIOServiceConfigRunning;
             didRegister = (0 == (kIOServiceRegisteredState & __state[0]));
             __state[0] |= kIOServiceRegisteredState;
 
@@ -3440,9 +3746,17 @@ void IOService::doServiceMatch( IOOptionBits options )
 
            UNLOCKNOTIFY();
             unlockForArbitration();
+            invokeNotifiers(&notifiers[0]);
 
             if (keepGuessing && matches->getCount() && (kIOReturnSuccess == getResources()))
+            {
+                if (this == gIOResources)
+                {
+                   if (resourceKeys) resourceKeys->release();
+                   resourceKeys = copyPropertyKeys();
+                }
                 probeCandidates( matches );
+            }
             else
                 matches->release();
         }
@@ -3460,13 +3774,25 @@ void IOService::doServiceMatch( IOOptionBits options )
 
     if( (0 == (__state[0] & kIOServiceInactiveState))
      && (0 == (__state[1] & kIOServiceModuleStallState)) ) {
-        deliverNotification( gIOMatchedNotification,
-               kIOServiceMatchedState, 0xffffffff );
+
+        if (resourceKeys) setProperty(gIOResourceMatchedKey, resourceKeys);
+
+        notifiers[0] = copyNotifiers(gIOMatchedNotification,
+               kIOServiceMatchedState, 0xffffffff);
        if( 0 == (__state[0] & kIOServiceFirstMatchState))
-           deliverNotification( gIOFirstMatchNotification,
-               kIOServiceFirstMatchState, 0xffffffff );
+           notifiers[1] = copyNotifiers(gIOFirstMatchNotification,
+               kIOServiceFirstMatchState, 0xffffffff);
     }
 
+    __state[1] &= ~kIOServiceConfigRunning;
+    unlockForArbitration();
+
+    if (resourceKeys) resourceKeys->release();
+
+    invokeNotifiers(&notifiers[0]);
+    invokeNotifiers(&notifiers[1]);
+
+    lockForArbitration();
     __state[1] &= ~kIOServiceConfigState;
     scheduleTerminatePhase2();
 
@@ -3507,9 +3833,9 @@ UInt32 IOService::_adjustBusy( SInt32 delta )
             next->unlockForArbitration();
 
         if( (wasQuiet || nowQuiet) ) {
-           uint64_t regID = next->getRegistryEntryID();
 
-               IOServiceTrace(
+           uint64_t regID = next->getRegistryEntryID();
+           IOServiceTrace(
                ((wasQuiet/*nowBusy*/) ? IOSERVICE_BUSY : IOSERVICE_NONBUSY),
                (uintptr_t) regID, 
                (uintptr_t) (regID >> 32),
@@ -3632,13 +3958,103 @@ IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
 
 IOReturn IOService::waitQuiet( uint64_t timeout )
 {
-       IOReturn ret;
-    ret = waitForState( kIOServiceBusyStateMask, 0, timeout );
-       if ((kIOReturnTimeout == ret) && (timeout >= 30000000000) && (kIOWaitQuietPanics & gIOKitDebug))
-       {
-               panic("IOService 0x%llx (%s) busy timeout", getRegistryEntryID(), getName());
-       }
-       return (ret);
+    IOReturn ret;
+    uint32_t loops;
+    char *   string = NULL;
+    char *   panicString = NULL;
+    size_t   len;
+    size_t   panicStringLen;
+    uint64_t time;
+    uint64_t nano;
+    bool     kextdWait;
+    bool     dopanic;
+
+    enum { kTimeoutExtensions = 4 };
+
+    time = mach_absolute_time();
+    kextdWait = false;
+    for (loops = 0; loops < kTimeoutExtensions; loops++)
+    {
+        ret = waitForState( kIOServiceBusyStateMask, 0, timeout );
+
+        if (loops && (kIOReturnSuccess == ret))
+        {
+            time = mach_absolute_time() - time;
+            absolutetime_to_nanoseconds(*(AbsoluteTime *)&time, &nano);
+            IOLog("busy extended ok[%d], (%llds, %llds)\n",
+                  loops, timeout / 1000000000ULL, nano / 1000000000ULL);
+            break;
+        }
+        else if (kIOReturnTimeout != ret) break;
+        else if (timeout < 41000000000)   break;
+
+        {
+            IORegistryIterator * iter;
+            OSOrderedSet       * set;
+            OSOrderedSet       * leaves;
+            IOService          * next;
+            IOService          * nextParent;
+            char               * s;
+            size_t               l;
+
+            len = 256;
+            panicStringLen = 256;
+            if (!string)      string      = IONew(char, len);
+            if (!panicString) panicString = IONew(char, panicStringLen);
+            set = NULL;
+            kextdWait = OSKext::isWaitingKextd();
+            iter = IORegistryIterator::iterateOver(this, gIOServicePlane, kIORegistryIterateRecursively);
+            leaves = OSOrderedSet::withCapacity(4);
+            if (iter) set = iter->iterateAll();
+            if (string && panicString && leaves && set)
+            {
+               string[0] = panicString[0] = 0;
+               set->setObject(this);
+                while ((next = (IOService *) set->getLastObject()))
+                {
+                    if (next->getBusyState())
+                    {
+                        if (kIOServiceModuleStallState & next->__state[1]) kextdWait = true;
+                        leaves->setObject(next);
+                        nextParent = next;
+                        while ((nextParent = nextParent->getProvider()))
+                        {
+                            set->removeObject(nextParent);
+                            leaves->removeObject(nextParent);
+                        }
+                    }
+                    set->removeObject(next);
+                }
+                s = string;
+                while ((next = (IOService *) leaves->getLastObject()))
+                {
+                    l = snprintf(s, len, "%s'%s'", ((s == string) ? "" : ", "), next->getName());
+                    if (l >= len) break;
+                    s += l;
+                    len -= l;
+                    leaves->removeObject(next);
+                }
+            }
+            OSSafeReleaseNULL(leaves);
+            OSSafeReleaseNULL(set);
+            OSSafeReleaseNULL(iter);
+        }
+
+       dopanic = ((loops >= (kTimeoutExtensions - 1)) && (kIOWaitQuietPanics & gIOKitDebug));
+       snprintf(panicString, panicStringLen,
+                "%s[%d], (%llds): %s",
+                 kextdWait ? "kextd stall" : "busy timeout",
+                loops, timeout / 1000000000ULL,
+                string ? string : "");
+       IOLog("%s\n", panicString);
+       if (dopanic)     panic("%s", panicString);
+       else if (!loops) getPMRootDomain()->startSpinDump(1);
+    }
+
+    if (string)      IODelete(string, char, 256);
+    if (panicString) IODelete(panicString, char, panicStringLen);
+
+    return (ret);
 }
 
 IOReturn IOService::waitQuiet( mach_timespec_t * timeout )
@@ -3706,7 +4122,7 @@ void _IOConfigThread::main(void * arg, wait_result_t result)
 
           if( gIOKitDebug & kIOLogConfig)
             LOG("config(%p): starting on %s, %d\n",
-                        OBFUSCATE(IOThreadSelf()), job->nub->getName(), job->type);
+                        IOSERVICE_OBFUSCATE(IOThreadSelf()), job->nub->getName(), job->type);
 
          switch( job->type) {
 
@@ -3716,7 +4132,7 @@ void _IOConfigThread::main(void * arg, wait_result_t result)
 
             default:
                 LOG("config(%p): strange type (%d)\n",
-                       OBFUSCATE(IOThreadSelf()), job->type );
+                       IOSERVICE_OBFUSCATE(IOThreadSelf()), job->type );
                break;
             }
 
@@ -3740,7 +4156,7 @@ void _IOConfigThread::main(void * arg, wait_result_t result)
     } while( alive );
 
     if( gIOKitDebug & kIOLogConfig)
-        LOG("config(%p): terminating\n", OBFUSCATE(IOThreadSelf()) );
+        LOG("config(%p): terminating\n", IOSERVICE_OBFUSCATE(IOThreadSelf()) );
 
     self->release();
 }
@@ -3778,6 +4194,11 @@ IOReturn IOService::waitMatchIdle( UInt32 msToWait )
         return( kIOReturnSuccess );
 }
 
+void IOService::cpusRunning(void)
+{
+    gCPUsRunning = true;
+}
+
 void _IOServiceJob::pingConfig( _IOServiceJob * job )
 {
     int                count;
@@ -3794,7 +4215,9 @@ void _IOServiceJob::pingConfig( _IOServiceJob * job )
 //    if( gNumConfigThreads) count++;// assume we're called from a config thread
 
     create = (  (gOutstandingJobs > count)
-               && (gNumConfigThreads < kMaxConfigThreads) );
+               && ((gNumConfigThreads < kMaxConfigThreads) 
+            || (job->nub == gIOResources) 
+            || !gCPUsRunning));
     if( create) {
        gNumConfigThreads++;
        gNumWaitingThreads++;
@@ -3994,8 +4417,8 @@ OSObject * IOService::copyExistingServices( OSDictionary * matching,
            OSSerialize * s2 = OSSerialize::withCapacity(128);
            current->serialize(s1);
            _current->serialize(s2);
-           kprintf("**mismatch** %p %p\n%s\n%s\n%s\n", OBFUSCATE(current), 
-                OBFUSCATE(_current), s->text(), s1->text(), s2->text());
+           kprintf("**mismatch** %p %p\n%s\n%s\n%s\n", IOSERVICE_OBFUSCATE(current),
+                IOSERVICE_OBFUSCATE(_current), s->text(), s1->text(), s2->text());
            s1->release();
            s2->release();
        }
@@ -4080,6 +4503,7 @@ IONotifier * IOService::setNotification(
     if( notify) {
        notify->handler = handler;
         notify->target = target;
+        notify->type = type;
         notify->matching = matching;
        matching->retain();
        if (handler == &_IOServiceMatchingNotificationHandler)
@@ -4131,10 +4555,13 @@ IONotifier * IOService::doInstallNotification(
     else if( type == gIOFirstPublishNotification)
        inState = kIOServiceFirstPublishState;
 
-    else if( (type == gIOMatchedNotification)
-         || (type == gIOFirstMatchNotification))
+    else if (type == gIOMatchedNotification)
        inState = kIOServiceMatchedState;
-    else if( type == gIOTerminatedNotification)
+
+    else if (type == gIOFirstMatchNotification)
+       inState = kIOServiceFirstMatchState;
+
+    else if ((type == gIOTerminatedNotification) || (type == gIOWillTerminateNotification))
        inState = 0;
     else
         return( 0 );
@@ -4187,6 +4614,9 @@ IONotifier * IOService::installNotification(
     notify = doInstallNotification( type, matching, handler, target, ref,
                priority, existing );
 
+    // in case handler remove()s
+    if (notify) notify->retain();
+
     UNLOCKNOTIFY();
 
     return( notify );
@@ -4220,28 +4650,34 @@ IONotifier * IOService::addMatchingNotification(
                        SInt32 priority )
 {
     OSIterator *               existing = NULL;
+    IONotifier *                ret;
     _IOServiceNotifier *       notify;
     IOService *                        next;
 
-    notify = (_IOServiceNotifier *) installNotification( type, matching,
+    ret = notify = (_IOServiceNotifier *) installNotification( type, matching,
                handler, target, ref, priority, &existing );
+    if (!ret) return (0);
 
     // send notifications for existing set
-    if( existing) {
-
-        notify->retain();              // in case handler remove()s
-        while( (next = (IOService *) existing->getNextObject())) {
-
-           next->lockForArbitration();
+    if (existing)
+    {
+        while( (next = (IOService *) existing->getNextObject()))
+        {
            if( 0 == (next->__state[0] & kIOServiceInactiveState))
-                next->invokeNotifer( notify );
-           next->unlockForArbitration();
+           {
+                next->invokeNotifier( notify );
+            }
        }
-        notify->release();
        existing->release();
     }
 
-    return( notify );
+    LOCKWRITENOTIFY();
+    bool removed = (0 == notify->whence);
+    notify->release();
+    if (removed) ret = gIOServiceNullNotifier;
+    UNLOCKNOTIFY();
+
+    return( ret );
 }
 
 bool IOService::syncNotificationHandler(
@@ -4335,6 +4771,12 @@ IOService * IOService::waitForService( OSDictionary * matching,
 
 void IOService::deliverNotification( const OSSymbol * type,
                             IOOptionBits orNewState, IOOptionBits andNewState )
+{
+    panic("deliverNotification");
+}
+
+OSArray * IOService::copyNotifiers(const OSSymbol * type,
+                                   IOOptionBits orNewState, IOOptionBits andNewState )
 {
     _IOServiceNotifier * notify;
     OSIterator *        iter;
@@ -4343,7 +4785,8 @@ void IOService::deliverNotification( const OSSymbol * type,
     lockForArbitration();
 
     if( (0 == (__state[0] & kIOServiceInactiveState))
-     ||        (type == gIOTerminatedNotification)) {
+     ||        (type == gIOTerminatedNotification)
+     ||        (type == gIOWillTerminateNotification)) {
 
        LOCKREADNOTIFY();
 
@@ -4363,21 +4806,14 @@ void IOService::deliverNotification( const OSSymbol * type,
             }
             iter->release();
         }
-
         __state[0] = (__state[0] | orNewState) & andNewState;
-
         UNLOCKNOTIFY();
     }
 
-    if( willSend) {
-        for( unsigned int idx = 0;
-             (notify = (_IOServiceNotifier *) willSend->getObject(idx));
-             idx++) {
-            invokeNotifer( notify );
-        }
-        willSend->release();
-    }
     unlockForArbitration();
+
+    return (willSend);
+
 }
 
 IOOptionBits IOService::getState( void ) const
@@ -4596,6 +5032,19 @@ void _IOServiceNotifier::enable( bool was )
     UNLOCKNOTIFY();
 }
 
+
+/*
+ * _IOServiceNullNotifier
+ */
+
+void _IOServiceNullNotifier::taggedRetain(const void *tag) const                      {}
+void _IOServiceNullNotifier::taggedRelease(const void *tag, const int when) const     {}
+void _IOServiceNullNotifier::free()                                                   {}
+void _IOServiceNullNotifier::wait()                                                   {}
+void _IOServiceNullNotifier::remove()                                                 {}
+void _IOServiceNullNotifier::enable(bool was)                                         {}
+bool _IOServiceNullNotifier::disable()                                { return(false); }
+
 /*
  * IOResources
  */
@@ -4616,7 +5065,7 @@ IOService * IOResources::resources( void )
 bool IOResources::init( OSDictionary * dictionary )
 {
     // Do super init first
-    if ( !super::init() )
+    if ( !IOService::init() )
         return false;
 
     // Allow PAL layer to publish a value
@@ -4641,6 +5090,13 @@ bool IOResources::init( OSDictionary * dictionary )
     return true;
 }
 
+IOReturn IOResources::newUserClient(task_t owningTask, void * securityID,
+                                    UInt32 type,  OSDictionary * properties,
+                                    IOUserClient ** handler)
+{
+    return( kIOReturnUnsupported );
+}
+
 IOWorkLoop * IOResources::getWorkLoop() const
 {
     // If we are the resource root
@@ -4657,6 +5113,8 @@ bool IOResources::matchPropertyTable( OSDictionary * table )
     OSString *         str;
     OSSet *            set;
     OSIterator *       iter;
+    OSObject *          obj;
+    OSArray *           keys;
     bool               ok = true;
 
     prop = table->getObject( gIOResourceMatchKey );
@@ -4674,6 +5132,18 @@ bool IOResources::matchPropertyTable( OSDictionary * table )
         if( iter)
            iter->release();
     }
+    else if ((prop = table->getObject(gIOResourceMatchedKey)))
+    {
+        obj = copyProperty(gIOResourceMatchedKey);
+        keys = OSDynamicCast(OSArray, obj);
+        ok = false;
+        if (keys)
+        {
+            // assuming OSSymbol
+            ok = ((-1U) != keys->getNextIndexOfObject(prop, 0));
+        }
+        OSSafeReleaseNULL(obj);
+    }
 
     return( ok );
 }
@@ -4691,6 +5161,8 @@ void IOService::updateConsoleUsers(OSArray * consoleUsers, IOMessage systemMessa
     bool              publish;
     OSDictionary *    user;
     static IOMessage  sSystemPower;
+    clock_sec_t       now = 0;
+    clock_usec_t      microsecs;
 
     regEntry = IORegistryEntry::getRegistryRoot();
 
@@ -4703,9 +5175,25 @@ void IOService::updateConsoleUsers(OSArray * consoleUsers, IOMessage systemMessa
     {
         sSystemPower = systemMessage;
 #if HIBERNATION
-       if ((kIOMessageSystemHasPoweredOn == systemMessage) && IOHibernateWasScreenLocked())
+       if (kIOMessageSystemHasPoweredOn == systemMessage)
        {
-           locked = kOSBooleanTrue;
+           uint32_t lockState = IOHibernateWasScreenLocked();
+           switch (lockState)
+           {
+               case 0:
+                   break;
+               case kIOScreenLockLocked:
+               case kIOScreenLockFileVaultDialog:
+                   gIOConsoleBooterLockState = kOSBooleanTrue;
+                   break;
+               case kIOScreenLockNoLock:
+                   gIOConsoleBooterLockState = 0;
+                   break;
+               case kIOScreenLockUnlocked:
+               default:
+                   gIOConsoleBooterLockState = kOSBooleanFalse;
+                   break;
+           }
        }
 #endif /* HIBERNATION */
     }
@@ -4713,6 +5201,8 @@ void IOService::updateConsoleUsers(OSArray * consoleUsers, IOMessage systemMessa
     if (consoleUsers)
     {
         OSNumber * num = 0;
+       bool       loginLocked = true;
+
        gIOConsoleLoggedIn = false;
        for (idx = 0; 
              (user = OSDynamicCast(OSDictionary, consoleUsers->getObject(idx))); 
@@ -4720,11 +5210,19 @@ void IOService::updateConsoleUsers(OSArray * consoleUsers, IOMessage systemMessa
        {
            gIOConsoleLoggedIn |= ((kOSBooleanTrue == user->getObject(gIOConsoleSessionOnConsoleKey))
                        && (kOSBooleanTrue == user->getObject(gIOConsoleSessionLoginDoneKey)));
+
+           loginLocked &= (kOSBooleanTrue == user->getObject(gIOConsoleSessionScreenIsLockedKey));
            if (!num)
            {
                num = OSDynamicCast(OSNumber, user->getObject(gIOConsoleSessionScreenLockedTimeKey));
            }
        }
+#if HIBERNATION
+        if (!loginLocked) gIOConsoleBooterLockState = 0;
+       IOLog("IOConsoleUsers: time(%d) %ld->%d, lin %d, llk %d, \n",
+               (num != 0), gIOConsoleLockTime, (num ? num->unsigned32BitValue() : 0),
+               gIOConsoleLoggedIn, loginLocked);
+#endif /* HIBERNATION */
         gIOConsoleLockTime = num ? num->unsigned32BitValue() : 0;
     }
 
@@ -4734,11 +5232,14 @@ void IOService::updateConsoleUsers(OSArray * consoleUsers, IOMessage systemMessa
     {
        locked = kOSBooleanTrue;
     }
+#if HIBERNATION
+    else if (gIOConsoleBooterLockState)
+    {
+       locked = gIOConsoleBooterLockState;
+    }
+#endif /* HIBERNATION */
     else if (gIOConsoleLockTime)
     {
-       clock_sec_t  now;
-       clock_usec_t microsecs;
-
        clock_get_calendar_microtime(&now, &microsecs);
        if (gIOConsoleLockTime > now)
        {
@@ -4770,6 +5271,9 @@ void IOService::updateConsoleUsers(OSArray * consoleUsers, IOMessage systemMessa
        else if (gIOConsoleLockTime)  gIOScreenLockState = kIOScreenLockUnlocked;
        else                          gIOScreenLockState = kIOScreenLockNoLock;
        gIOChosenEntry->setProperty(kIOScreenLockStateKey, &gIOScreenLockState, sizeof(gIOScreenLockState));
+
+       IOLog("IOConsoleUsers: gIOScreenLockState %d, hs %d, bs %d, now %ld, sm 0x%x\n",
+               gIOScreenLockState, gIOHibernateState, (gIOConsoleBooterLockState != 0), now, systemMessage);
     }
 #endif /* HIBERNATION */
 
@@ -4840,11 +5344,16 @@ bool IOService::compareProperty( OSDictionary * matching,
                                  const char *  key )
 {
     OSObject * value;
+    OSObject * prop;
     bool       ok;
 
     value = matching->getObject( key );
     if( value)
-        ok = value->isEqualTo( getProperty( key ));
+    {
+        prop = copyProperty(key);
+        ok = value->isEqualTo(prop);
+        if (prop) prop->release();
+    }
     else
        ok = true;
 
@@ -4856,11 +5365,16 @@ bool IOService::compareProperty( OSDictionary *   matching,
                                  const OSString * key )
 {
     OSObject * value;
+    OSObject * prop;
     bool       ok;
 
     value = matching->getObject( key );
     if( value)
-        ok = value->isEqualTo( getProperty( key ));
+    {
+        prop = copyProperty(key);
+        ok = value->isEqualTo(prop);
+        if (prop) prop->release();
+    }
     else
        ok = true;
 
@@ -4940,6 +5454,7 @@ bool IOService::matchInternal(OSDictionary * table, uint32_t options, uint32_t *
     {
        count = table->getCount();
        done = 0;
+
        str = OSDynamicCast(OSString, table->getObject(gIOProviderClassKey));
        if (str) {
            done++;
@@ -5010,6 +5525,38 @@ bool IOService::matchInternal(OSDictionary * table, uint32_t options, uint32_t *
            if ((!match) || (done == count)) break;
        }
 
+       obj = table->getObject( gIOPropertyExistsMatchKey );
+       if( obj)
+       {
+           OSDictionary * dict;
+           OSString     * nextKey;
+           OSIterator *   iter;
+           done++;
+           match = false;
+           dict = dictionaryWithProperties();
+           if( dict) {
+               nextKey = OSDynamicCast( OSString, obj);
+               if( nextKey)
+                   iter = 0;
+               else
+                   iter = OSCollectionIterator::withCollection(
+                               OSDynamicCast(OSCollection, obj));
+
+               while( nextKey
+                   || (iter && (0 != (nextKey = OSDynamicCast(OSString,
+                                           iter->getNextObject()))))) {
+                   match = (0 != dict->getObject(nextKey));
+                   if( match)
+                       break;
+                   nextKey = 0;
+               }
+               dict->release();
+               if( iter)
+                   iter->release();
+           }
+           if ((!match) || (done == count)) break;
+       }
+
        str = OSDynamicCast( OSString, table->getObject( gIOPathMatchKey ));
        if( str) {
            done++;
@@ -5061,10 +5608,10 @@ bool IOService::matchInternal(OSDictionary * table, uint32_t options, uint32_t *
             if (prop) prop->release();                 \
            if ((!match) || (done == count)) break;     \
        }
-       propMatch(kIOBSDNameKey)
-       propMatch(kIOBSDMajorKey)
-       propMatch(kIOBSDMinorKey)
-       propMatch(kIOBSDUnitKey)
+       propMatch(gIOBSDNameKey)
+       propMatch(gIOBSDMajorKey)
+       propMatch(gIOBSDMinorKey)
+       propMatch(gIOBSDUnitKey)
 #undef propMatch
     }
     while (false);
@@ -5091,7 +5638,12 @@ bool IOService::matchPassive(OSDictionary * table, uint32_t options)
 
     assert( table );
 
-#if MATCH_DEBUG 
+#if !CONFIG_EMBEDDED
+    OSArray* aliasServiceRegIds = NULL;
+    IOService* foundAlternateService = NULL;
+#endif
+
+#if MATCH_DEBUG
     OSDictionary * root = table;
 #endif
 
@@ -5155,8 +5707,61 @@ bool IOService::matchPassive(OSDictionary * table, uint32_t options)
             break;
         }
         while (true);
+
+        if(match == true) {
+            break;
+        }
+
+        if(matchParent == true) {
+#if !CONFIG_EMBEDDED
+            // check if service has an alias to search its other "parents" if a parent match isn't found
+            OSObject * prop = where->copyProperty(gIOServiceLegacyMatchingRegistryIDKey);
+            OSNumber * alternateRegistryID = OSDynamicCast(OSNumber, prop);
+            if(alternateRegistryID != NULL) {
+                if(aliasServiceRegIds == NULL)
+                {
+                    aliasServiceRegIds = OSArray::withCapacity(sizeof(alternateRegistryID));
+                }
+                aliasServiceRegIds->setObject(alternateRegistryID);
+            }
+            OSSafeReleaseNULL(prop);
+#endif
+        }
+        else {
+            break;
+        }
+
+        where = where->getProvider();
+#if !CONFIG_EMBEDDED
+        if(where == NULL) {
+            // there were no matching parent services, check to see if there are aliased services that have a matching parent
+            if(aliasServiceRegIds != NULL) {
+                unsigned int numAliasedServices = aliasServiceRegIds->getCount();
+                if(numAliasedServices != 0) {
+                    OSNumber* alternateRegistryID = OSDynamicCast(OSNumber, aliasServiceRegIds->getObject(numAliasedServices - 1));
+                    if(alternateRegistryID != NULL) {
+                        OSDictionary* alternateMatchingDict = IOService::registryEntryIDMatching(alternateRegistryID->unsigned64BitValue());
+                        aliasServiceRegIds->removeObject(numAliasedServices - 1);
+                        if(alternateMatchingDict != NULL) {
+                            OSSafeReleaseNULL(foundAlternateService);
+                            foundAlternateService = IOService::copyMatchingService(alternateMatchingDict);
+                            alternateMatchingDict->release();
+                            if(foundAlternateService != NULL) {
+                                where = foundAlternateService;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+#endif
     }
-    while( matchParent && (!match) && (where = where->getProvider()) );
+    while( where != NULL );
+
+#if !CONFIG_EMBEDDED
+    OSSafeReleaseNULL(foundAlternateService);
+    OSSafeReleaseNULL(aliasServiceRegIds);
+#endif
 
 #if MATCH_DEBUG
     if (where != this) 
@@ -5178,30 +5783,35 @@ IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
 {
     const OSSymbol *userClientClass = 0;
     IOUserClient *client;
+    OSObject *prop;
     OSObject *temp;
 
     if (kIOReturnSuccess == newUserClient( owningTask, securityID, type, handler ))
        return kIOReturnSuccess;
 
     // First try my own properties for a user client class name
-    temp = getProperty(gIOUserClientClassKey);
-    if (temp) {
-       if (OSDynamicCast(OSSymbol, temp))
-           userClientClass = (const OSSymbol *) temp;
-       else if (OSDynamicCast(OSString, temp)) {
-           userClientClass = OSSymbol::withString((OSString *) temp);
+    prop = copyProperty(gIOUserClientClassKey);
+    if (prop) {
+       if (OSDynamicCast(OSSymbol, prop))
+           userClientClass = (const OSSymbol *) prop;
+       else if (OSDynamicCast(OSString, prop)) {
+           userClientClass = OSSymbol::withString((OSString *) prop);
            if (userClientClass)
-               setProperty(kIOUserClientClassKey,
+               setProperty(gIOUserClientClassKey,
                            (OSObject *) userClientClass);
        }
     }
 
     // Didn't find one so lets just bomb out now without further ado.
     if (!userClientClass)
+    {
+        OSSafeReleaseNULL(prop);
         return kIOReturnUnsupported;
+    }
 
     // This reference is consumed by the IOServiceOpen call
     temp = OSMetaClass::allocClassWithName(userClientClass);
+    OSSafeReleaseNULL(prop);
     if (!temp)
         return kIOReturnNoMemory;
 
@@ -5565,6 +6175,10 @@ requireMaxCpuDelay(IOService * service, UInt32 ns, UInt32 delayType)
 
     if (setCpuDelay)
     {
+        if (holder && debug_boot_arg) {
+            strlcpy(sCPULatencyHolderName[delayType], holder->getName(), sizeof(sCPULatencyHolderName[delayType]));
+        }
+
         // Must be safe to call from locked context
         if (delayType == kCpuDelayBusStall)
         {
@@ -5782,6 +6396,7 @@ IOReturn IOService::addInterruptStatistics(IOInterruptAccountingData * statistic
   IOReportLegend * legend = NULL;
   IOInterruptAccountingData * oldValue = NULL;
   IOInterruptAccountingReporter * newArray = NULL;
+  char subgroupName[64];
   int newArraySize = 0;
   int i = 0;
 
@@ -5859,7 +6474,7 @@ IOReturn IOService::addInterruptStatistics(IOInterruptAccountingData * statistic
      * TODO: Some statistics do in fact have common units (time); should this be
      * split into separate reporters to communicate this?
      */
-     reserved->interruptStatisticsArray[source].reporter = IOSimpleReporter::with(this, kIOReportCategoryInterrupt, kIOReportUnitNone);
+     reserved->interruptStatisticsArray[source].reporter = IOSimpleReporter::with(this, kIOReportCategoryPower, kIOReportUnitNone);
 
     /*
      * Each statistic is given an identifier based on the interrupt index (which
@@ -5880,21 +6495,17 @@ IOReturn IOService::addInterruptStatistics(IOInterruptAccountingData * statistic
     /*
      * We now need to add the legend for this reporter to the registry.
      */
-    legend = IOReportLegend::with(OSDynamicCast(OSArray, getProperty(kIOReportLegendKey)));
-
-    if ((source >= IA_MAX_SUBGROUP_NAME) || (source < 0)) {
-      /*
-       * Either we're using a nonsensical index (should never happen), or the
-       * index is larger than anticipated (may happen, almost certainly won't).
-       * This may move to live generation of the names in the future, but for
-       * now, point both cases to a generic subgroup name (this will confuse
-       * clients, unfortunately).
-       */
-      legend->addReporterLegend(reserved->interruptStatisticsArray[source].reporter, kInterruptAccountingGroupName, kInterruptAccountingGenericSubgroupName);
-    } else {
-      legend->addReporterLegend(reserved->interruptStatisticsArray[source].reporter, kInterruptAccountingGroupName, kInterruptAccountingSubgroupNames[source]);
-    }
+    OSObject * prop = copyProperty(kIOReportLegendKey);
+    legend = IOReportLegend::with(OSDynamicCast(OSArray, prop));
+    OSSafeReleaseNULL(prop);
 
+    /*
+     * Note that while we compose the subgroup name, we do not need to
+     * manage its lifecycle (the reporter will handle this).
+     */
+    snprintf(subgroupName, sizeof(subgroupName), "%s %d", getName(), source);
+    subgroupName[sizeof(subgroupName) - 1] = 0;
+    legend->addReporterLegend(reserved->interruptStatisticsArray[source].reporter, kInterruptAccountingGroupName, subgroupName);
     setProperty(kIOReportLegendKey, legend->getLegend());
     legend->release();