xnu-792.10.96.tar.gz

[apple/xnu.git] / iokit / Kernel / IOCPU.cpp

diff --git a/iokit/Kernel/IOCPU.cpp b/iokit/Kernel/IOCPU.cpp
index 5b171c0d2a99ab3cdaca1fa991a399ef5723ddce..c86d5a2314cec614f879a632bb401b8dfa48471f 100644 (file)
--- a/iokit/Kernel/IOCPU.cpp
+++ b/iokit/Kernel/IOCPU.cpp
@@ -142,7 +142,7 @@ void IOCPU::initCPUs(void)
 
 bool IOCPU::start(IOService *provider)
 {
-  OSData *busFrequency, *cpuFrequency, *decFrequency;
+  OSData *busFrequency, *cpuFrequency, *timebaseFrequency;
   
   if (!super::start(provider)) return false;
   
@@ -153,18 +153,28 @@ bool IOCPU::start(IOService *provider)
   
   gIOCPUs->setObject(this);
   
-  // Correct the bus, cpu and dec frequencies in the device tree.
-  busFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.bus_clock_rate_hz, 4);
-  cpuFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.cpu_clock_rate_hz, 4);
-  decFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.dec_clock_rate_hz, 4);
+  // Correct the bus, cpu and timebase frequencies in the device tree.
+  if (gPEClockFrequencyInfo.bus_frequency_hz < 0x100000000ULL) {
+    busFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.bus_clock_rate_hz, 4);
+  } else {
+    busFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.bus_frequency_hz, 8);
+  }
   provider->setProperty("bus-frequency", busFrequency);
-  provider->setProperty("clock-frequency", cpuFrequency);
-  provider->setProperty("timebase-frequency", decFrequency);
   busFrequency->release();
+    
+  if (gPEClockFrequencyInfo.cpu_frequency_hz < 0x100000000ULL) {
+    cpuFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.cpu_clock_rate_hz, 4);
+  } else {
+    cpuFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.cpu_frequency_hz, 8);
+  }
+  provider->setProperty("clock-frequency", cpuFrequency);
   cpuFrequency->release();
-  decFrequency->release();
   
-  setProperty("IOCPUID", (UInt32)this, 32);
+  timebaseFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.timebase_frequency_hz, 4);
+  provider->setProperty("timebase-frequency", timebaseFrequency);
+  timebaseFrequency->release();
+  
+  super::setProperty("IOCPUID", (UInt32)this, 32);
   
   setCPUNumber(0);
   setCPUState(kIOCPUStateUnregistered);
@@ -172,35 +182,69 @@ bool IOCPU::start(IOService *provider)
   return true;
 }
 
-IOReturn IOCPU::setProperties(OSObject *properties)
+OSObject *IOCPU::getProperty(const OSSymbol *aKey) const
 {
-  OSDictionary *dict = OSDynamicCast(OSDictionary, properties);
-  OSString     *stateStr;
+  if (aKey == gIOCPUStateKey) return gIOCPUStateNames[_cpuState];
   
-  if (dict == 0) return kIOReturnUnsupported;
+  return super::getProperty(aKey);
+}
+
+bool IOCPU::setProperty(const OSSymbol *aKey, OSObject *anObject)
+{
+  OSString *stateStr;
   
-  stateStr = OSDynamicCast(OSString, dict->getObject(gIOCPUStateKey));
-  if (stateStr != 0) {
-    if (!IOUserClient::clientHasPrivilege(current_task(), "root"))
-      return kIOReturnNotPrivileged;
+  if (aKey == gIOCPUStateKey) {
+    stateStr = OSDynamicCast(OSString, anObject);
+    if (stateStr == 0) return false;
     
-    if (_cpuNumber == 0) return kIOReturnUnsupported;
+    if (_cpuNumber == 0) return false;
     
     if (stateStr->isEqualTo("running")) {
       if (_cpuState == kIOCPUStateStopped) {
        processor_start(machProcessor);
       } else if (_cpuState != kIOCPUStateRunning) {
-       return kIOReturnUnsupported;
+       return false;
       }
     } else if (stateStr->isEqualTo("stopped")) {
       if (_cpuState == kIOCPUStateRunning) {
         haltCPU();
       } else if (_cpuState != kIOCPUStateStopped) {
-        return kIOReturnUnsupported;
+        return false;
       }
-    } else return kIOReturnUnsupported;
+    } else return false;
     
-    return kIOReturnSuccess;
+    return true;
+  }
+  
+  return super::setProperty(aKey, anObject);
+}
+
+bool IOCPU::serializeProperties(OSSerialize *serialize) const
+{
+       bool result;
+       OSDictionary *dict = dictionaryWithProperties();
+       dict->setObject(gIOCPUStateKey, gIOCPUStateNames[_cpuState]);
+       result = dict->serialize(serialize);
+       dict->release();  
+       return result;
+}
+
+IOReturn IOCPU::setProperties(OSObject *properties)
+{
+  OSDictionary *dict = OSDynamicCast(OSDictionary, properties);
+  OSString     *stateStr;
+  IOReturn     result;
+  
+  if (dict == 0) return kIOReturnUnsupported;
+  
+  stateStr = OSDynamicCast(OSString, dict->getObject(gIOCPUStateKey));
+  if (stateStr != 0) {
+    result = IOUserClient::clientHasPrivilege(current_task(), kIOClientPrivilegeAdministrator);
+    if (result != kIOReturnSuccess) return result;
+    
+    if (setProperty(gIOCPUStateKey, stateStr)) return kIOReturnSuccess;
+    
+    return kIOReturnUnsupported;
   }
   
   return kIOReturnUnsupported;
@@ -222,7 +266,7 @@ UInt32 IOCPU::getCPUNumber(void)
 void IOCPU::setCPUNumber(UInt32 cpuNumber)
 {
   _cpuNumber = cpuNumber;
-  setProperty("IOCPUNumber", _cpuNumber, 32);
+  super::setProperty("IOCPUNumber", _cpuNumber, 32);
 }
 
 UInt32 IOCPU::getCPUState(void)
@@ -232,9 +276,8 @@ UInt32 IOCPU::getCPUState(void)
 
 void IOCPU::setCPUState(UInt32 cpuState)
 {
-  if ((cpuState >= 0) && (cpuState < kIOCPUStateCount)) {
+  if (cpuState < kIOCPUStateCount) {
     _cpuState = cpuState;
-    setProperty(gIOCPUStateKey, gIOCPUStateNames[cpuState]);
   }
 }
 
@@ -301,6 +344,8 @@ IOReturn IOCPUInterruptController::initCPUInterruptController(int sources)
     }
   }
   
+  ml_init_max_cpus(numCPUs);
+  
   return kIOReturnSuccess;
 }
 
@@ -344,8 +389,10 @@ void IOCPUInterruptController::setCPUInterruptProperties(IOService *service)
 
 void IOCPUInterruptController::enableCPUInterrupt(IOCPU *cpu)
 {
-  ml_install_interrupt_handler(cpu, cpu->getCPUNumber(), this,
-                               (IOInterruptHandler)&IOCPUInterruptController::handleInterrupt, 0);
+       IOInterruptHandler handler = OSMemberFunctionCast(
+               IOInterruptHandler, this, &IOCPUInterruptController::handleInterrupt);
+
+       ml_install_interrupt_handler(cpu, cpu->getCPUNumber(), this, handler, 0);
   
   enabledCPUs++;
   
@@ -389,7 +436,7 @@ IOReturn IOCPUInterruptController::registerInterrupt(IOService *nub,
   
   if (enabledCPUs != numCPUs) {
     assert_wait(this, THREAD_UNINT);
-    thread_block(0);
+    thread_block(THREAD_CONTINUE_NULL);
   }
   
   return kIOReturnSuccess;