X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6d2010ae8f7a6078e10b361c6962983bab233e0f..4b17d6b6e417f714551ec129064745ea9919780e:/iokit/Kernel/IOPlatformExpert.cpp

diff --git a/iokit/Kernel/IOPlatformExpert.cpp b/iokit/Kernel/IOPlatformExpert.cpp
index 7800babda..29c286ea6 100644
--- a/iokit/Kernel/IOPlatformExpert.cpp
+++ b/iokit/Kernel/IOPlatformExpert.cpp
@@ -105,7 +105,9 @@ bool IOPlatformExpert::start( IOService * provider )
     // Override the mapper present flag is requested by boot arguments.
     if (PE_parse_boot_argn("dart", &debugFlags, sizeof (debugFlags)) && (debugFlags == 0))
       removeProperty(kIOPlatformMapperPresentKey);
-    
+    if (PE_parse_boot_argn("-x", &debugFlags, sizeof (debugFlags)))
+      removeProperty(kIOPlatformMapperPresentKey);
+
     // Register the presence or lack thereof a system 
     // PCI address mapper with the IOMapper class
     IOMapper::setMapperRequired(0 != getProperty(kIOPlatformMapperPresentKey));
@@ -371,48 +373,14 @@ void IOPlatformExpert::
 PMLog(const char *who, unsigned long event,
       unsigned long param1, unsigned long param2)
 {
-    UInt32 debugFlags = gIOKitDebug;
-    UInt32 traceFlags = gIOKitTrace;
-    uintptr_t   name = 0;
-    UInt32 i = 0;
-
-    if (debugFlags & kIOLogPower) {
-
 	clock_sec_t nows;
 	clock_usec_t nowus;
 	clock_get_system_microtime(&nows, &nowus);
 	nowus += (nows % 1000) * 1000000;
 
-        kprintf("pm%u %p %.30s %d %lx %lx\n",
+    kprintf("pm%u %p %.30s %d %lx %lx\n",
 		nowus, current_thread(), who,	// Identity
 		(int) event, (long) param1, (long) param2);			// Args
-
-	if (traceFlags & kIOTracePowerMgmt) {
-	    static const UInt32 sStartStopBitField[] = 
-		{ 0x00000000, 0x00000040 }; // Only Program Hardware so far
-
-	    // Arcane formula from Hacker's Delight by Warren
-	    // abs(x)  = ((int) x >> 31) ^ (x + ((int) x >> 31))
-	    UInt32 sgnevent = ((long) event >> 31);
-	    UInt32 absevent = sgnevent ^ (event + sgnevent);
-	    UInt32 code = IODBG_POWER(absevent);
-
-	    UInt32 bit = 1 << (absevent & 0x1f);
-	    if (absevent < sizeof(sStartStopBitField) * 8
-	    && (sStartStopBitField[absevent >> 5] & bit) ) {
-		// Or in the START or END bits, Start = 1 & END = 2
-		//      If sgnevent ==  0 then START -  0 => START
-		// else if sgnevent == -1 then START - -1 => END
-		code |= DBG_FUNC_START - sgnevent;
-	    }
-
-        // Get first 8 characters of the name
-        while ( i < sizeof(uintptr_t) && who[i] != 0) 
-        {    ((char *)&name)[sizeof(uintptr_t)-i-1]=who[i]; i++; }
-	    // Record the timestamp. 
-	    IOTimeStampConstant(code, name, event, param1, param2);
-	}
-    }
 }
 
 
@@ -747,10 +715,16 @@ static void IOShutdownNotificationsTimedOut(
     thread_call_param_t p0, 
     thread_call_param_t p1)
 {
+#ifdef CONFIG_EMBEDDED
+    /* 30 seconds has elapsed - panic */
+    panic("Halt/Restart Timed Out");
+
+#else /* ! CONFIG_EMBEDDED */
     int type = (int)(long)p0;
 
     /* 30 seconds has elapsed - resume shutdown */
     if(gIOPlatform) gIOPlatform->haltRestart(type);
+#endif /* CONFIG_EMBEDDED */
 }
 
 
@@ -960,6 +934,41 @@ void IOPlatformExpert::registerNVRAMController(IONVRAMController * caller)
     OSString *        string = 0;
     uuid_string_t     uuid;
 
+#if CONFIG_EMBEDDED
+    entry = IORegistryEntry::fromPath( "/chosen", gIODTPlane );
+    if ( entry )
+    {
+        OSData * data1;
+
+        data1 = OSDynamicCast( OSData, entry->getProperty( "unique-chip-id" ) );
+        if ( data1 && data1->getLength( ) == 8 )
+        {
+            OSData * data2;
+
+            data2 = OSDynamicCast( OSData, entry->getProperty( "chip-id" ) );
+            if ( data2 && data2->getLength( ) == 4 )
+            {
+                SHA1_CTX     context;
+                uint8_t      digest[ SHA_DIGEST_LENGTH ];
+                const uuid_t space = { 0xA6, 0xDD, 0x4C, 0xCB, 0xB5, 0xE8, 0x4A, 0xF5, 0xAC, 0xDD, 0xB6, 0xDC, 0x6A, 0x05, 0x42, 0xB8 };
+
+                SHA1Init( &context );
+                SHA1Update( &context, space, sizeof( space ) );
+                SHA1Update( &context, data1->getBytesNoCopy( ), data1->getLength( ) );
+                SHA1Update( &context, data2->getBytesNoCopy( ), data2->getLength( ) );
+                SHA1Final( digest, &context );
+
+                digest[ 6 ] = ( digest[ 6 ] & 0x0F ) | 0x50;
+                digest[ 8 ] = ( digest[ 8 ] & 0x3F ) | 0x80;
+
+                uuid_unparse( digest, uuid );
+                string = OSString::withCString( uuid );
+            }
+        }
+
+        entry->release( );
+    }
+#else /* !CONFIG_EMBEDDED */
     entry = IORegistryEntry::fromPath( "/efi/platform", gIODTPlane );
     if ( entry )
     {
@@ -984,6 +993,7 @@ void IOPlatformExpert::registerNVRAMController(IONVRAMController * caller)
 
         entry->release( );
     }
+#endif /* !CONFIG_EMBEDDED */
 
     if ( string == 0 )
     {