]> git.saurik.com Git - apple/xnu.git/blobdiff - iokit/Kernel/IOService.cpp
xnu-1699.24.8.tar.gz
[apple/xnu.git] / iokit / Kernel / IOService.cpp
index 4bd1a2afa5dbb3b25da6a4202c680066423b3ecb..f083482725d3bd70d3025906102f4eddea5d3765 100644 (file)
@@ -1,60 +1,62 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1991-1999 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- * 29-Jan-91    Portions from IODevice.m, Doug Mitchell at NeXT, Created.
- * 18-Jun-98    start IOKit objc
- * 10-Nov-98   start iokit cpp
- * 25-Feb-99   sdouglas, add threads and locks to ensure deadlock
- *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
  
 #include <IOKit/system.h>
 
 #include <IOKit/IOService.h>
+#include <libkern/OSDebug.h>
 #include <libkern/c++/OSContainers.h>
+#include <libkern/c++/OSKext.h>
 #include <libkern/c++/OSUnserialize.h>
 #include <IOKit/IOCatalogue.h>
+#include <IOKit/IOCommand.h>
 #include <IOKit/IODeviceMemory.h>
 #include <IOKit/IOInterrupts.h>
 #include <IOKit/IOInterruptController.h>
 #include <IOKit/IOPlatformExpert.h>
 #include <IOKit/IOMessage.h>
 #include <IOKit/IOLib.h>
-#include <IOKit/IOKitKeys.h>
+#include <IOKit/IOKitKeysPrivate.h>
 #include <IOKit/IOBSD.h>
 #include <IOKit/IOUserClient.h>
 #include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOTimeStamp.h>
 #include <mach/sync_policy.h>
 #include <IOKit/assert.h>
 #include <sys/errno.h>
 
-//#define LOG kprintf
-#define LOG IOLog
+#include <machine/pal_routines.h>
+
+#define LOG kprintf
+//#define LOG IOLog
 
 #include "IOServicePrivate.h"
+#include "IOKitKernelInternal.h"
 
 // take lockForArbitration before LOCKNOTIFY
 
@@ -95,16 +97,30 @@ const OSSymbol *            gIONameMatchKey;
 const OSSymbol *               gIONameMatchedKey;
 const OSSymbol *               gIOPropertyMatchKey;
 const OSSymbol *               gIOLocationMatchKey;
+const OSSymbol *               gIOParentMatchKey;
 const OSSymbol *               gIOPathMatchKey;
 const OSSymbol *               gIOMatchCategoryKey;
 const OSSymbol *               gIODefaultMatchCategoryKey;
 const OSSymbol *               gIOMatchedServiceCountKey;
 
+const OSSymbol *               gIOMapperIDKey;
 const OSSymbol *               gIOUserClientClassKey;
 const OSSymbol *               gIOKitDebugKey;
 
 const OSSymbol *               gIOCommandPoolSizeKey;
 
+const OSSymbol *               gIOConsoleLockedKey;
+const OSSymbol *               gIOConsoleUsersKey;
+const OSSymbol *               gIOConsoleSessionUIDKey;
+const OSSymbol *               gIOConsoleSessionAuditIDKey;
+const OSSymbol *               gIOConsoleUsersSeedKey;
+const OSSymbol *               gIOConsoleSessionOnConsoleKey;
+const OSSymbol *               gIOConsoleSessionLoginDoneKey;
+const OSSymbol *               gIOConsoleSessionSecureInputPIDKey;
+const OSSymbol *               gIOConsoleSessionScreenLockedTimeKey;
+
+static clock_sec_t             gIOConsoleLockTime;
+
 static int                     gIOResourceGenerationCount;
 
 const OSSymbol *               gIOServiceKey;
@@ -118,6 +134,7 @@ const OSSymbol *            gIOGeneralInterest;
 const OSSymbol *               gIOBusyInterest;
 const OSSymbol *               gIOAppPowerStateInterest;
 const OSSymbol *               gIOPriorityPowerStateInterest;
+const OSSymbol *               gIOConsoleSecurityInterest;
 
 static OSDictionary *          gNotifications;
 static IORecursiveLock *       gNotificationLock;
@@ -140,6 +157,21 @@ static OSArray *           gIOStopList;
 static OSArray *               gIOStopProviderList;
 static OSArray *               gIOFinalizeList;
 
+static SInt32                  gIOConsoleUsersSeed;
+static OSData *                        gIOConsoleUsersSeedValue;
+
+extern const OSSymbol *                gIODTPHandleKey;
+
+const OSSymbol *               gIOPlatformSleepActionKey;
+const OSSymbol *               gIOPlatformWakeActionKey;
+const OSSymbol *               gIOPlatformQuiesceActionKey;
+const OSSymbol *               gIOPlatformActiveActionKey;
+
+const OSSymbol *               gIOPlatformFunctionHandlerSet;
+
+static IOLock *                        gIOConsoleUsersLock;
+static thread_call_t           gIOConsoleLockCallout;
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #define LOCKREADNOTIFY()       \
@@ -149,6 +181,12 @@ static OSArray *           gIOFinalizeList;
 #define LOCKWRITE2READNOTIFY()
 #define UNLOCKNOTIFY()         \
     IORecursiveLockUnlock( gNotificationLock )
+#define SLEEPNOTIFY(event) \
+    IORecursiveLockSleep( gNotificationLock, (void *)(event), THREAD_UNINT )
+#define SLEEPNOTIFYTO(event, deadline) \
+    IORecursiveLockSleepDeadline( gNotificationLock, (void *)(event), deadline, THREAD_UNINT )
+#define WAKEUPNOTIFY(event) \
+       IORecursiveLockWakeup( gNotificationLock, (void *)(event), /* wake one */ false )
 
 #define randomDelay()  \
         int del = read_processor_clock();                              \
@@ -157,6 +195,19 @@ static OSArray *           gIOFinalizeList;
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#define queue_element(entry, element, type, field) do {        \
+       vm_address_t __ele = (vm_address_t) (entry);    \
+       __ele -= -4 + ((size_t)(&((type) 4)->field));   \
+       (element) = (type) __ele;                       \
+    } while(0)
+
+#define iterqueue(que, elt)                            \
+       for (queue_entry_t elt = queue_first(que);      \
+            !queue_end(que, elt);                      \
+            elt = queue_next(elt))
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 struct ArbitrationLockQueueElement {
     queue_chain_t link;
     IOThread      thread;
@@ -171,6 +222,41 @@ static queue_head_t gArbitrationLockQueueWaiting;
 static queue_head_t gArbitrationLockQueueFree;
 static IOLock *     gArbitrationLockQueueLock;
 
+bool IOService::isInactive( void ) const
+    { return( 0 != (kIOServiceInactiveState & getState())); }
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#if defined(__i386__) || defined(__x86_64__)
+
+// Only used by the intel implementation of
+//     IOService::requireMaxBusStall(UInt32 ns)
+//     IOService::requireMaxInterruptDelay(uint32_t ns)
+struct CpuDelayEntry
+{
+    IOService * fService;
+    UInt32      fMaxDelay;
+    UInt32      fDelayType;
+};
+
+enum {
+    kCpuDelayBusStall, kCpuDelayInterrupt,
+    kCpuNumDelayTypes
+};
+
+static OSData          *sCpuDelayData = OSData::withCapacity(8 * sizeof(CpuDelayEntry));
+static IORecursiveLock *sCpuDelayLock = IORecursiveLockAlloc();
+static OSArray         *sCpuLatencyHandlers[kCpuNumDelayTypes];
+const OSSymbol         *sCPULatencyFunctionName[kCpuNumDelayTypes];
+
+static void
+requireMaxCpuDelay(IOService * service, UInt32 ns, UInt32 delayType);
+static IOReturn
+setLatencyHandler(UInt32 delayType, IOService * target, bool enable);
+
+#endif /* defined(__i386__) || defined(__x86_64__) */
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 void IOService::initialize( void )
@@ -185,7 +271,8 @@ void IOService::initialize( void )
     gIONameMatchedKey  = OSSymbol::withCStringNoCopy( kIONameMatchedKey );
     gIOPropertyMatchKey        = OSSymbol::withCStringNoCopy( kIOPropertyMatchKey );
     gIOPathMatchKey    = OSSymbol::withCStringNoCopy( kIOPathMatchKey );
-    gIOLocationMatchKey = OSSymbol::withCStringNoCopy( kIOLocationMatchKey );
+    gIOLocationMatchKey        = OSSymbol::withCStringNoCopy( kIOLocationMatchKey );
+    gIOParentMatchKey  = OSSymbol::withCStringNoCopy( kIOParentMatchKey );
 
     gIOMatchCategoryKey        = OSSymbol::withCStringNoCopy( kIOMatchCategoryKey );
     gIODefaultMatchCategoryKey = OSSymbol::withCStringNoCopy( 
@@ -204,6 +291,8 @@ void IOService::initialize( void )
     gIOInterruptSpecifiersKey
        = OSSymbol::withCStringNoCopy("IOInterruptSpecifiers");
 
+    gIOMapperIDKey = OSSymbol::withCStringNoCopy(kIOMapperIDKey);
+
     gIOKitDebugKey     = OSSymbol::withCStringNoCopy( kIOKitDebugKey );
 
     gIOCommandPoolSizeKey      = OSSymbol::withCStringNoCopy( kIOCommandPoolSizeKey );
@@ -212,6 +301,7 @@ void IOService::initialize( void )
     gIOBusyInterest            = OSSymbol::withCStringNoCopy( kIOBusyInterest );
     gIOAppPowerStateInterest           = OSSymbol::withCStringNoCopy( kIOAppPowerStateInterest );
     gIOPriorityPowerStateInterest      = OSSymbol::withCStringNoCopy( kIOPriorityPowerStateInterest );
+    gIOConsoleSecurityInterest         = OSSymbol::withCStringNoCopy( kIOConsoleSecurityInterest );
 
     gNotifications             = OSDictionary::withCapacity( 1 );
     gIOPublishNotification     = OSSymbol::withCStringNoCopy(
@@ -226,6 +316,29 @@ void IOService::initialize( void )
                                                 kIOTerminatedNotification );
     gIOServiceKey              = OSSymbol::withCStringNoCopy( kIOServiceClass);
 
+    gIOConsoleLockedKey                = OSSymbol::withCStringNoCopy( kIOConsoleLockedKey);
+    gIOConsoleUsersKey         = OSSymbol::withCStringNoCopy( kIOConsoleUsersKey);
+    gIOConsoleSessionUIDKey    = OSSymbol::withCStringNoCopy( kIOConsoleSessionUIDKey);
+    gIOConsoleSessionAuditIDKey        = OSSymbol::withCStringNoCopy( kIOConsoleSessionAuditIDKey);
+
+    gIOConsoleUsersSeedKey              = OSSymbol::withCStringNoCopy(kIOConsoleUsersSeedKey);
+    gIOConsoleSessionOnConsoleKey        = OSSymbol::withCStringNoCopy(kIOConsoleSessionOnConsoleKey);
+    gIOConsoleSessionLoginDoneKey        = OSSymbol::withCStringNoCopy(kIOConsoleSessionLoginDoneKey);
+    gIOConsoleSessionSecureInputPIDKey   = OSSymbol::withCStringNoCopy(kIOConsoleSessionSecureInputPIDKey);
+    gIOConsoleSessionScreenLockedTimeKey = OSSymbol::withCStringNoCopy(kIOConsoleSessionScreenLockedTimeKey);
+
+    gIOConsoleUsersSeedValue          = OSData::withBytesNoCopy(&gIOConsoleUsersSeed, sizeof(gIOConsoleUsersSeed));
+       
+    gIOPlatformSleepActionKey  = OSSymbol::withCStringNoCopy(kIOPlatformSleepActionKey);
+    gIOPlatformWakeActionKey   = OSSymbol::withCStringNoCopy(kIOPlatformWakeActionKey);
+    gIOPlatformQuiesceActionKey        = OSSymbol::withCStringNoCopy(kIOPlatformQuiesceActionKey);
+    gIOPlatformActiveActionKey = OSSymbol::withCStringNoCopy(kIOPlatformActiveActionKey);
+
+    gIOPlatformFunctionHandlerSet              = OSSymbol::withCStringNoCopy(kIOPlatformFunctionHandlerSet);
+#if defined(__i386__) || defined(__x86_64__)
+    sCPULatencyFunctionName[kCpuDelayBusStall] = OSSymbol::withCStringNoCopy(kIOPlatformFunctionHandlerMaxBusDelay);
+    sCPULatencyFunctionName[kCpuDelayInterrupt]        = OSSymbol::withCStringNoCopy(kIOPlatformFunctionHandlerMaxInterruptDelay);
+#endif
     gNotificationLock          = IORecursiveLockAlloc();
 
     assert( gIOServicePlane && gIODeviceMemoryKey
@@ -234,16 +347,26 @@ void IOService::initialize( void )
         && gIOProviderClassKey && gIONameMatchKey && gIONameMatchedKey
        && gIOMatchCategoryKey && gIODefaultMatchCategoryKey
         && gIOPublishNotification && gIOMatchedNotification
-        && gIOTerminatedNotification && gIOServiceKey );
+        && gIOTerminatedNotification && gIOServiceKey
+       && gIOConsoleUsersKey && gIOConsoleSessionUIDKey
+    && gIOConsoleSessionOnConsoleKey && gIOConsoleSessionSecureInputPIDKey
+       && gIOConsoleUsersSeedKey && gIOConsoleUsersSeedValue);
 
     gJobsLock  = IOLockAlloc();
     gJobs      = OSOrderedSet::withCapacity( 10 );
 
     gIOServiceBusyLock = IOLockAlloc();
 
+    gIOConsoleUsersLock = IOLockAlloc();
+
     err = semaphore_create(kernel_task, &gJobsSemaphore, SYNC_POLICY_FIFO, 0);
 
-    assert( gIOServiceBusyLock && gJobs && gJobsLock && (err == KERN_SUCCESS) );
+    gIOConsoleLockCallout = thread_call_allocate(&IOService::consoleLockTimer, NULL);
+
+    IORegistryEntry::getRegistryRoot()->setProperty(gIOConsoleLockedKey, kOSBooleanTrue);
+
+    assert( gIOServiceBusyLock && gJobs && gJobsLock && gIOConsoleUsersLock
+               && gIOConsoleLockCallout && (err == KERN_SUCCESS) );
 
     gIOResources = IOResources::resources();
     assert( gIOResources );
@@ -304,6 +427,8 @@ void IOService::stop( IOService * provider )
 
 void IOService::free( void )
 {
+    requireMaxBusStall(0);
+    requireMaxInterruptDelay(0);
     if( getPropertyTable())
         unregisterAllInterest();
     PMfree();
@@ -389,7 +514,7 @@ void IOService::detach( IOService * provider )
  * Register instance - publish it for matching
  */
 
-void IOService::registerService( IOOptionBits options = 0 )
+void IOService::registerService( IOOptionBits options )
 {
     char *             pathBuf;
     const char *       path;
@@ -442,7 +567,7 @@ void IOService::registerService( IOOptionBits options = 0 )
     startMatching( options );
 }
 
-void IOService::startMatching( IOOptionBits options = 0 )
+void IOService::startMatching( IOOptionBits options )
 {
     IOService *        provider;
     UInt32     prevBusy = 0;
@@ -458,6 +583,8 @@ void IOService::startMatching( IOOptionBits options = 0 )
        || ((provider = getProvider())
                && (provider->__state[1] & kIOServiceSynchronousState));
 
+       if ( options & kIOServiceAsynchronous )
+               sync = false;
 
     needConfig =  (0 == (__state[1] & (kIOServiceNeedConfigState | kIOServiceConfigState)))
               && (0 == (__state[0] & kIOServiceInactiveState));
@@ -470,7 +597,6 @@ void IOService::startMatching( IOOptionBits options = 0 )
 //                     OSKernelStackRemaining(), getName());
 
     if( needConfig) {
-       prevBusy = _adjustBusy( 1 );
         needWake = (0 != (kIOServiceSyncPubState & __state[1]));
     }
 
@@ -483,6 +609,8 @@ void IOService::startMatching( IOOptionBits options = 0 )
 
     if( needConfig) {
 
+       prevBusy = _adjustBusy( 1 );
+
         if( needWake) {
             IOLockLock( gIOServiceBusyLock );
             thread_wakeup( (event_t) this/*&__state[1]*/ );
@@ -500,7 +628,7 @@ void IOService::startMatching( IOOptionBits options = 0 )
             lockForArbitration();
             IOLockLock( gIOServiceBusyLock );
 
-            waitAgain = (prevBusy != (__state[1] & kIOServiceBusyStateMask));
+            waitAgain = (prevBusy < (__state[1] & kIOServiceBusyStateMask));
             if( waitAgain)
                 __state[1] |= kIOServiceSyncPubState | kIOServiceBusyWaiterState;
             else
@@ -513,7 +641,7 @@ void IOService::startMatching( IOOptionBits options = 0 )
 
             IOLockUnlock( gIOServiceBusyLock );
             if( waitAgain)
-                thread_block((void (*)(void)) 0);
+                thread_block(THREAD_CONTINUE_NULL);
 
         } while( waitAgain );
     }
@@ -522,7 +650,8 @@ void IOService::startMatching( IOOptionBits options = 0 )
 IOReturn IOService::catalogNewDrivers( OSOrderedSet * newTables )
 {
     OSDictionary *     table;
-    OSIterator *       iter;
+    OSSet *            set;
+    OSSet *            allSet = 0;
     IOService *                service;
 #if IOMATCHDEBUG
     SInt32             count = 0;
@@ -533,32 +662,45 @@ IOReturn IOService::catalogNewDrivers( OSOrderedSet * newTables )
     while( (table = (OSDictionary *) newTables->getFirstObject())) {
 
        LOCKWRITENOTIFY();
-        iter = (OSIterator *) getExistingServices( table,
-                                                    kIOServiceRegisteredState );
+        set = (OSSet *) copyExistingServices( table, 
+                                               kIOServiceRegisteredState,
+                                               kIOServiceExistingSet);
        UNLOCKNOTIFY();
-       if( iter) {
-           while( (service = (IOService *) iter->getNextObject())) {
-                service->startMatching(kIOServiceAsynchronous);
+       if( set) {
+
 #if IOMATCHDEBUG
-               count++;
+           count += set->getCount();
 #endif
+           if (allSet) {
+               allSet->merge((const OSSet *) set);
+               set->release();
            }
-           iter->release();
+           else
+               allSet = set;
        }
+
 #if IOMATCHDEBUG
        if( getDebugFlags( table ) & kIOLogMatch)
-           LOG("Matching service count = %ld\n", count);
+           LOG("Matching service count = %ld\n", (long)count);
 #endif
        newTables->removeObject(table);
     }
 
+    if (allSet) {
+       while( (service = (IOService *) allSet->getAnyObject())) {
+           service->startMatching(kIOServiceAsynchronous);
+           allSet->removeObject(service);
+       }
+       allSet->release();
+    }
+
     newTables->release();
 
     return( kIOReturnSuccess );
 }
 
  _IOServiceJob * _IOServiceJob::startJob( IOService * nub, int type,
-                                               IOOptionBits options = 0 )
+                                               IOOptionBits options )
 {
     _IOServiceJob *    job;
 
@@ -740,9 +882,23 @@ IOReturn IOService::callPlatformFunction( const OSSymbol * functionName,
                                          void *param3, void *param4 )
 {
   IOReturn  result = kIOReturnUnsupported;
-  IOService *provider = getProvider();
-  
-  if (provider != 0) {
+  IOService *provider;
+
+  if (gIOPlatformFunctionHandlerSet == functionName)
+  {
+#if defined(__i386__) || defined(__x86_64__)
+    const OSSymbol * functionHandlerName = (const OSSymbol *) param1;
+    IOService *             target              = (IOService *) param2;
+    bool            enable              = (param3 != 0);
+
+    if (sCPULatencyFunctionName[kCpuDelayBusStall] == functionHandlerName)
+       result = setLatencyHandler(kCpuDelayBusStall, target, enable);
+    else if (sCPULatencyFunctionName[kCpuDelayInterrupt] == param1)
+       result = setLatencyHandler(kCpuDelayInterrupt, target, enable);
+#endif /* defined(__i386__) || defined(__x86_64__) */
+  }
+
+  if ((kIOReturnUnsupported == result) && (provider = getProvider())) {
     result = provider->callPlatformFunction(functionName, waitForFunction,
                                            param1, param2, param3, param4);
   }
@@ -803,7 +959,7 @@ void IOService::setPMRootDomain( class IOPMrootDomain * rootDomain)
  * Stacking change
  */
 
-bool IOService::lockForArbitration( bool isSuccessRequired = true )
+bool IOService::lockForArbitration( bool isSuccessRequired )
 {
     bool                          found;
     bool                          success;
@@ -924,7 +1080,9 @@ bool IOService::lockForArbitration( bool isSuccessRequired = true )
                                               link );
 
                                 // wake the victim
-                                thread_wakeup_one(victim);
+                                IOLockWakeup( gArbitrationLockQueueLock, 
+                                              victim, 
+                                              /* one thread */ true );
 
                                 // allow this thread to proceed (ie. wait)
                                 success = true; // (put request on wait queue)
@@ -962,15 +1120,17 @@ bool IOService::lockForArbitration( bool isSuccessRequired = true )
                              link );
 
                 // declare that this thread will wait for a given event
-restart_sleep:  assert_wait( element,
-                             element->required ? THREAD_UNINT
-                                               : THREAD_INTERRUPTIBLE );
+restart_sleep:  wait_result = assert_wait( element,
+                                          element->required ? THREAD_UNINT
+                                          : THREAD_INTERRUPTIBLE );
 
                 // unlock global access
                 IOUnlock( gArbitrationLockQueueLock );
 
                 // put thread to sleep, waiting for our event to fire...
-                wait_result = thread_block((void (*)(void)) 0);
+               if (wait_result == THREAD_WAITING)
+                   wait_result = thread_block(THREAD_CONTINUE_NULL);
+
 
                 // ...and we've been woken up; we might be in one of two states:
                 // (a) we've been aborted and our queue element is not on
@@ -1154,7 +1314,9 @@ void IOService::unlockForArbitration( void )
                          link );
 
             // wake the waiting thread
-            thread_wakeup_one(element);
+            IOLockWakeup( gArbitrationLockQueueLock,
+                          element,
+                          /* one thread */ true );
         }
     }
 
@@ -1184,7 +1346,7 @@ void IOService::applyToClients( IOServiceApplierFunction applier,
 
 // send a message to a client or interested party of this service
 IOReturn IOService::messageClient( UInt32 type, OSObject * client,
-                                   void * argument = 0, vm_size_t argSize = 0 )
+                                   void * argument, vm_size_t argSize )
 {
     IOReturn                           ret;
     IOService *                        service;
@@ -1219,7 +1381,7 @@ IOReturn IOService::messageClient( UInt32 type, OSObject * client,
                             _IOServiceNotifierInvocation *, link );
             if( kIOServiceNotifyWaiter & notify->state) {
                 notify->state &= ~kIOServiceNotifyWaiter;
-                thread_wakeup( (event_t) notify);
+                WAKEUPNOTIFY( notify );
             }
             UNLOCKNOTIFY();
 
@@ -1232,32 +1394,49 @@ IOReturn IOService::messageClient( UInt32 type, OSObject * client,
     return( ret );
 }
 
+static void
+applyToInterestNotifiers(const IORegistryEntry *target,
+                        const OSSymbol * typeOfInterest,
+                        OSObjectApplierFunction applier,
+                        void * context )
+{
+    OSArray *          copyArray = 0;
+
+    LOCKREADNOTIFY();
+
+    IOCommand *notifyList =
+       OSDynamicCast( IOCommand, target->getProperty( typeOfInterest ));
+
+    if( notifyList) {
+        copyArray = OSArray::withCapacity(1);
+
+       // iterate over queue, entry is set to each element in the list
+       iterqueue(&notifyList->fCommandChain, entry) {
+           _IOServiceInterestNotifier * notify;
+
+           queue_element(entry, notify, _IOServiceInterestNotifier *, chain);
+           copyArray->setObject(notify);
+       }
+    }
+    UNLOCKNOTIFY();
+
+    if( copyArray) {
+       unsigned int    index;
+       OSObject *      next;
+
+       for( index = 0; (next = copyArray->getObject( index )); index++)
+           (*applier)(next, context);
+       copyArray->release();
+    }
+}
+
 void IOService::applyToInterested( const OSSymbol * typeOfInterest,
                                    OSObjectApplierFunction applier,
                                    void * context )
 {
-    OSArray *          array;
-    unsigned int       index;
-    OSObject *         next;
-    OSArray *          copyArray;
-
-    applyToClients( (IOServiceApplierFunction) applier, context );
-
-    LOCKREADNOTIFY();
-    array = OSDynamicCast( OSArray, getProperty( typeOfInterest ));
-    if( array) {
-        copyArray = OSArray::withArray( array );
-        UNLOCKNOTIFY();
-        if( copyArray) {
-            for( index = 0;
-                (next = array->getObject( index ));
-                index++) {
-                (*applier)(next, context);
-            }
-            copyArray->release();
-        }
-    } else
-        UNLOCKNOTIFY();
+    if (gIOGeneralInterest == typeOfInterest)
+       applyToClients( (IOServiceApplierFunction) applier, context );
+    applyToInterestNotifiers(this, typeOfInterest, applier, context);
 }
 
 struct MessageClientsContext {
@@ -1281,7 +1460,7 @@ static void messageClientsApplier( OSObject * object, void * ctx )
 
 // send a message to all clients
 IOReturn IOService::messageClients( UInt32 type,
-                                    void * argument = 0, vm_size_t argSize = 0 )
+                                    void * argument, vm_size_t argSize )
 {
     MessageClientsContext      context;
 
@@ -1307,11 +1486,11 @@ IONotifier * IOService::registerInterest( const OSSymbol * typeOfInterest,
                   IOServiceInterestHandler handler, void * target, void * ref )
 {
     _IOServiceInterestNotifier * notify = 0;
-    OSArray *                   set;
 
     if( (typeOfInterest != gIOGeneralInterest)
      && (typeOfInterest != gIOBusyInterest)
      && (typeOfInterest != gIOAppPowerStateInterest)
+     && (typeOfInterest != gIOConsoleSecurityInterest)
      && (typeOfInterest != gIOPriorityPowerStateInterest))
         return( 0 );
 
@@ -1334,16 +1513,23 @@ IONotifier * IOService::registerInterest( const OSSymbol * typeOfInterest,
             ////// queue
 
             LOCKWRITENOTIFY();
-            if( 0 == (set = (OSArray *) getProperty( typeOfInterest ))) {
-                set = OSArray::withCapacity( 1 );
-                if( set) {
-                    setProperty( typeOfInterest, set );
-                    set->release();
-                }
-            }
-            notify->whence = set;
-            if( set)
-                set->setObject( notify );
+
+           // Get the head of the notifier linked list
+           IOCommand *notifyList = (IOCommand *) getProperty( typeOfInterest );
+           if (!notifyList || !OSDynamicCast(IOCommand, notifyList)) {
+               notifyList = OSTypeAlloc(IOCommand);
+               if (notifyList) {
+                   notifyList->init();
+                   setProperty( typeOfInterest, notifyList);
+                   notifyList->release();
+               }
+           }
+
+           if (notifyList) {
+               enqueue(&notifyList->fCommandChain, &notify->chain);
+               notify->retain();       // ref'ed while in list
+           }
+
             UNLOCKNOTIFY();
         }
     }
@@ -1352,30 +1538,31 @@ IONotifier * IOService::registerInterest( const OSSymbol * typeOfInterest,
     return( notify );
 }
 
-static void cleanInterestArray( OSObject * object )
+static void cleanInterestList( OSObject * head )
 {
-    OSArray *                  array;
-    unsigned int               index;
-    _IOServiceInterestNotifier * next;
-    
-    if( (array = OSDynamicCast( OSArray, object))) {
-        LOCKWRITENOTIFY();
-        for( index = 0;
-             (next = (_IOServiceInterestNotifier *)
-                        array->getObject( index ));
-             index++) {
-            next->whence = 0;
-        }
-        UNLOCKNOTIFY();
+    IOCommand *notifyHead = OSDynamicCast(IOCommand, head);
+    if (!notifyHead)
+       return;
+
+    LOCKWRITENOTIFY();
+    while ( queue_entry_t entry = dequeue(&notifyHead->fCommandChain) ) {
+       queue_next(entry) = queue_prev(entry) = 0;
+
+       _IOServiceInterestNotifier * notify;
+
+       queue_element(entry, notify, _IOServiceInterestNotifier *, chain);
+       notify->release();
     }
+    UNLOCKNOTIFY();
 }
 
 void IOService::unregisterAllInterest( void )
 {
-    cleanInterestArray( getProperty( gIOGeneralInterest ));
-    cleanInterestArray( getProperty( gIOBusyInterest ));
-    cleanInterestArray( getProperty( gIOAppPowerStateInterest ));
-    cleanInterestArray( getProperty( gIOPriorityPowerStateInterest ));
+    cleanInterestList( getProperty( gIOGeneralInterest ));
+    cleanInterestList( getProperty( gIOBusyInterest ));
+    cleanInterestList( getProperty( gIOAppPowerStateInterest ));
+    cleanInterestList( getProperty( gIOPriorityPowerStateInterest ));
+    cleanInterestList( getProperty( gIOConsoleSecurityInterest ));
 }
 
 /*
@@ -1401,10 +1588,7 @@ void _IOServiceInterestNotifier::wait()
         }
         if( doWait) {
             state |= kIOServiceNotifyWaiter;
-            assert_wait( this, THREAD_UNINT);
-            UNLOCKNOTIFY();
-            thread_block((void (*)(void)) 0);
-            LOCKWRITENOTIFY();
+              SLEEPNOTIFY(this);
         }
 
     } while( doWait );
@@ -1420,10 +1604,10 @@ void _IOServiceInterestNotifier::remove()
 {
     LOCKWRITENOTIFY();
 
-    if( whence) {
-        whence->removeObject(whence->getNextIndexOfObject(
-                                       (OSObject *) this, 0 ));
-        whence = 0;
+    if( queue_next( &chain )) {
+       remqueue(&chain);
+       queue_next( &chain) = queue_prev( &chain) = 0;
+       release();
     }
 
     state &= ~kIOServiceNotifyEnable;
@@ -1469,9 +1653,9 @@ void _IOServiceInterestNotifier::enable( bool was )
 
 #define tailQ(o)               setObject(o)
 #define headQ(o)               setObject(0, o)
-#define TLOG(fmt, args...)     { if(kIOLogYield & gIOKitDebug) IOLog(fmt, ## args); }
+#define TLOG(fmt, args...)     { if(kIOLogYield & gIOKitDebug) { IOLog("[%llx] ", thread_tid(current_thread())); IOLog(fmt, ## args); }}
 
-inline void _workLoopAction( IOWorkLoop::Action action,
+static void _workLoopAction( IOWorkLoop::Action action,
                              IOService * service,
                              void * p0 = 0, void * p1 = 0,
                              void * p2 = 0, void * p3 = 0 )
@@ -1503,17 +1687,27 @@ bool IOService::requestTerminate( IOService * provider, IOOptionBits options )
     return( ok );
 }
 
-bool IOService::terminatePhase1( IOOptionBits options = 0 )
+bool IOService::terminatePhase1( IOOptionBits options )
 {
-    IOService *                victim;
-    IOService *                client;
-    OSIterator *       iter;
-    OSArray *          makeInactive;
-    bool               ok;
-    bool               didInactive;
-    bool               startPhase2 = false;
-
-    TLOG("%s::terminatePhase1(%08lx)\n", getName(), options);
+    IOService *         victim;
+    IOService *         client;
+    OSIterator * iter;
+    OSArray *   makeInactive;
+       int          waitResult = THREAD_AWAKENED;
+       bool         wait;
+    bool                ok;
+    bool                didInactive;
+    bool                startPhase2 = false;
+
+    TLOG("%s::terminatePhase1(%08llx)\n", getName(), (long long)options);
+
+    uint64_t regID = getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_PHASE1,
+       (uintptr_t) regID, 
+       (uintptr_t) (regID >> 32),
+       (uintptr_t) this,
+       (uintptr_t) options);
 
     // -- compat
     if( options & kIOServiceRecursing) {
@@ -1531,16 +1725,38 @@ bool IOService::terminatePhase1( IOOptionBits options = 0 )
 
     while( victim ) {
 
-        didInactive = victim->lockForArbitration( true );
+               didInactive = victim->lockForArbitration( true );
         if( didInactive) {
             didInactive = (0 == (victim->__state[0] & kIOServiceInactiveState));
             if( didInactive) {
                 victim->__state[0] |= kIOServiceInactiveState;
                 victim->__state[0] &= ~(kIOServiceRegisteredState | kIOServiceMatchedState
                                         | kIOServiceFirstPublishState | kIOServiceFirstMatchState);
+
+                               if (victim == this)
+                                       victim->__state[1] |= kIOServiceTermPhase1State;
+
                 victim->_adjustBusy( 1 );
-            }
-            victim->unlockForArbitration();
+
+            } else if (victim != this) do {
+
+                               IOLockLock(gIOServiceBusyLock);
+                               wait = (victim->__state[1] & kIOServiceTermPhase1State);
+                               if( wait) {
+                                   TLOG("%s::waitPhase1(%s)\n", getName(), victim->getName());
+                                       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::did waitPhase1(%s)\n", getName(), victim->getName());
+                                       victim->lockForArbitration();
+                               }
+                       } while( wait && (waitResult != THREAD_TIMED_OUT));
+
+                       victim->unlockForArbitration();
         }
         if( victim == this)
             startPhase2 = didInactive;
@@ -1548,16 +1764,26 @@ bool IOService::terminatePhase1( IOOptionBits options = 0 )
 
             victim->deliverNotification( gIOTerminatedNotification, 0, 0xffffffff );
             IOUserClient::destroyUserReferences( victim );
-            victim->unregisterAllInterest();
 
             iter = victim->getClientIterator();
             if( iter) {
                 while( (client = (IOService *) iter->getNextObject())) {
-                    TLOG("%s::requestTerminate(%s, %08lx)\n",
-                            client->getName(), victim->getName(), options);
+                    TLOG("%s::requestTerminate(%s, %08llx)\n",
+                            client->getName(), victim->getName(), (long long)options);
                     ok = client->requestTerminate( victim, options );
                     TLOG("%s::requestTerminate(%s, ok = %d)\n",
                             client->getName(), victim->getName(), ok);
+
+                   uint64_t regID1 = client->getRegistryEntryID();
+                   uint64_t regID2 = victim->getRegistryEntryID();
+                   IOServiceTrace(
+                       (ok ? IOSERVICE_TERMINATE_REQUEST_OK
+                          : IOSERVICE_TERMINATE_REQUEST_FAIL),
+                       (uintptr_t) regID1, 
+                       (uintptr_t) (regID1 >> 32),
+                       (uintptr_t) regID2, 
+                       (uintptr_t) (regID2 >> 32));
+
                     if( ok)
                         makeInactive->setObject( client );
                 }
@@ -1575,15 +1801,28 @@ bool IOService::terminatePhase1( IOOptionBits options = 0 )
     makeInactive->release();
 
     if( startPhase2)
-        scheduleTerminatePhase2( options );
+    {
+               lockForArbitration();
+               __state[1] &= ~kIOServiceTermPhase1State;
+               if (kIOServiceTerm1WaiterState & __state[1])
+               {
+                       __state[1] &= ~kIOServiceTerm1WaiterState;
+                       TLOG("%s::wakePhase1\n", getName());
+                       IOLockLock( gIOServiceBusyLock );
+                       thread_wakeup( (event_t) &__state[1]);
+                       IOLockUnlock( gIOServiceBusyLock );
+               }
+               unlockForArbitration();
 
+        scheduleTerminatePhase2( options );
+    }
     return( true );
 }
 
-void IOService::scheduleTerminatePhase2( IOOptionBits options = 0 )
+void IOService::scheduleTerminatePhase2( IOOptionBits options )
 {
     AbsoluteTime       deadline;
-    int                        waitResult;
+    int                        waitResult = THREAD_AWAKENED;
     bool               wait, haveDeadline = false;
 
     options |= kIOServiceRequired;
@@ -1599,10 +1838,7 @@ void IOService::scheduleTerminatePhase2( IOOptionBits options = 0 )
             wait = (gIOTerminateThread != 0);
             if( wait) {
                 // wait to become the terminate thread
-                assert_wait( (event_t) &gIOTerminateThread, THREAD_UNINT );
-                IOLockUnlock( gJobsLock );
-                thread_block((void (*)(void)) 0);
-                IOLockLock( gJobsLock );
+                IOLockSleep( gJobsLock, &gIOTerminateThread, THREAD_UNINT);
             }
         } while( wait );
 
@@ -1611,35 +1847,36 @@ void IOService::scheduleTerminatePhase2( IOOptionBits options = 0 )
         gIOTerminateWork++;
 
         do {
-            terminateWorker( options );
+           while( gIOTerminateWork )
+               terminateWorker( options );
             wait = (0 != (__state[1] & kIOServiceBusyStateMask));
             if( wait) {
                 // wait for the victim to go non-busy
-                assert_wait( (event_t) &gIOTerminateWork, THREAD_UNINT );
                 if( !haveDeadline) {
                     clock_interval_to_deadline( 15, kSecondScale, &deadline );
                     haveDeadline = true;
                 }
-                thread_set_timer_deadline( deadline );
-                IOLockUnlock( gJobsLock );
-                waitResult = thread_block((void (*)(void)) 0);
+                waitResult = IOLockSleepDeadline( gJobsLock, &gIOTerminateWork,
+                                                  deadline, THREAD_UNINT );
                 if( waitResult == THREAD_TIMED_OUT) {
-                    TLOG("%s::terminate(kIOServiceSynchronous) timeout", getName());
-                } else
-                    thread_cancel_timer();
-                IOLockLock( gJobsLock );
+                    IOLog("%s::terminate(kIOServiceSynchronous) timeout\n", getName());
+               }
             }
-        } while( wait && (waitResult != THREAD_TIMED_OUT));
+        } while(gIOTerminateWork || (wait && (waitResult != THREAD_TIMED_OUT)));
 
-        gIOTerminateThread = 0;
-        thread_wakeup( (event_t) &gIOTerminateThread );
+       gIOTerminateThread = 0;
+       IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);
 
     } else {
         // ! kIOServiceSynchronous
 
         gIOTerminatePhase2List->setObject( this );
-        if( 0 == gIOTerminateWork++)
-            gIOTerminateThread = IOCreateThread( &terminateThread, (void *) options );
+        if( 0 == gIOTerminateWork++) {
+           if( !gIOTerminateThread)
+               kernel_thread_start(&terminateThread, (void *) options, &gIOTerminateThread);
+           else
+               IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
+       }
     }
 
     IOLockUnlock( gJobsLock );
@@ -1647,14 +1884,16 @@ void IOService::scheduleTerminatePhase2( IOOptionBits options = 0 )
     release();
 }
 
-void IOService::terminateThread( void * arg )
+void IOService::terminateThread( void * arg, wait_result_t waitResult )
 {
     IOLockLock( gJobsLock );
 
-    terminateWorker( (IOOptionBits) arg );
+    while (gIOTerminateWork)
+       terminateWorker( (uintptr_t) arg );
 
+    thread_deallocate(gIOTerminateThread);
     gIOTerminateThread = 0;
-    thread_wakeup( (event_t) &gIOTerminateThread );
+    IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);
 
     IOLockUnlock( gJobsLock );
 }
@@ -1663,15 +1902,24 @@ void IOService::scheduleStop( IOService * provider )
 {
     TLOG("%s::scheduleStop(%s)\n", getName(), provider->getName());
 
+    uint64_t regID1 = getRegistryEntryID();
+    uint64_t regID2 = provider->getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_SCHEDULE_STOP,
+       (uintptr_t) regID1, 
+       (uintptr_t) (regID1 >> 32),
+       (uintptr_t) regID2, 
+       (uintptr_t) (regID2 >> 32));
+
     IOLockLock( gJobsLock );
     gIOStopList->tailQ( this );
     gIOStopProviderList->tailQ( provider );
 
     if( 0 == gIOTerminateWork++) {
         if( !gIOTerminateThread)
-            gIOTerminateThread = IOCreateThread( &terminateThread, (void *) 0 );
+           kernel_thread_start(&terminateThread, (void *) 0, &gIOTerminateThread);
         else
-            thread_wakeup( (event_t) &gIOTerminateWork );
+            IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
     }
 
     IOLockUnlock( gJobsLock );
@@ -1681,14 +1929,21 @@ void IOService::scheduleFinalize( void )
 {
     TLOG("%s::scheduleFinalize\n", getName());
 
+    uint64_t regID1 = getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_SCHEDULE_FINALIZE,
+       (uintptr_t) regID1, 
+       (uintptr_t) (regID1 >> 32),
+       0, 0);
+
     IOLockLock( gJobsLock );
     gIOFinalizeList->tailQ( this );
 
     if( 0 == gIOTerminateWork++) {
         if( !gIOTerminateThread)
-            gIOTerminateThread = IOCreateThread( &terminateThread, (void *) 0 );
+           kernel_thread_start(&terminateThread, (void *) 0, &gIOTerminateThread);
         else
-            thread_wakeup( (event_t) &gIOTerminateWork );
+            IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
     }
 
     IOLockUnlock( gJobsLock );
@@ -1721,7 +1976,9 @@ bool IOService::didTerminate( IOService * provider, IOOptionBits options, bool *
 }
 
 void IOService::actionWillTerminate( IOService * victim, IOOptionBits options, 
-                                    OSArray * doPhase2List )
+                                    OSArray * doPhase2List,
+                                    void *unused2 __unused,
+                                    void *unused3 __unused  )
 {
     OSIterator * iter;
     IOService *         client;
@@ -1730,8 +1987,18 @@ void IOService::actionWillTerminate( IOService * victim, IOOptionBits options,
     iter = victim->getClientIterator();
     if( iter) {
         while( (client = (IOService *) iter->getNextObject())) {
-            TLOG("%s::willTerminate(%s, %08lx)\n",
-                    client->getName(), victim->getName(), options);
+            TLOG("%s::willTerminate(%s, %08llx)\n",
+                    client->getName(), victim->getName(), (long long)options);
+
+           uint64_t regID1 = client->getRegistryEntryID();
+           uint64_t regID2 = victim->getRegistryEntryID();
+           IOServiceTrace(
+               IOSERVICE_TERMINATE_WILL,
+               (uintptr_t) regID1, 
+               (uintptr_t) (regID1 >> 32),
+               (uintptr_t) regID2, 
+               (uintptr_t) (regID2 >> 32));
+
             ok = client->willTerminate( victim, options );
             doPhase2List->tailQ( client );
         }
@@ -1739,7 +2006,9 @@ void IOService::actionWillTerminate( IOService * victim, IOOptionBits options,
     }
 }
 
-void IOService::actionDidTerminate( IOService * victim, IOOptionBits options )
+void IOService::actionDidTerminate( IOService * victim, IOOptionBits options,
+                           void *unused1 __unused, void *unused2 __unused,
+                           void *unused3 __unused )
 {
     OSIterator * iter;
     IOService *         client;
@@ -1750,9 +2019,20 @@ void IOService::actionDidTerminate( IOService * victim, IOOptionBits options )
     iter = victim->getClientIterator();
     if( iter) {
         while( (client = (IOService *) iter->getNextObject())) {
-            TLOG("%s::didTerminate(%s, %08lx)\n",
-                    client->getName(), victim->getName(), options);
+            TLOG("%s::didTerminate(%s, %08llx)\n",
+                    client->getName(), victim->getName(), (long long)options);
             client->didTerminate( victim, options, &defer );
+
+           uint64_t regID1 = client->getRegistryEntryID();
+           uint64_t regID2 = victim->getRegistryEntryID();
+           IOServiceTrace(
+               (defer ? IOSERVICE_TERMINATE_DID_DEFER
+                      : IOSERVICE_TERMINATE_DID),
+               (uintptr_t) regID1, 
+               (uintptr_t) (regID1 >> 32),
+               (uintptr_t) regID2, 
+               (uintptr_t) (regID2 >> 32));
+
             TLOG("%s::didTerminate(%s, defer %d)\n",
                     client->getName(), victim->getName(), defer);
         }
@@ -1760,15 +2040,37 @@ void IOService::actionDidTerminate( IOService * victim, IOOptionBits options )
     }
 }
 
-void IOService::actionFinalize( IOService * victim, IOOptionBits options )
+void IOService::actionFinalize( IOService * victim, IOOptionBits options,
+                           void *unused1 __unused, void *unused2 __unused,
+                           void *unused3 __unused )
 {
-    TLOG("%s::finalize(%08lx)\n", victim->getName(), options);
+    TLOG("%s::finalize(%08llx)\n", victim->getName(), (long long)options);
+
+    uint64_t regID1 = victim->getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_FINALIZE,
+       (uintptr_t) regID1, 
+       (uintptr_t) (regID1 >> 32),
+       0, 0);
+
     victim->finalize( options );
 }
 
-void IOService::actionStop( IOService * provider, IOService * client )
+void IOService::actionStop( IOService * provider, IOService * client,
+                           void *unused1 __unused, void *unused2 __unused,
+                           void *unused3 __unused )
 {
     TLOG("%s::stop(%s)\n", client->getName(), provider->getName());
+
+    uint64_t regID1 = provider->getRegistryEntryID();
+    uint64_t regID2 = client->getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_STOP,
+       (uintptr_t) regID1, 
+       (uintptr_t) (regID1 >> 32),
+       (uintptr_t) regID2, 
+       (uintptr_t) (regID2 >> 32));
+
     client->stop( provider );
     if( provider->isOpen( client ))
         provider->close( client );
@@ -1878,10 +2180,30 @@ void IOService::terminateWorker( IOOptionBits options )
                 if( !provider->isChild( client, gIOServicePlane )) {
                     // may be multiply queued - nop it
                     TLOG("%s::nop stop(%s)\n", client->getName(), provider->getName());
+
+                   uint64_t regID1 = provider->getRegistryEntryID();
+                   uint64_t regID2 = client->getRegistryEntryID();
+                   IOServiceTrace(
+                       IOSERVICE_TERMINATE_STOP_NOP,
+                       (uintptr_t) regID1, 
+                       (uintptr_t) (regID1 >> 32),
+                       (uintptr_t) regID2, 
+                       (uintptr_t) (regID2 >> 32));
+
                 } else {
-                    // not ready for stop if it has clients, skip it
-                    if( (client->__state[1] & kIOServiceTermPhase3State) && client->getClient()) {
+                    // a terminated client is not ready for stop if it has clients, skip it
+                    if( (kIOServiceInactiveState & client->__state[0]) && client->getClient()) {
                         TLOG("%s::defer stop(%s)\n", client->getName(), provider->getName());
+
+                       uint64_t regID1 = provider->getRegistryEntryID();
+                       uint64_t regID2 = client->getRegistryEntryID();
+                       IOServiceTrace(
+                           IOSERVICE_TERMINATE_STOP_DEFER,
+                           (uintptr_t) regID1, 
+                           (uintptr_t) (regID1 >> 32),
+                           (uintptr_t) regID2, 
+                           (uintptr_t) (regID2 >> 32));
+
                         idx++;
                         continue;
                     }
@@ -1910,6 +2232,9 @@ void IOService::terminateWorker( IOOptionBits options )
 
         if( !moreToDo) {
             TLOG("iokit terminate done, %d stops remain\n", gIOStopList->getCount());
+           IOServiceTrace(
+               IOSERVICE_TERMINATE_DONE,
+               (uintptr_t) gIOStopList->getCount(), 0, 0, 0);
         }
 
     } while( moreToDo );
@@ -1956,8 +2281,8 @@ bool IOService::finalize( IOOptionBits options )
     return( true );
 }
 
-#undef tailQ(o)
-#undef headQ(o)
+#undef tailQ
+#undef headQ
 
 /*
  * Terminate
@@ -1981,7 +2306,7 @@ bool IOService::terminateClient( IOService * client, IOOptionBits options )
     return( ok );
 }
 
-bool IOService::terminate( IOOptionBits options = 0 )
+bool IOService::terminate( IOOptionBits options )
 {
     options |= kIOServiceTerminate;
 
@@ -2011,8 +2336,8 @@ static void serviceOpenMessageApplier( OSObject * object, void * ctx )
 }
 
 bool IOService::open(  IOService *     forClient,
-                        IOOptionBits   options = 0,
-                        void *         arg = 0 )
+                        IOOptionBits   options,
+                        void *         arg )
 {
     bool                       ok;
     ServiceOpenMessageContext  context;
@@ -2038,7 +2363,7 @@ bool IOService::open(     IOService *     forClient,
 }
 
 void IOService::close(         IOService *     forClient,
-                        IOOptionBits   options = 0 )
+                        IOOptionBits   options )
 {
     bool               wasClosed;
     bool               last = false;
@@ -2070,7 +2395,7 @@ void IOService::close(    IOService *     forClient,
     }
 }
 
-bool IOService::isOpen( const IOService * forClient = 0 ) const
+bool IOService::isOpen( const IOService * forClient ) const
 {
     IOService *        self = (IOService *) this;
     bool ok;
@@ -2187,7 +2512,7 @@ SInt32 IOServiceOrdering( const OSMetaClassBase * inObj1, const OSMetaClassBase
     return ( val1 - val2 );
 }
 
-IOService * IOService::getClientWithCategory( const OSSymbol * category )
+IOService * IOService::copyClientWithCategory( const OSSymbol * category )
 {
     IOService *                service = 0;
     OSIterator *       iter;
@@ -2201,13 +2526,25 @@ IOService * IOService::getClientWithCategory( const OSSymbol * category )
             nextCat = (const OSSymbol *) OSDynamicCast( OSSymbol,
                        service->getProperty( gIOMatchCategoryKey ));
            if( category == nextCat)
+           {
+               service->retain();
                break;
+           }
        }
        iter->release();
     }
     return( service );
 }
 
+IOService * IOService::getClientWithCategory( const OSSymbol * category )
+{
+    IOService *
+    service = copyClientWithCategory(category);
+    if (service)
+       service->release();
+    return (service);
+}
+
 bool IOService::invokeNotifer( _IOServiceNotifier * notify )
 {
     _IOServiceNotifierInvocation invocation;
@@ -2227,14 +2564,14 @@ bool IOService::invokeNotifer( _IOServiceNotifier * notify )
 
     if( willNotify) {
 
-        ret = (*notify->handler)( notify->target, notify->ref, this );
+       ret = (*notify->handler)(notify->target, notify->ref, this, notify);
 
         LOCKWRITENOTIFY();
         queue_remove( &notify->handlerInvocations, &invocation,
                         _IOServiceNotifierInvocation *, link );
         if( kIOServiceNotifyWaiter & notify->state) {
             notify->state &= ~kIOServiceNotifyWaiter;
-            thread_wakeup( (event_t) notify);
+            WAKEUPNOTIFY( notify );
         }
         UNLOCKNOTIFY();
     }
@@ -2265,9 +2602,15 @@ void IOService::probeCandidates( OSOrderedSet * matches )
     OSObject           *       nextMatch = 0;
     bool                       started;
     bool                       needReloc = false;
+#if CONFIG_MACF_KEXT
+    OSBoolean          *       isSandbox = 0;
+    bool                       useSandbox = false;
+#endif
 #if IOMATCHDEBUG
     SInt64                     debugFlags;
 #endif
+    IOService * client = NULL;
+
 
     assert( matches );
     while( !needReloc && (nextMatch = matches->getFirstObject())) {
@@ -2301,8 +2644,8 @@ void IOService::probeCandidates( OSOrderedSet * matches )
                        match->getObject( gIOMatchCategoryKey ));
            if( 0 == category)
                category = gIODefaultMatchCategoryKey;
-
-           if( getClientWithCategory( category )) {
+           
+           if( (client = copyClientWithCategory(category)) ) {
 #if IOMATCHDEBUG
                if( debugFlags & kIOLogMatch)
                    LOG("%s: match category %s exists\n", getName(),
@@ -2310,6 +2653,10 @@ void IOService::probeCandidates( OSOrderedSet * matches )
 #endif
                 nextMatch->release();
                 nextMatch = 0;
+
+               client->release();
+               client = NULL;
+
                 continue;
            }
 
@@ -2373,6 +2720,8 @@ void IOService::probeCandidates( OSOrderedSet * matches )
                 if( !symbol)
                     continue;
     
+                //IOLog("%s alloc (symbol %p props %p)\n", symbol->getCStringNoCopy(), symbol, props);
+
                 // alloc the driver instance
                 inst = (IOService *) OSMetaClass::allocClassWithName( symbol);
     
@@ -2399,7 +2748,10 @@ void IOService::probeCandidates( OSOrderedSet * matches )
                 if( 0 == category)
                     category = gIODefaultMatchCategoryKey;
                 inst->setProperty( gIOMatchCategoryKey, (OSObject *) category );
-    
+#if CONFIG_MACF_KEXT
+               isSandbox = OSDynamicCast(OSBoolean,
+                            props->getObject("IOKitForceMatch"));
+#endif
                 // attach driver instance
                 if( !(inst->attach( this )))
                         continue;
@@ -2416,6 +2768,21 @@ void IOService::probeCandidates( OSOrderedSet * matches )
     
                 newInst = inst->probe( this, &score );
                 inst->detach( this );
+#if CONFIG_MACF_KEXT
+               /*
+                * If this is the Sandbox driver and it matched, this is a
+                * disallowed device; toss any drivers that were already
+                * matched.
+                */
+               if (isSandbox && isSandbox->isTrue() && newInst != 0) {
+                   if (startDict != 0) {
+                       startDict->flushCollection();
+                       startDict->release();
+                       startDict = 0;
+                   }
+                   useSandbox = true;
+               }
+#endif
                 if( 0 == newInst) {
 #if IOMATCHDEBUG
                     if( debugFlags & kIOLogProbe)
@@ -2454,6 +2821,13 @@ void IOService::probeCandidates( OSOrderedSet * matches )
             props->release();
             if( inst)
                 inst->release();
+#if CONFIG_MACF_KEXT
+           /*
+            * If we're forcing the sandbox, drop out of the loop.
+            */
+           if (isSandbox && isSandbox->isTrue() && useSandbox)
+                   break;
+#endif
         }
         familyMatches->release();
         familyMatches = 0;
@@ -2501,16 +2875,35 @@ void IOService::probeCandidates( OSOrderedSet * matches )
     }
 
 
-    // adjust the busy count by -1 if matching is stalled for a module,
-    // or +1 if a previously stalled matching is complete.
+    // adjust the busy count by +1 if matching is stalled for a module,
+    // or -1 if a previously stalled matching is complete.
     lockForArbitration();
     SInt32 adjBusy = 0;
+    uint64_t regID = getRegistryEntryID();
+
     if( needReloc) {
         adjBusy = (__state[1] & kIOServiceModuleStallState) ? 0 : 1;
-        if( adjBusy)
+        if( adjBusy) {
+
+           IOServiceTrace(
+               IOSERVICE_MODULESTALL,
+               (uintptr_t) regID, 
+               (uintptr_t) (regID >> 32),
+               (uintptr_t) this,
+               0);
+
             __state[1] |= kIOServiceModuleStallState;
+       }
 
     } else if( __state[1] & kIOServiceModuleStallState) {
+
+           IOServiceTrace(
+           IOSERVICE_MODULEUNSTALL,
+           (uintptr_t) regID, 
+           (uintptr_t) (regID >> 32),
+           (uintptr_t) this,
+           0);
+
         __state[1] &= ~kIOServiceModuleStallState;
         adjBusy = -1;
     }
@@ -2533,26 +2926,44 @@ bool IOService::startCandidate( IOService * service )
 
     ok = service->attach( this );
 
-    if( ok) {
-        // stall for any nub resources
-        checkResources();
-        // stall for any driver resources
-        service->checkResources();
+    if( ok)
+    {
+       if (this != gIOResources)
+       {
+           // stall for any nub resources
+           checkResources();
+           // stall for any driver resources
+           service->checkResources();
+       }
+       
+       AbsoluteTime startTime;
+       AbsoluteTime endTime;
+       UInt64       nano;
 
+       if (kIOLogStart & gIOKitDebug)
+           clock_get_uptime(&startTime);
 
-        ok = service->start( this );
+        ok = service->start(this);
+
+       if (kIOLogStart & gIOKitDebug)
+       {
+           clock_get_uptime(&endTime);
+    
+           if (CMP_ABSOLUTETIME(&endTime, &startTime) > 0)
+           {
+               SUB_ABSOLUTETIME(&endTime, &startTime);
+               absolutetime_to_nanoseconds(endTime, &nano);
+               if (nano > 500000000ULL)
+                   IOLog("%s::start took %ld ms\n", service->getName(), (long)(UInt32)(nano / 1000000ULL));
+           }
+       }
         if( !ok)
             service->detach( this );
     }
     return( ok );
 }
 
-IOService * IOService::resources( void )
-{
-    return( gIOResources );
-}
-
-void IOService::publishResource( const char * key, OSObject * value = 0 )
+void IOService::publishResource( const char * key, OSObject * value )
 {
     const OSSymbol *   sym;
 
@@ -2562,35 +2973,38 @@ void IOService::publishResource( const char * key, OSObject * value = 0 )
     }
 }
 
-void IOService::publishResource( const OSSymbol * key, OSObject * value = 0 )
+void IOService::publishResource( const OSSymbol * key, OSObject * value )
 {
     if( 0 == value)
        value = (OSObject *) gIOServiceKey;
 
     gIOResources->setProperty( key, value);
 
+    if( IORecursiveLockHaveLock( gNotificationLock))
+       return;
+
     gIOResourceGenerationCount++;
     gIOResources->registerService();
 }
 
 bool IOService::addNeededResource( const char * key )
 {
-    OSObject * resources;
+    OSObject * resourcesProp;
     OSSet *    set;
     OSString * newKey;
     bool ret;
 
-    resources = getProperty( gIOResourceMatchKey );
+    resourcesProp = getProperty( gIOResourceMatchKey );
 
     newKey = OSString::withCString( key );
-    if( (0 == resources) || (0 == newKey))
+    if( (0 == resourcesProp) || (0 == newKey))
        return( false);
 
-    set = OSDynamicCast( OSSet, resources );
+    set = OSDynamicCast( OSSet, resourcesProp );
     if( !set) {
        set = OSSet::withCapacity( 1 );
        if( set)
-            set->setObject( resources );
+            set->setObject( resourcesProp );
     }
     else
         set->retain();
@@ -2625,44 +3039,44 @@ bool IOService::checkResource( OSObject * matching )
     }
 
     if( gIOKitDebug & kIOLogConfig)
-        LOG("config(%x): stalling %s\n", (int) IOThreadSelf(), getName());
+        LOG("config(%p): stalling %s\n", IOThreadSelf(), getName());
 
     waitForService( table );
 
     if( gIOKitDebug & kIOLogConfig)
-        LOG("config(%x): waking\n", (int) IOThreadSelf() );
+        LOG("config(%p): waking\n", IOThreadSelf() );
 
     return( true );
 }
 
 bool IOService::checkResources( void )
 {
-    OSObject *                 resources;
+    OSObject *                 resourcesProp;
     OSSet *            set;
     OSIterator *       iter;
     bool               ok;
 
-    resources = getProperty( gIOResourceMatchKey );
-    if( 0 == resources)
+    resourcesProp = getProperty( gIOResourceMatchKey );
+    if( 0 == resourcesProp)
         return( true );
 
-    if( (set = OSDynamicCast( OSSet, resources ))) {
+    if( (set = OSDynamicCast( OSSet, resourcesProp ))) {
 
        iter = OSCollectionIterator::withCollection( set );
        ok = (0 != iter);
-        while( ok && (resources = iter->getNextObject()) )
-            ok = checkResource( resources );
+        while( ok && (resourcesProp = iter->getNextObject()) )
+            ok = checkResource( resourcesProp );
        if( iter)
            iter->release();
 
     } else
-       ok = checkResource( resources );
+       ok = checkResource( resourcesProp );
 
     return( ok );
 }
 
 
-_IOConfigThread * _IOConfigThread::configThread( void )
+void _IOConfigThread::configThread( void )
 {
     _IOConfigThread *  inst;
 
@@ -2671,22 +3085,23 @@ _IOConfigThread * _IOConfigThread::configThread( void )
            continue;
        if( !inst->init())
            continue;
-       if( !(inst->thread = IOCreateThread
-                ( (IOThreadFunc) &_IOConfigThread::main, inst )))
+       thread_t unused;
+       if (KERN_SUCCESS != kernel_thread_start(&_IOConfigThread::main, inst, &unused))
            continue;
 
-       return( inst );
+       return;
 
     } while( false);
 
     if( inst)
        inst->release();
 
-    return( 0 );
+    return;
 }
 
 void _IOConfigThread::free( void )
 {
+    thread_deallocate(current_thread());
     OSObject::free();
 }
 
@@ -2717,8 +3132,8 @@ void IOService::doServiceMatch( IOOptionBits options )
             __state[1] |= kIOServiceConfigState;
             __state[0] |= kIOServiceRegisteredState;
 
-            if( reRegistered && (0 == (__state[0] & kIOServiceInactiveState))) {
-
+           keepGuessing &= (0 == (__state[0] & kIOServiceInactiveState));
+            if (reRegistered && keepGuessing) {
                 iter = OSCollectionIterator::withCollection( (OSOrderedSet *)
                         gNotifications->getObject( gIOPublishNotification ) );
                 if( iter) {
@@ -2736,7 +3151,7 @@ void IOService::doServiceMatch( IOOptionBits options )
            UNLOCKNOTIFY();
             unlockForArbitration();
 
-            if( matches->getCount() && (kIOReturnSuccess == getResources()))
+            if (keepGuessing && matches->getCount() && (kIOReturnSuccess == getResources()))
                 probeCandidates( matches );
             else
                 matches->release();
@@ -2784,11 +3199,13 @@ UInt32 IOService::_adjustBusy( SInt32 delta )
         if( next != this)
             next->lockForArbitration();
         count = next->__state[1] & kIOServiceBusyStateMask;
-        assert( count < kIOServiceBusyMax);
         wasQuiet = (0 == count);
-        assert( (!wasQuiet) || (delta > 0));
-        next->__state[1] += delta;
-        nowQuiet = (0 == (next->__state[1] & kIOServiceBusyStateMask));
+       if (((delta < 0) && wasQuiet) || ((delta > 0) && (kIOServiceBusyMax == count)))
+           OSReportWithBacktrace("%s: bad busy count (%d,%d)\n", next->getName(), count, delta);
+       else
+           count += delta;
+       next->__state[1] = (next->__state[1] & ~kIOServiceBusyStateMask) | count;
+        nowQuiet = (0 == count);
        needWake = (0 != (kIOServiceBusyWaiterState & next->__state[1]));
 
         if( needWake) {
@@ -2801,24 +3218,41 @@ UInt32 IOService::_adjustBusy( SInt32 delta )
             next->unlockForArbitration();
 
         if( (wasQuiet || nowQuiet) ) {
-            OSArray *          array;
-            unsigned int       index;
-            OSObject *         interested;
-
-            array = OSDynamicCast( OSArray, next->getProperty( gIOBusyInterest ));
-            if( array) {
-                LOCKREADNOTIFY();
-                for( index = 0;
-                     (interested = array->getObject( index ));
-                     index++) {
-                    next->messageClient(kIOMessageServiceBusyStateChange,
-                                     interested, (void *) wasQuiet /* busy now */);
-                }
-                UNLOCKNOTIFY();
-            }
+           uint64_t regID = next->getRegistryEntryID();
+
+               IOServiceTrace(
+               ((wasQuiet/*nowBusy*/) ? IOSERVICE_BUSY : IOSERVICE_NONBUSY),
+               (uintptr_t) regID, 
+               (uintptr_t) (regID >> 32),
+               (uintptr_t) next,
+               0);
+
+           if (wasQuiet)
+           {
+               next->__timeBusy = mach_absolute_time();
+           }
+           else
+           {
+               next->__accumBusy += mach_absolute_time() - next->__timeBusy;
+               next->__timeBusy = 0;
+           }
 
-            if( nowQuiet && (next == gIOServiceRoot))
-                OSMetaClass::considerUnloads();
+           MessageClientsContext context;
+
+           context.service  = next;
+           context.type     = kIOMessageServiceBusyStateChange;
+           context.argument = (void *) wasQuiet;       /*nowBusy*/
+           context.argSize  = 0;
+
+           applyToInterestNotifiers( next, gIOBusyInterest, 
+                                    &messageClientsApplier, &context );
+
+#if !NO_KEXTD
+            if( nowQuiet && (next == gIOServiceRoot)) {
+                OSKext::considerUnloads();
+                IOServiceTrace(IOSERVICE_REGISTRY_QUIET, 0, 0, 0, 0);
+            }
+#endif
         }
 
         delta = nowQuiet ? -1 : +1;
@@ -2835,13 +3269,40 @@ void IOService::adjustBusy( SInt32 delta )
     unlockForArbitration();
 }
 
+uint64_t IOService::getAccumulatedBusyTime( void )
+{
+    uint64_t accumBusy = __accumBusy;
+    uint64_t timeBusy = __timeBusy;
+    uint64_t nano;
+
+    do
+    {
+       accumBusy = __accumBusy;
+       timeBusy  = __timeBusy;
+       if (timeBusy)
+           accumBusy += mach_absolute_time() - timeBusy;
+    }
+    while (timeBusy != __timeBusy);
+
+    absolutetime_to_nanoseconds(*(AbsoluteTime *)&accumBusy, &nano);
+
+    return (nano);
+}
+
 UInt32 IOService::getBusyState( void )
 {
     return( __state[1] & kIOServiceBusyStateMask );
 }
 
 IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
-                                mach_timespec_t * timeout = 0 )
+                                 mach_timespec_t * timeout )
+{
+    panic("waitForState");
+    return (kIOReturnUnsupported);
+}
+
+IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
+                                  uint64_t timeout )
 {
     bool            wait;
     int             waitResult = THREAD_AWAKENED;
@@ -2855,29 +3316,22 @@ IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
         if( wait) {
             __state[1] |= kIOServiceBusyWaiterState;
             unlockForArbitration();
-            assert_wait( (event_t) this, THREAD_UNINT );
-            if( timeout ) {
+            if( timeout != UINT64_MAX ) {
                 if( computeDeadline ) {
                     AbsoluteTime  nsinterval;
-                    clock_interval_to_absolutetime_interval(
-                          timeout->tv_sec, kSecondScale, &abstime );
-                    clock_interval_to_absolutetime_interval(
-                          timeout->tv_nsec, kNanosecondScale, &nsinterval );
-                    ADD_ABSOLUTETIME( &abstime, &nsinterval );
-                    clock_absolutetime_interval_to_deadline(
-                          abstime, &abstime );
+                    nanoseconds_to_absolutetime(timeout, &nsinterval );
+                    clock_absolutetime_interval_to_deadline(nsinterval, &abstime);
                     computeDeadline = false;
                 }
-                thread_set_timer_deadline( abstime );
+                assert_wait_deadline((event_t)this, THREAD_UNINT, __OSAbsoluteTime(abstime));
             }
+            else
+                assert_wait((event_t)this, THREAD_UNINT );
         } else
             unlockForArbitration();
         IOLockUnlock( gIOServiceBusyLock );
-        if( wait) {
-            waitResult = thread_block((void (*)(void)) 0);
-            if( timeout && (waitResult != THREAD_TIMED_OUT))
-               thread_cancel_timer();
-        }
+        if( wait)
+            waitResult = thread_block(THREAD_CONTINUE_NULL);
 
     } while( wait && (waitResult != THREAD_TIMED_OUT));
 
@@ -2887,11 +3341,27 @@ IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
         return( kIOReturnSuccess );
 }
 
-IOReturn IOService::waitQuiet( mach_timespec_t * timeout = 0 )
+IOReturn IOService::waitQuiet( uint64_t timeout )
 {
     return( waitForState( kIOServiceBusyStateMask, 0, timeout ));
 }
 
+IOReturn IOService::waitQuiet( mach_timespec_t * timeout )
+{
+    uint64_t    timeoutNS;
+
+    if (timeout)
+    {
+       timeoutNS = timeout->tv_sec;
+       timeoutNS *= kSecondScale;
+       timeoutNS += timeout->tv_nsec;
+    }
+    else
+       timeoutNS = UINT64_MAX;
+
+    return( waitForState( kIOServiceBusyStateMask, 0, timeoutNS ));
+}
+
 bool IOService::serializeProperties( OSSerialize * s ) const
 {
 #if 0
@@ -2902,11 +3372,21 @@ bool IOService::serializeProperties( OSSerialize * s ) const
 }
 
 
-void _IOConfigThread::main( _IOConfigThread * self )
+void _IOConfigThread::main(void * arg, wait_result_t result)
 {
-    _IOServiceJob *    job;
-    IOService  *       nub;
-    bool               alive = true;
+    _IOConfigThread * self = (_IOConfigThread *) arg;
+    _IOServiceJob * job;
+    IOService  *   nub;
+    bool           alive = true;
+    kern_return_t   kr;
+    thread_precedence_policy_data_t precedence = { -1 };
+
+    kr = thread_policy_set(current_thread(), 
+                           THREAD_PRECEDENCE_POLICY, 
+                           (thread_policy_t) &precedence, 
+                           THREAD_PRECEDENCE_POLICY_COUNT);
+    if (KERN_SUCCESS != kr)
+       IOLog("thread_policy_set(%d)\n", kr);
 
     do {
 
@@ -2930,8 +3410,8 @@ void _IOConfigThread::main( _IOConfigThread * self )
          nub = job->nub;
 
           if( gIOKitDebug & kIOLogConfig)
-            LOG("config(%x): starting on %s, %d\n",
-                        (int) IOThreadSelf(), job->nub->getName(), job->type);
+            LOG("config(%p): starting on %s, %d\n",
+                        IOThreadSelf(), job->nub->getName(), job->type);
 
          switch( job->type) {
 
@@ -2940,8 +3420,8 @@ void _IOConfigThread::main( _IOConfigThread * self )
                break;
 
             default:
-                LOG("config(%x): strange type (%d)\n",
-                       (int) IOThreadSelf(), job->type );
+                LOG("config(%p): strange type (%d)\n",
+                       IOThreadSelf(), job->type );
                break;
             }
 
@@ -2956,7 +3436,7 @@ void _IOConfigThread::main( _IOConfigThread * self )
            else {
                 if( 0 == --gNumConfigThreads) {
 //                    IOLog("MATCH IDLE\n");
-                    thread_wakeup( (event_t) &gNumConfigThreads);
+                    IOLockWakeup( gJobsLock, (event_t) &gNumConfigThreads, /* one-thread */ false );
                 }
             }
             IOUnlock( gJobsLock );
@@ -2965,7 +3445,7 @@ void _IOConfigThread::main( _IOConfigThread * self )
     } while( alive );
 
     if( gIOKitDebug & kIOLogConfig)
-        LOG("config(%x): terminating\n", (int) IOThreadSelf() );
+        LOG("config(%p): terminating\n", IOThreadSelf() );
 
     self->release();
 }
@@ -2975,32 +3455,27 @@ IOReturn IOService::waitMatchIdle( UInt32 msToWait )
     bool            wait;
     int             waitResult = THREAD_AWAKENED;
     bool            computeDeadline = true;
-    AbsoluteTime    abstime;
+    AbsoluteTime    deadline;
 
+    IOLockLock( gJobsLock );
     do {
-        IOLockLock( gJobsLock );
         wait = (0 != gNumConfigThreads);
         if( wait) {
-            assert_wait( (event_t) &gNumConfigThreads, THREAD_UNINT );
             if( msToWait) {
                 if( computeDeadline ) {
-                    clock_interval_to_absolutetime_interval(
-                          msToWait, kMillisecondScale, &abstime );
-                    clock_absolutetime_interval_to_deadline(
-                          abstime, &abstime );
+                    clock_interval_to_deadline(
+                          msToWait, kMillisecondScale, &deadline );
                     computeDeadline = false;
                 }
-                thread_set_timer_deadline( abstime );
-            }
-        }
-        IOUnlock( gJobsLock );
-        if( wait) {
-            waitResult = thread_block((void (*)(void)) 0);
-            if( msToWait && (waitResult != THREAD_TIMED_OUT))
-               thread_cancel_timer();
+                         waitResult = IOLockSleepDeadline( gJobsLock, &gNumConfigThreads,
+                                                               deadline, THREAD_UNINT );
+                  } else {
+                         waitResult = IOLockSleep( gJobsLock, &gNumConfigThreads,
+                                                               THREAD_UNINT );
+               }
         }
-
     } while( wait && (waitResult != THREAD_TIMED_OUT));
+       IOLockUnlock( gJobsLock );
 
     if( waitResult == THREAD_TIMED_OUT)
         return( kIOReturnTimeout );
@@ -3043,44 +3518,68 @@ void _IOServiceJob::pingConfig( _IOServiceJob * job )
     semaphore_signal( gJobsSemaphore );
 }
 
-
 // internal - call with gNotificationLock
-OSObject * IOService::getExistingServices( OSDictionary * matching,
-                IOOptionBits inState, IOOptionBits options = 0 )
+OSObject * IOService::copyExistingServices( OSDictionary * matching,
+                IOOptionBits inState, IOOptionBits options )
 {
     OSObject *         current = 0;
     OSIterator *       iter;
     IOService *                service;
+    OSObject *         obj;
 
     if( !matching)
        return( 0 );
 
-    iter = IORegistryIterator::iterateOver( gIOServicePlane,
-                                       kIORegistryIterateRecursively );
-    if( iter) {
-        do {
-            iter->reset();
-            while( (service = (IOService *) iter->getNextObject())) {
-                if( (inState == (service->__state[0] & inState))
-                && (0 == (service->__state[0] & kIOServiceInactiveState))
-                 &&  service->passiveMatch( matching )) {
-
-                    if( options & kIONotifyOnce) {
-                        current = service;
-                        break;
-                    }
-                    if( current)
-                        ((OSSet *)current)->setObject( service );
-                    else
-                        current = OSSet::withObjects(
-                                       & (const OSObject *) service, 1, 1 );
-                }
-            }
-        } while( !service && !iter->isValid());
-        iter->release();
+    if(true 
+      && (obj = matching->getObject(gIOProviderClassKey))
+      && gIOResourcesKey
+      && gIOResourcesKey->isEqualTo(obj)
+      && (service = gIOResources))
+    {
+       if( (inState == (service->__state[0] & inState))
+         && (0 == (service->__state[0] & kIOServiceInactiveState))
+         &&  service->passiveMatch( matching ))
+       {
+           if( options & kIONotifyOnce)
+           {
+               service->retain();
+               current = service;
+           }
+           else
+               current = OSSet::withObjects(
+                               (const OSObject **) &service, 1, 1 );
+       }
+    }
+    else
+    {
+       iter = IORegistryIterator::iterateOver( gIOServicePlane,
+                                           kIORegistryIterateRecursively );
+       if( iter) {
+           do {
+               iter->reset();
+               while( (service = (IOService *) iter->getNextObject())) {
+                   if( (inState == (service->__state[0] & inState))
+                   && (0 == (service->__state[0] & kIOServiceInactiveState))
+                   &&  service->passiveMatch( matching )) {
+    
+                       if( options & kIONotifyOnce) {
+                           service->retain();
+                           current = service;
+                           break;
+                       }
+                       if( current)
+                           ((OSSet *)current)->setObject( service );
+                       else
+                           current = OSSet::withObjects(
+                                           (const OSObject **) &service, 1, 1 );
+                   }
+               }
+           } while( !service && !iter->isValid());
+           iter->release();
+       }
     }
 
-    if( current && (0 == (options & kIONotifyOnce))) {
+    if( current && (0 == (options & (kIONotifyOnce | kIOServiceExistingSet)))) {
        iter = OSCollectionIterator::withCollection( (OSSet *)current );
        current->release();
        current = iter;
@@ -3097,7 +3596,7 @@ OSIterator * IOService::getMatchingServices( OSDictionary * matching )
     // is a lock even needed?
     LOCKWRITENOTIFY();
 
-    iter = (OSIterator *) getExistingServices( matching,
+    iter = (OSIterator *) copyExistingServices( matching,
                                                kIOServiceMatchedState );
     
     UNLOCKNOTIFY();
@@ -3105,12 +3604,24 @@ OSIterator * IOService::getMatchingServices( OSDictionary * matching )
     return( iter );
 }
 
+struct _IOServiceMatchingNotificationHandlerRef
+{
+    IOServiceNotificationHandler handler;
+    void * ref;
+};
+
+static bool _IOServiceMatchingNotificationHandler( void * target, void * refCon,
+                                                  IOService * newService,
+                                                  IONotifier * notifier )
+{
+    return ((*((_IOServiceNotifier *) notifier)->compatHandler)(target, refCon, newService));
+}
 
 // internal - call with gNotificationLock
 IONotifier * IOService::setNotification(
            const OSSymbol * type, OSDictionary * matching,
-            IOServiceNotificationHandler handler, void * target, void * ref,
-            SInt32 priority = 0 )
+            IOServiceMatchingNotificationHandler handler, void * target, void * ref,
+            SInt32 priority )
 {
     _IOServiceNotifier * notify = 0;
     OSOrderedSet *     set;
@@ -3125,10 +3636,17 @@ IONotifier * IOService::setNotification(
     }
 
     if( notify) {
-        notify->matching = matching;
-        notify->handler = handler;
+       notify->handler = handler;
         notify->target = target;
-        notify->ref = ref;
+        notify->matching = matching;
+       matching->retain();
+       if (handler == &_IOServiceMatchingNotificationHandler)
+       {
+           notify->compatHandler = ((_IOServiceMatchingNotificationHandlerRef *)ref)->handler;
+           notify->ref = ((_IOServiceMatchingNotificationHandlerRef *)ref)->ref;
+       }
+       else
+           notify->ref = ref;
         notify->priority = priority;
        notify->state = kIOServiceNotifyEnable;
         queue_init( &notify->handlerInvocations );
@@ -3154,7 +3672,7 @@ IONotifier * IOService::setNotification(
 // internal - call with gNotificationLock
 IONotifier * IOService::doInstallNotification(
                        const OSSymbol * type, OSDictionary * matching,
-                       IOServiceNotificationHandler handler,
+                       IOServiceMatchingNotificationHandler handler,
                        void * target, void * ref,
                        SInt32 priority, OSIterator ** existing )
 {
@@ -3183,7 +3701,7 @@ IONotifier * IOService::doInstallNotification(
     
     if( inState)
         // get the current set
-        exist = (OSIterator *) getExistingServices( matching, inState );
+        exist = (OSIterator *) copyExistingServices( matching, inState );
     else
        exist = 0;
 
@@ -3192,14 +3710,35 @@ IONotifier * IOService::doInstallNotification(
     return( notify );
 }
 
+#if !defined(__LP64__)
+IONotifier * IOService::installNotification(const OSSymbol * type, OSDictionary * matching,
+                                       IOServiceNotificationHandler handler,
+                                       void * target, void * refCon,
+                                       SInt32 priority, OSIterator ** existing )
+{
+    IONotifier * result;
+    _IOServiceMatchingNotificationHandlerRef ref;
+    ref.handler = handler;
+    ref.ref     = refCon;
+
+    result = (_IOServiceNotifier *) installNotification( type, matching,
+                        &_IOServiceMatchingNotificationHandler, 
+                       target, &ref, priority, existing );
+    if (result)
+       matching->release();
+
+    return (result);
+}
+#endif /* !defined(__LP64__) */
+
 
 IONotifier * IOService::installNotification(
                        const OSSymbol * type, OSDictionary * matching,
-                       IOServiceNotificationHandler handler,
+                       IOServiceMatchingNotificationHandler handler,
                        void * target, void * ref,
                        SInt32 priority, OSIterator ** existing )
 {
-    IONotifier *       notify;
+    IONotifier * notify;
 
     LOCKWRITENOTIFY();
 
@@ -3214,10 +3753,31 @@ IONotifier * IOService::installNotification(
 IONotifier * IOService::addNotification(
                        const OSSymbol * type, OSDictionary * matching,
                        IOServiceNotificationHandler handler,
-                       void * target, void * ref = 0,
-                       SInt32 priority = 0 )
+                       void * target, void * refCon,
+                       SInt32 priority )
+{
+    IONotifier * result;
+    _IOServiceMatchingNotificationHandlerRef ref;
+    
+    ref.handler = handler;
+    ref.ref     = refCon;
+    
+    result = addMatchingNotification(type, matching, &_IOServiceMatchingNotificationHandler,
+                           target, &ref, priority);
+
+    if (result)
+       matching->release();
+
+    return (result);
+}
+
+IONotifier * IOService::addMatchingNotification(
+                       const OSSymbol * type, OSDictionary * matching,
+                       IOServiceMatchingNotificationHandler handler,
+                       void * target, void * ref,
+                       SInt32 priority )
 {
-    OSIterator *               existing;
+    OSIterator *               existing = NULL;
     _IOServiceNotifier *       notify;
     IOService *                        next;
 
@@ -3242,76 +3802,93 @@ IONotifier * IOService::addNotification(
     return( notify );
 }
 
-struct SyncNotifyVars {
-    semaphore_port_t   waitHere;
-    IOService *                result;
-};
-
 bool IOService::syncNotificationHandler(
                        void * /* target */, void * ref,
-                       IOService * newService )
+                       IOService * newService,
+                       IONotifier * notifier )
 {
 
-    // result may get written more than once before the
-    // notification is removed!
-    ((SyncNotifyVars *) ref)->result = newService;
-    semaphore_signal( ((SyncNotifyVars *) ref)->waitHere );
+    LOCKWRITENOTIFY();
+    if (!*((IOService **) ref))
+    {
+       newService->retain();
+       (*(IOService **) ref) = newService;
+       WAKEUPNOTIFY(ref);
+    }
+    UNLOCKNOTIFY();
 
     return( false );
 }
 
-IOService * IOService::waitForService( OSDictionary * matching,
-                               mach_timespec_t * timeout = 0 )
+IOService * IOService::waitForMatchingService( OSDictionary * matching,
+                                               uint64_t timeout)
 {
     IONotifier *       notify = 0;
     // priority doesn't help us much since we need a thread wakeup
     SInt32             priority = 0;
-    SyncNotifyVars     state;
-    kern_return_t      err = kIOReturnBadArgument;
+    IOService *        result;
 
-    if!matching)
+    if (!matching)
         return( 0 );
 
-    state.waitHere = 0;
-    state.result = 0;
+    result = NULL;
 
     LOCKWRITENOTIFY();
-
-    do {
-
-        state.result = (IOService *) getExistingServices( matching,
+    do
+    {
+        result = (IOService *) copyExistingServices( matching,
                             kIOServiceMatchedState, kIONotifyOnce );
-       if( state.result)
-           continue;
-
-        err = semaphore_create( kernel_task, &state.waitHere,
-                                    SYNC_POLICY_FIFO, 0 );
-        if( KERN_SUCCESS != err)
-            continue;
-
+       if (result)
+           break;
         notify = IOService::setNotification( gIOMatchedNotification, matching,
                     &IOService::syncNotificationHandler, (void *) 0,
-                    (void *) &state, priority );
-
-    } while( false );
-
-    UNLOCKNOTIFY();
-
-     if( notify) {
-        if( timeout)
-            err = semaphore_timedwait( state.waitHere, *timeout );
+                    &result, priority );
+        if (!notify)
+           break;
+        if (UINT64_MAX != timeout)
+       {
+           AbsoluteTime deadline;
+           nanoseconds_to_absolutetime(timeout, &deadline);
+           clock_absolutetime_interval_to_deadline(deadline, &deadline);
+           SLEEPNOTIFYTO(&result, deadline);
+       }
         else
-            err = semaphore_wait( state.waitHere );
+       {
+           SLEEPNOTIFY(&result);
+       }
     }
+    while( false );
+
+    UNLOCKNOTIFY();
 
-    ifnotify)
+    if (notify)
         notify->remove();      // dequeues
+
+    return( result );
+}
+
+IOService * IOService::waitForService( OSDictionary * matching,
+                                       mach_timespec_t * timeout )
+{
+    IOService * result;
+    uint64_t    timeoutNS;
+
+    if (timeout)
+    {
+       timeoutNS = timeout->tv_sec;
+       timeoutNS *= kSecondScale;
+       timeoutNS += timeout->tv_nsec;
+    }
     else
-        matching->release();
-    if( state.waitHere)
-        semaphore_destroy( kernel_task, state.waitHere );
+       timeoutNS = UINT64_MAX;
+
+    result = waitForMatchingService(matching, timeoutNS);
 
-    return( state.result );
+    matching->release();
+    if (result)
+       result->release();
+
+    return (result);
 }
 
 void IOService::deliverNotification( const OSSymbol * type,
@@ -3371,7 +3948,7 @@ IOOptionBits IOService::getState( void ) const
  */
 
 OSDictionary * IOService::serviceMatching( const OSString * name,
-                       OSDictionary * table = 0 )
+                       OSDictionary * table )
 {
     if( !table)
        table = OSDictionary::withCapacity( 2 );
@@ -3382,7 +3959,7 @@ OSDictionary * IOService::serviceMatching( const OSString * name,
 }
 
 OSDictionary * IOService::serviceMatching( const char * name,
-                       OSDictionary * table = 0 )
+                       OSDictionary * table )
 {
     const OSString *   str;
 
@@ -3396,7 +3973,7 @@ OSDictionary * IOService::serviceMatching( const char * name,
 }
 
 OSDictionary * IOService::nameMatching( const OSString * name,
-                       OSDictionary * table = 0 )
+                       OSDictionary * table )
 {
     if( !table)
        table = OSDictionary::withCapacity( 2 );
@@ -3407,7 +3984,7 @@ OSDictionary * IOService::nameMatching( const OSString * name,
 }
 
 OSDictionary * IOService::nameMatching( const char * name,
-                       OSDictionary * table = 0 )
+                       OSDictionary * table )
 {
     const OSString *   str;
 
@@ -3421,7 +3998,7 @@ OSDictionary * IOService::nameMatching( const char * name,
 }
 
 OSDictionary * IOService::resourceMatching( const OSString * str,
-                       OSDictionary * table = 0 )
+                       OSDictionary * table )
 {
     table = serviceMatching( gIOResourcesKey, table );
     if( table)
@@ -3431,7 +4008,7 @@ OSDictionary * IOService::resourceMatching( const OSString * str,
 }
 
 OSDictionary * IOService::resourceMatching( const char * name,
-                       OSDictionary * table = 0 )
+                       OSDictionary * table )
 {
     const OSSymbol *   str;
 
@@ -3445,6 +4022,47 @@ OSDictionary * IOService::resourceMatching( const char * name,
     return( table );
 }
 
+OSDictionary * IOService::propertyMatching( const OSSymbol * key, const OSObject * value,
+                       OSDictionary * table )
+{
+    OSDictionary * properties;
+
+    properties = OSDictionary::withCapacity( 2 );
+    if( !properties)
+       return( 0 );
+    properties->setObject( key, value );
+
+    if( !table)
+       table = OSDictionary::withCapacity( 2 );
+    if( table)
+        table->setObject( gIOPropertyMatchKey, properties );
+
+    properties->release();
+
+    return( table );
+}
+
+OSDictionary * IOService::registryEntryIDMatching( uint64_t entryID,
+                       OSDictionary * table )
+{
+    OSNumber *     num;
+
+    num = OSNumber::withNumber( entryID, 64 );
+    if( !num)
+       return( 0 );
+
+    if( !table)
+       table = OSDictionary::withCapacity( 2 );
+    if( table)
+        table->setObject( gIORegistryEntryIDKey, num );
+       
+    if (num)
+       num->release();
+
+    return( table );
+}
+
+
 /*
  * _IOServiceNotifier
  */
@@ -3468,10 +4086,7 @@ void _IOServiceNotifier::wait()
         }
         if( doWait) {
             state |= kIOServiceNotifyWaiter;
-            assert_wait( this, THREAD_UNINT);
-            UNLOCKNOTIFY();
-            thread_block((void (*)(void)) 0);
-            LOCKWRITENOTIFY();
+            SLEEPNOTIFY(this);
         }
 
     } while( doWait );
@@ -3548,10 +4163,38 @@ IOService * IOResources::resources( void )
     return( inst );
 }
 
+bool IOResources::init( OSDictionary * dictionary )
+{
+    // Do super init first
+    if ( !super::init() )
+        return false;
+
+    // Allow PAL layer to publish a value
+    const char *property_name;
+    int property_value;
+
+    pal_get_resource_property( &property_name, &property_value );
+
+    if( property_name ) {
+       OSNumber *num;
+       const OSSymbol *        sym;
+
+       if( (num = OSNumber::withNumber(property_value, 32)) != 0 ) {
+           if( (sym = OSSymbol::withCString( property_name)) != 0 ) {
+               this->setProperty( sym, num );
+               sym->release();
+           }
+           num->release();
+       }
+    }
+
+    return true;
+}
+
 IOWorkLoop * IOResources::getWorkLoop() const
 {
-    // If we are the resource root then bringe over to the
-    // platform to get its workloop
+    // If we are the resource root
+    // then use the platform's workloop
     if (this == (IOResources *) gIOResources)
        return getPlatform()->getWorkLoop();
     else
@@ -3585,6 +4228,139 @@ bool IOResources::matchPropertyTable( OSDictionary * table )
     return( ok );
 }
 
+void IOService::consoleLockTimer(thread_call_param_t p0, thread_call_param_t p1)
+{
+    IOService::updateConsoleUsers(NULL, 0);
+}
+
+void IOService::updateConsoleUsers(OSArray * consoleUsers, IOMessage systemMessage)
+{
+    IORegistryEntry * regEntry;
+    OSObject *        locked = kOSBooleanFalse;
+    uint32_t          idx;
+    bool              loggedIn;
+    bool              publish;
+    OSDictionary *    user;
+    static IOMessage  sSystemPower;
+
+    regEntry = IORegistryEntry::getRegistryRoot();
+
+    IOLockLock(gIOConsoleUsersLock);
+
+    if (systemMessage)
+    {
+        sSystemPower = systemMessage;
+    }
+    loggedIn = false;
+    if (consoleUsers)
+    {
+        OSNumber * num = 0;
+       for (idx = 0; 
+             (user = OSDynamicCast(OSDictionary, consoleUsers->getObject(idx))); 
+             idx++)
+       {
+           loggedIn |= ((kOSBooleanTrue == user->getObject(gIOConsoleSessionOnConsoleKey))
+                       && (kOSBooleanTrue == user->getObject(gIOConsoleSessionLoginDoneKey)));
+           if (!num)
+           {
+               num = OSDynamicCast(OSNumber, user->getObject(gIOConsoleSessionScreenLockedTimeKey));
+           }
+       }
+        gIOConsoleLockTime = num ? num->unsigned32BitValue() : 0;
+    }
+
+    if (!loggedIn 
+     || (kIOMessageSystemWillSleep == sSystemPower)
+     || (kIOMessageSystemPagingOff == sSystemPower))
+    {
+       locked = kOSBooleanTrue;
+    }
+    else if (gIOConsoleLockTime)
+    {
+       clock_sec_t  now;
+       clock_usec_t microsecs;
+
+       clock_get_calendar_microtime(&now, &microsecs);
+       if (gIOConsoleLockTime > now)
+       {
+           AbsoluteTime deadline;
+           clock_interval_to_deadline(gIOConsoleLockTime - now, kSecondScale, &deadline);
+           thread_call_enter_delayed(gIOConsoleLockCallout, deadline);
+       }
+       else
+       {
+           locked = kOSBooleanTrue;
+       }
+    }
+
+    publish = (consoleUsers || (locked != regEntry->getProperty(gIOConsoleLockedKey)));
+    if (publish)
+    {
+       regEntry->setProperty(gIOConsoleLockedKey, locked);
+       if (consoleUsers)
+       {
+           regEntry->setProperty(gIOConsoleUsersKey, consoleUsers);
+       }
+       OSIncrementAtomic( &gIOConsoleUsersSeed );
+    }
+
+    IOLockUnlock(gIOConsoleUsersLock);
+
+    if (publish)
+    {
+       publishResource( gIOConsoleUsersSeedKey, gIOConsoleUsersSeedValue );
+
+       MessageClientsContext context;
+    
+       context.service  = getServiceRoot();
+       context.type     = kIOMessageConsoleSecurityChange;
+       context.argument = (void *) regEntry;
+       context.argSize  = 0;
+    
+       applyToInterestNotifiers(getServiceRoot(), gIOConsoleSecurityInterest, 
+                                &messageClientsApplier, &context );
+    }
+}
+
+IOReturn IOResources::setProperties( OSObject * properties )
+{
+    IOReturn                   err;
+    const OSSymbol *           key;
+    OSDictionary *             dict;
+    OSCollectionIterator *     iter;
+
+    err = IOUserClient::clientHasPrivilege(current_task(), kIOClientPrivilegeAdministrator);
+    if ( kIOReturnSuccess != err)
+       return( err );
+
+    dict = OSDynamicCast(OSDictionary, properties);
+    if( 0 == dict)
+       return( kIOReturnBadArgument);
+
+    iter = OSCollectionIterator::withCollection( dict);
+    if( 0 == iter)
+       return( kIOReturnBadArgument);
+
+    while( (key = OSDynamicCast(OSSymbol, iter->getNextObject())))
+    {
+       if (gIOConsoleUsersKey == key) do
+       {
+           OSArray * consoleUsers;
+           consoleUsers = OSDynamicCast(OSArray, dict->getObject(key));
+           if (!consoleUsers)
+               continue;
+           IOService::updateConsoleUsers(consoleUsers, 0);
+       }
+       while (false);
+
+       publishResource( key, dict->getObject(key) );
+    }
+
+    iter->release();
+
+    return( kIOReturnSuccess );
+}
+
 /*
  * Helpers for matching dictionaries.
  * Keys existing in matching are checked in properties.
@@ -3690,6 +4466,7 @@ bool IOService::passiveMatch( OSDictionary * table, bool changesOK )
     SInt32             score;
     OSNumber *         newPri;
     bool               match = true;
+    bool               matchParent = false;
     UInt32             done;
 
     assert( table );
@@ -3697,140 +4474,186 @@ bool IOService::passiveMatch( OSDictionary * table, bool changesOK )
     where = this;
 
     do {
-        done = 0;
+        do {
+            done = 0;
 
-        str = OSDynamicCast( OSString, table->getObject( gIOProviderClassKey));
-        if( str) {
-            done++;
-            match = (0 != where->metaCast( str ));
-            if( !match)
-                break;
-        }
+            str = OSDynamicCast( OSString, table->getObject( gIOProviderClassKey));
+            if( str) {
+                done++;
+                match = (0 != where->metaCast( str ));
+                if( !match)
+                    break;
+            }
 
-        obj = table->getObject( gIONameMatchKey );
-        if( obj) {
-            done++;
-            match = compareNames( obj, changesOK ? &matched : 0 );
-            if( !match)
-                break;
-            if( changesOK && matched) {
-                // leave a hint as to which name matched
-                table->setObject( gIONameMatchedKey, matched );
-                matched->release();
+            obj = table->getObject( gIONameMatchKey );
+            if( obj) {
+                done++;
+                match = where->compareNames( obj, changesOK ? &matched : 0 );
+                if( !match)
+                    break;
+                if( changesOK && matched) {
+                    // leave a hint as to which name matched
+                    table->setObject( gIONameMatchedKey, matched );
+                    matched->release();
+                }
             }
-        }
-        obj = table->getObject( gIOPropertyMatchKey );
-        if( obj) {
-
-            OSDictionary * dict;
-            OSDictionary * nextDict;
-            OSIterator *   iter;
-
-            done++;
-            dict = where->dictionaryWithProperties();
-            if( dict) {
-                nextDict = OSDynamicCast( OSDictionary, obj);
-                if( nextDict)
-                    iter = 0;
-                else
-                    iter = OSCollectionIterator::withCollection(
-                                OSDynamicCast(OSCollection, obj));
-
-                while( nextDict
-                    || (iter && (0 != (nextDict = OSDynamicCast(OSDictionary,
-                                            iter->getNextObject()))))) {
-                    match = dict->isEqualTo( nextDict, nextDict);
-                    if( match)
-                        break;
-                    nextDict = 0;
+
+            str = OSDynamicCast( OSString, table->getObject( gIOLocationMatchKey ));
+            if( str) {
+
+                const OSSymbol * sym;
+
+                done++;
+                match = false;
+                sym = where->copyLocation();
+                if( sym) {
+                    match = sym->isEqualTo( str );
+                    sym->release();
                 }
-                dict->release();
-                if( iter)
-                    iter->release();
                 if( !match)
                     break;
             }
-       }
 
-        str = OSDynamicCast( OSString, table->getObject( gIOPathMatchKey ));
-        if( str) {
-            done++;
-            entry = IORegistryEntry::fromPath( str->getCStringNoCopy() );
-           match = (where == entry);
-           if( entry)
-                entry->release();
-           if( !match)
-                break;
-       }
+            obj = table->getObject( gIOPropertyMatchKey );
+            if( obj) {
+
+                OSDictionary * dict;
+                OSDictionary * nextDict;
+                OSIterator *   iter;
+
+                done++;
+                match = false;
+                dict = where->dictionaryWithProperties();
+                if( dict) {
+                    nextDict = OSDynamicCast( OSDictionary, obj);
+                    if( nextDict)
+                        iter = 0;
+                    else
+                        iter = OSCollectionIterator::withCollection(
+                                    OSDynamicCast(OSCollection, obj));
+
+                    while( nextDict
+                        || (iter && (0 != (nextDict = OSDynamicCast(OSDictionary,
+                                                iter->getNextObject()))))) {
+                        match = dict->isEqualTo( nextDict, nextDict);
+                        if( match)
+                            break;
+                        nextDict = 0;
+                    }
+                    dict->release();
+                    if( iter)
+                        iter->release();
+                }
+                if( !match)
+                    break;
+            }
+
+            str = OSDynamicCast( OSString, table->getObject( gIOPathMatchKey ));
+            if( str) {
+                done++;
+                entry = IORegistryEntry::fromPath( str->getCStringNoCopy() );
+                match = (where == entry);
+                if( entry)
+                    entry->release();
+                if( !match)
+                    break;
+            }
+
+            num = OSDynamicCast( OSNumber, table->getObject( gIORegistryEntryIDKey ));
+            if( num) {
+               done++;
+                match = (getRegistryEntryID() == num->unsigned64BitValue());
+           }
 
-        num = OSDynamicCast( OSNumber, table->getObject( gIOMatchedServiceCountKey ));
-        if( num) {
+            num = OSDynamicCast( OSNumber, table->getObject( gIOMatchedServiceCountKey ));
+            if( num) {
 
-            OSIterator *       iter;
-            IOService *                service = 0;
-            UInt32             serviceCount = 0;
+                OSIterator *   iter;
+                IOService *            service = 0;
+                UInt32         serviceCount = 0;
 
-            done++;
-            iter = getClientIterator();
-            if( iter) {
-                while( (service = (IOService *) iter->getNextObject())) {
-                    if( kIOServiceInactiveState & service->__state[0])
-                        continue;
-                    if( 0 == service->getProperty( gIOMatchCategoryKey ))
-                        continue;
-                    ++serviceCount;
+                done++;
+                iter = where->getClientIterator();
+                if( iter) {
+                    while( (service = (IOService *) iter->getNextObject())) {
+                        if( kIOServiceInactiveState & service->__state[0])
+                            continue;
+                        if( 0 == service->getProperty( gIOMatchCategoryKey ))
+                            continue;
+                        ++serviceCount;
+                    }
+                    iter->release();
                 }
-                iter->release();
+                match = (serviceCount == num->unsigned32BitValue());
+                if( !match)
+                    break;
             }
-           match = (serviceCount == num->unsigned32BitValue());
-           if( !match)
-                break;
-       }
 
-       if( done == table->getCount())
-           // don't call family if we've done all the entries in the table
-           break;
+            if( done == table->getCount()) {
+                // don't call family if we've done all the entries in the table
+                matchParent = false;
+                break;
+            }
 
-        // pass in score from property table
-        score = IOServiceObjectOrder( table, (void *) gIOProbeScoreKey);
+            // pass in score from property table
+            score = IOServiceObjectOrder( table, (void *) gIOProbeScoreKey);
 
-       // do family specific matching
-       match = where->matchPropertyTable( table, &score );
+            // do family specific matching
+            match = where->matchPropertyTable( table, &score );
 
-       if( !match) {
+            if( !match) {
 #if IOMATCHDEBUG
-           if( kIOLogMatch & getDebugFlags( table ))
-               LOG("%s: family specific matching fails\n", where->getName());
+                if( kIOLogMatch & getDebugFlags( table ))
+                    LOG("%s: family specific matching fails\n", where->getName());
 #endif
-           break;
-       }
+                break;
+            }
 
-        if( changesOK) {
-            // save the score
-            newPri = OSNumber::withNumber( score, 32 );
-            if( newPri) {
-                table->setObject( gIOProbeScoreKey, newPri );
-                newPri->release();
+            if( changesOK) {
+                // save the score
+                newPri = OSNumber::withNumber( score, 32 );
+                if( newPri) {
+                    table->setObject( gIOProbeScoreKey, newPri );
+                    newPri->release();
+                }
             }
-        }
 
-        if( !(match = where->compareProperty( table, kIOBSDNameKey )))
-           break;
+            if( !(match = where->compareProperty( table, kIOBSDNameKey )))
+                break;
+            if( !(match = where->compareProperty( table, kIOBSDMajorKey )))
+                break;
+            if( !(match = where->compareProperty( table, kIOBSDMinorKey )))
+                break;
+            if( !(match = where->compareProperty( table, kIOBSDUnitKey )))
+                break;
 
-       table = OSDynamicCast( OSDictionary,
-               table->getObject( gIOLocationMatchKey ));
-       if( table) {
-           match = false;
-           where = where->getProvider();
-           if( where)
-               where = where->matchLocation( where );
-       }
+            matchParent = false;
+
+            obj = OSDynamicCast( OSDictionary,
+                  table->getObject( gIOParentMatchKey ));
+            if( obj) {
+                match = false;
+                matchParent = true;
+                table = (OSDictionary *) obj;
+                break;
+            }
+
+            table = OSDynamicCast( OSDictionary,
+                    table->getObject( gIOLocationMatchKey ));
+            if( table) {
+                match = false;
+                where = where->getProvider();
+                if( where)
+                    where = where->matchLocation( where );
+            }
 
-    } while( table && where );
+        } while( table && where );
+
+    } while( matchParent && (where = where->getProvider()) );
 
     if( kIOLogMatch & gIOKitDebug)
-        if( where != this)
-            LOG("match location @ %s = %d\n",
+        if( where && (where != this) )
+            LOG("match parent @ %s = %d\n",
                         where->getName(), match );
 
     return( match );
@@ -3845,6 +4668,9 @@ IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
     IOUserClient *client;
     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) {
@@ -3862,6 +4688,7 @@ IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
     if (!userClientClass)
         return kIOReturnUnsupported;
 
+    // This reference is consumed by the IOServiceOpen call
     temp = OSMetaClass::allocClassWithName(userClientClass);
     if (!temp)
         return kIOReturnNoMemory;
@@ -3896,7 +4723,7 @@ IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
 IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
                                     UInt32 type, IOUserClient ** handler )
 {
-    return( newUserClient( owningTask, securityID, type, 0, handler ));
+    return( kIOReturnUnsupported );
 }
 
 IOReturn IOService::requestProbe( IOOptionBits options )
@@ -3995,7 +4822,7 @@ int IOService::errnoFromReturn( IOReturn rtn )
         case kIOReturnBadArgument:
             return(EINVAL);
         case kIOReturnUnsupported:
-            return(EOPNOTSUPP);
+            return(ENOTSUP);
         case kIOReturnBusy:
             return(EBUSY);
         case kIOReturnNoPower:
@@ -4026,7 +4853,6 @@ int IOService::errnoFromReturn( IOReturn rtn )
         case kIOReturnExclusiveAccess:
         case kIOReturnLockedRead:
         case kIOReturnLockedWrite:
-        case kIOReturnNotAttached:
         case kIOReturnNotOpen:
         case kIOReturnNotReadable:
             return(EACCES);
@@ -4039,8 +4865,9 @@ int IOService::errnoFromReturn( IOReturn rtn )
             return(EBUSY);
         case kIOReturnBadMedia:
         case kIOReturnNoMedia:
+        case kIOReturnNotAttached:
         case kIOReturnUnformattedMedia:
-            return(EIO); // (media error)
+            return(ENXIO); // (media error)
         case kIOReturnDMAError:
         case kIOReturnOverrun:
         case kIOReturnUnderrun:
@@ -4106,7 +4933,7 @@ IODeviceMemory * IOService::getDeviceMemoryWithIndex( unsigned int index )
 }
 
 IOMemoryMap * IOService::mapDeviceMemoryWithIndex( unsigned int index,
-                                               IOOptionBits options = 0 )
+                                               IOOptionBits options )
 {
     IODeviceMemory *   range;
     IOMemoryMap *      map;
@@ -4131,6 +4958,200 @@ void IOService::setDeviceMemory( OSArray * array )
     setProperty( gIODeviceMemoryKey, array);
 }
 
+/*
+ * For machines where the transfers on an I/O bus can stall because
+ * the CPU is in an idle mode, These APIs allow a driver to specify
+ * the maximum bus stall that they can handle.  0 indicates no limit.
+ */
+void IOService::
+setCPUSnoopDelay(UInt32 __unused ns)
+{
+#if defined(__i386__) || defined(__x86_64__)
+    ml_set_maxsnoop(ns); 
+#endif /* defined(__i386__) || defined(__x86_64__) */
+}
+
+UInt32 IOService::
+getCPUSnoopDelay()
+{
+#if defined(__i386__) || defined(__x86_64__)
+    return ml_get_maxsnoop(); 
+#else
+    return 0;
+#endif /* defined(__i386__) || defined(__x86_64__) */
+}
+
+#if defined(__i386__) || defined(__x86_64__)
+static void
+requireMaxCpuDelay(IOService * service, UInt32 ns, UInt32 delayType)
+{
+    static const UInt kNoReplace = -1U;        // Must be an illegal index
+    UInt replace = kNoReplace;
+    bool setCpuDelay = false;
+
+    IORecursiveLockLock(sCpuDelayLock);
+
+    UInt count = sCpuDelayData->getLength() / sizeof(CpuDelayEntry);
+    CpuDelayEntry *entries = (CpuDelayEntry *) sCpuDelayData->getBytesNoCopy();
+    IOService * holder = NULL;
+
+    if (ns) {
+        const CpuDelayEntry ne = {service, ns, delayType};
+       holder = service;
+        // Set maximum delay.
+        for (UInt i = 0; i < count; i++) {
+            IOService *thisService = entries[i].fService;
+            bool sameType = (delayType == entries[i].fDelayType);            
+            if ((service == thisService) && sameType)
+                replace = i;
+            else if (!thisService) {
+                if (kNoReplace == replace)
+                    replace = i;
+            }
+            else if (sameType) {
+                const UInt32 thisMax = entries[i].fMaxDelay;
+                if (thisMax < ns)
+               {
+                    ns = thisMax;
+                   holder = thisService;
+               }
+            }
+        }
+        
+        setCpuDelay = true;
+        if (kNoReplace == replace)
+            sCpuDelayData->appendBytes(&ne, sizeof(ne));
+        else
+            entries[replace] = ne;
+    }
+    else {
+        ns = -1U;      // Set to max unsigned, i.e. no restriction
+
+        for (UInt i = 0; i < count; i++) {
+            // Clear a maximum delay.
+            IOService *thisService = entries[i].fService;
+            if (thisService && (delayType == entries[i].fDelayType)) {
+                UInt32 thisMax = entries[i].fMaxDelay;
+                if (service == thisService)
+                    replace = i;
+                else if (thisMax < ns) {
+                    ns = thisMax;
+                   holder = thisService;
+               }
+            }
+        }
+
+        // Check if entry found
+        if (kNoReplace != replace) {
+            entries[replace].fService = 0;     // Null the entry
+            setCpuDelay = true;
+        }
+    }
+
+    if (setCpuDelay)
+    {
+        // Must be safe to call from locked context
+        if (delayType == kCpuDelayBusStall)
+        {
+            ml_set_maxbusdelay(ns);
+        }
+        else if (delayType == kCpuDelayInterrupt)
+        {
+            ml_set_maxintdelay(ns);
+        }
+
+       OSArray * handlers = sCpuLatencyHandlers[delayType];
+       IOService * target;
+       if (handlers) for (unsigned int idx = 0; 
+                           (target = (IOService *) handlers->getObject(idx));
+                           idx++)
+       {
+           target->callPlatformFunction(sCPULatencyFunctionName[delayType], false,
+                                           (void *) (uintptr_t) ns, holder,
+                                           NULL, NULL);
+       }
+    }
+
+    IORecursiveLockUnlock(sCpuDelayLock);
+}
+
+static IOReturn
+setLatencyHandler(UInt32 delayType, IOService * target, bool enable)
+{
+    IOReturn result = kIOReturnNotFound;
+    OSArray * array;
+    unsigned int idx;
+
+    IORecursiveLockLock(sCpuDelayLock);
+
+    do
+    {
+       if (enable && !sCpuLatencyHandlers[delayType])
+           sCpuLatencyHandlers[delayType] = OSArray::withCapacity(4);
+       array = sCpuLatencyHandlers[delayType];
+       if (!array)
+           break;
+       idx = array->getNextIndexOfObject(target, 0);
+       if (!enable)
+       {
+           if (-1U != idx)
+           {
+               array->removeObject(idx);
+               result = kIOReturnSuccess;
+           }
+       }
+       else
+       {
+           if (-1U != idx) {
+               result = kIOReturnExclusiveAccess;
+               break;
+           }
+           array->setObject(target);
+           
+           UInt count = sCpuDelayData->getLength() / sizeof(CpuDelayEntry);
+           CpuDelayEntry *entries = (CpuDelayEntry *) sCpuDelayData->getBytesNoCopy();
+           UInt32 ns = -1U;    // Set to max unsigned, i.e. no restriction
+           IOService * holder = NULL;
+
+           for (UInt i = 0; i < count; i++) {
+               if (entries[i].fService 
+                 && (delayType == entries[i].fDelayType) 
+                 && (entries[i].fMaxDelay < ns)) {
+                   ns = entries[i].fMaxDelay;
+                   holder = entries[i].fService;
+               }
+           }
+           target->callPlatformFunction(sCPULatencyFunctionName[delayType], false,
+                                           (void *) (uintptr_t) ns, holder,
+                                           NULL, NULL);
+           result = kIOReturnSuccess;
+       }
+    }
+    while (false);
+
+    IORecursiveLockUnlock(sCpuDelayLock);
+
+    return (result);
+}
+
+#endif /* defined(__i386__) || defined(__x86_64__) */
+
+void IOService::
+requireMaxBusStall(UInt32 __unused ns)
+{
+#if defined(__i386__) || defined(__x86_64__)
+    requireMaxCpuDelay(this, ns, kCpuDelayBusStall);
+#endif
+}
+
+void IOService::
+requireMaxInterruptDelay(uint32_t __unused ns)
+{
+#if defined(__i386__) || defined(__x86_64__)
+    requireMaxCpuDelay(this, ns, kCpuDelayInterrupt);
+#endif
+}
+
 /*
  * Device interrupts
  */
@@ -4287,13 +5308,21 @@ IOReturn IOService::causeInterrupt(int source)
   return interruptController->causeInterrupt(this, source);
 }
 
-OSMetaClassDefineReservedUsed(IOService, 0);
-OSMetaClassDefineReservedUsed(IOService, 1);
-OSMetaClassDefineReservedUsed(IOService, 2);
-
+#if __LP64__
+OSMetaClassDefineReservedUnused(IOService, 0);
+OSMetaClassDefineReservedUnused(IOService, 1);
+OSMetaClassDefineReservedUnused(IOService, 2);
 OSMetaClassDefineReservedUnused(IOService, 3);
 OSMetaClassDefineReservedUnused(IOService, 4);
 OSMetaClassDefineReservedUnused(IOService, 5);
+#else
+OSMetaClassDefineReservedUsed(IOService, 0);
+OSMetaClassDefineReservedUsed(IOService, 1);
+OSMetaClassDefineReservedUsed(IOService, 2);
+OSMetaClassDefineReservedUsed(IOService, 3);
+OSMetaClassDefineReservedUsed(IOService, 4);
+OSMetaClassDefineReservedUsed(IOService, 5);
+#endif
 OSMetaClassDefineReservedUnused(IOService, 6);
 OSMetaClassDefineReservedUnused(IOService, 7);
 OSMetaClassDefineReservedUnused(IOService, 8);
@@ -4336,19 +5365,3 @@ OSMetaClassDefineReservedUnused(IOService, 44);
 OSMetaClassDefineReservedUnused(IOService, 45);
 OSMetaClassDefineReservedUnused(IOService, 46);
 OSMetaClassDefineReservedUnused(IOService, 47);
-OSMetaClassDefineReservedUnused(IOService, 48);
-OSMetaClassDefineReservedUnused(IOService, 49);
-OSMetaClassDefineReservedUnused(IOService, 50);
-OSMetaClassDefineReservedUnused(IOService, 51);
-OSMetaClassDefineReservedUnused(IOService, 52);
-OSMetaClassDefineReservedUnused(IOService, 53);
-OSMetaClassDefineReservedUnused(IOService, 54);
-OSMetaClassDefineReservedUnused(IOService, 55);
-OSMetaClassDefineReservedUnused(IOService, 56);
-OSMetaClassDefineReservedUnused(IOService, 57);
-OSMetaClassDefineReservedUnused(IOService, 58);
-OSMetaClassDefineReservedUnused(IOService, 59);
-OSMetaClassDefineReservedUnused(IOService, 60);
-OSMetaClassDefineReservedUnused(IOService, 61);
-OSMetaClassDefineReservedUnused(IOService, 62);
-OSMetaClassDefineReservedUnused(IOService, 63);