Loading...
--- xnu/xnu-2782.20.48/iokit/Kernel/IOInterruptController.cpp
+++ xnu/xnu-1228/iokit/Kernel/IOInterruptController.cpp
@@ -1,6 +1,5 @@
/*
- * Copyright (c) 2007-2012 Apple Inc. All rights reserved.
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
@@ -26,6 +25,17 @@
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * DRI: Josh de Cesare
+ *
+ */
+
+
+#if __ppc__
+#include <ppc/proc_reg.h>
+#endif
#include <IOKit/IOLib.h>
#include <IOKit/IOService.h>
@@ -33,8 +43,6 @@
#include <IOKit/IODeviceTreeSupport.h>
#include <IOKit/IOInterrupts.h>
#include <IOKit/IOInterruptController.h>
-#include <IOKit/IOKitDebug.h>
-#include <IOKit/IOTimeStamp.h>
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -58,44 +66,33 @@
void *refCon)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- int wasDisabledSoft;
+ long vectorNumber;
+ IOInterruptVector *vector;
+ long wasDisabledSoft;
IOReturn error;
OSData *vectorData;
+ IOService *originalNub;
+ int originalSource;
IOOptionBits options;
bool canBeShared, shouldBeShared, wasAlreadyRegisterd;
-
- IOService *originalNub = NULL; // Protected by wasAlreadyRegisterd
- int originalSource = 0; // Protected by wasAlreadyRegisterd
-
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
// Get the lock for this vector.
- IOLockLock(vector->interruptLock);
+ IOTakeLock(vector->interruptLock);
// Check if the interrupt source can/should be shared.
canBeShared = vectorCanBeShared(vectorNumber, vector);
IODTGetInterruptOptions(nub, source, &options);
-#if defined(__i386__) || defined(__x86_64__)
- int interruptType;
- if (OSDynamicCast(IOPlatformDevice, getProvider()) &&
- (getInterruptType(nub, source, &interruptType) == kIOReturnSuccess) &&
- (kIOInterruptTypeLevel & interruptType))
- {
- options |= kIODTInterruptShared;
- }
-#endif
shouldBeShared = canBeShared && (options & kIODTInterruptShared);
wasAlreadyRegisterd = vector->interruptRegistered;
// If the vector is registered and can not be shared return error.
if (wasAlreadyRegisterd && !canBeShared) {
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return kIOReturnNoResources;
}
@@ -108,7 +105,7 @@
// Make the IOShareInterruptController instance
vector->sharedController = new IOSharedInterruptController;
if (vector->sharedController == 0) {
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return kIOReturnNoMemory;
}
@@ -132,7 +129,7 @@
if (wasAlreadyRegisterd) enableInterrupt(originalNub, originalSource);
vector->sharedController->release();
vector->sharedController = 0;
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return error;
}
@@ -160,7 +157,7 @@
vector->sharedController->release();
vector->sharedController = 0;
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return error;
}
}
@@ -186,13 +183,12 @@
vector->interruptRegistered = 1;
// Enable the original consumer's interrupt if needed.
- // originalNub is protected by wasAlreadyRegisterd here (see line 184).
if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);
}
error = vector->sharedController->registerInterrupt(nub, source, target,
handler, refCon);
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return error;
}
@@ -211,28 +207,28 @@
vector->interruptDisabledSoft = 1;
vector->interruptRegistered = 1;
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return kIOReturnSuccess;
}
IOReturn IOInterruptController::unregisterInterrupt(IOService *nub, int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- OSData *vectorData;
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
// Get the lock for this vector.
- IOLockLock(vector->interruptLock);
+ IOTakeLock(vector->interruptLock);
// Return success if it is not already registered
if (!vector->interruptRegistered) {
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return kIOReturnSuccess;
}
@@ -253,7 +249,7 @@
vector->target = 0;
vector->refCon = 0;
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return kIOReturnSuccess;
}
@@ -261,7 +257,7 @@
int *interruptType)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
@@ -269,7 +265,7 @@
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
*interruptType = getVectorType(vectorNumber, vector);
@@ -280,24 +276,27 @@
IOReturn IOInterruptController::enableInterrupt(IOService *nub, int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- OSData *vectorData;
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
if (vector->interruptDisabledSoft) {
vector->interruptDisabledSoft = 0;
-#if !defined(__i386__) && !defined(__x86_64__)
- OSMemoryBarrier();
-#endif
-
+#if __ppc__
+ sync();
+ isync();
+#endif
+
if (!getPlatform()->atInterruptLevel()) {
- while (vector->interruptActive)
- {}
+ while (vector->interruptActive);
+#if __ppc__
+ isync();
+#endif
}
if (vector->interruptDisabledHard) {
vector->interruptDisabledHard = 0;
@@ -312,23 +311,26 @@
IOReturn IOInterruptController::disableInterrupt(IOService *nub, int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- OSData *vectorData;
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
vector->interruptDisabledSoft = 1;
-#if !defined(__i386__) && !defined(__x86_64__)
- OSMemoryBarrier();
+#if __ppc__
+ sync();
+ isync();
#endif
if (!getPlatform()->atInterruptLevel()) {
- while (vector->interruptActive)
- {}
+ while (vector->interruptActive);
+#if __ppc__
+ isync();
+#endif
}
return kIOReturnSuccess;
@@ -337,13 +339,13 @@
IOReturn IOInterruptController::causeInterrupt(IOService *nub, int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- OSData *vectorData;
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
causeVector(vectorNumber, vector);
@@ -365,34 +367,34 @@
// Methods to be overridden for simplifed interrupt controller subclasses.
-bool IOInterruptController::vectorCanBeShared(IOInterruptVectorNumber /*vectorNumber*/,
+bool IOInterruptController::vectorCanBeShared(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
return false;
}
-void IOInterruptController::initVector(IOInterruptVectorNumber /*vectorNumber*/,
+void IOInterruptController::initVector(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
}
-int IOInterruptController::getVectorType(IOInterruptVectorNumber /*vectorNumber*/,
+int IOInterruptController::getVectorType(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
return kIOInterruptTypeEdge;
}
-void IOInterruptController::disableVectorHard(IOInterruptVectorNumber /*vectorNumber*/,
+void IOInterruptController::disableVectorHard(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
}
-void IOInterruptController::enableVector(IOInterruptVectorNumber /*vectorNumber*/,
+void IOInterruptController::enableVector(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
}
-void IOInterruptController::causeVector(IOInterruptVectorNumber /*vectorNumber*/,
+void IOInterruptController::causeVector(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
}
@@ -418,8 +420,6 @@
{
int cnt, interruptType;
IOReturn error;
-
- reserved = NULL;
if (!super::init())
return kIOReturnNoResources;
@@ -485,7 +485,7 @@
void *refCon)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector = 0;
OSData *vectorData;
IOInterruptState interruptState;
@@ -499,13 +499,13 @@
vector = &vectors[vectorNumber];
// Get the lock for this vector.
- IOLockLock(vector->interruptLock);
+ IOTakeLock(vector->interruptLock);
// Is it unregistered?
if (!vector->interruptRegistered) break;
// Move along to the next one.
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
}
if (vectorNumber != kIOSharedInterruptControllerDefaultVectors) break;
@@ -542,58 +542,59 @@
if (++vectorsRegistered > numVectors) numVectors = vectorsRegistered;
IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
- IOLockUnlock(vector->interruptLock);
+ IOUnlock(vector->interruptLock);
return kIOReturnSuccess;
}
IOReturn IOSharedInterruptController::unregisterInterrupt(IOService *nub,
int source)
{
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
+ IOInterruptSource *interruptSources;
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
IOInterruptState interruptState;
-
- for (vectorNumber = 0; vectorNumber < kIOSharedInterruptControllerDefaultVectors; vectorNumber++) {
- vector = &vectors[vectorNumber];
-
- // Get the lock for this vector.
- IOLockLock(vector->interruptLock);
-
- // Return success if it is not already registered
- if (!vector->interruptRegistered
- || (vector->nub != nub) || (vector->source != source)) {
- IOLockUnlock(vector->interruptLock);
- continue;
- }
-
- // Soft disable the source and the controller too.
- disableInterrupt(nub, source);
-
- // Clear all the storage for the vector except for interruptLock.
- vector->interruptActive = 0;
- vector->interruptDisabledSoft = 0;
- vector->interruptDisabledHard = 0;
- vector->interruptRegistered = 0;
- vector->nub = 0;
- vector->source = 0;
- vector->handler = 0;
- vector->target = 0;
- vector->refCon = 0;
-
- interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
- vectorsRegistered--;
- IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
-
- // Move along to the next one.
- IOLockUnlock(vector->interruptLock);
- }
-
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
+ vector = &vectors[vectorNumber];
+
+ // Get the lock for this vector.
+ IOTakeLock(vector->interruptLock);
+
+ // Return success if it is not already registered
+ if (!vector->interruptRegistered) {
+ IOUnlock(vector->interruptLock);
+ return kIOReturnSuccess;
+ }
+
+ // Soft disable the source and the controller too.
+ disableInterrupt(nub, source);
+
+ // Clear all the storage for the vector except for interruptLock.
+ vector->interruptActive = 0;
+ vector->interruptDisabledSoft = 0;
+ vector->interruptDisabledHard = 0;
+ vector->interruptRegistered = 0;
+ vector->nub = 0;
+ vector->source = 0;
+ vector->handler = 0;
+ vector->target = 0;
+ vector->refCon = 0;
+
+ interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
+ vectorsRegistered--;
+ IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
+
+ IOUnlock(vector->interruptLock);
+
// Re-enable the controller if all vectors are enabled.
if (vectorsEnabled == vectorsRegistered) {
controllerDisabled = 0;
provider->enableInterrupt(0);
}
-
+
return kIOReturnSuccess;
}
@@ -608,14 +609,14 @@
int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
IOInterruptState interruptState;
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
@@ -640,30 +641,32 @@
int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
IOInterruptState interruptState;
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
if (!vector->interruptDisabledSoft) {
vector->interruptDisabledSoft = 1;
-#if !defined(__i386__) && !defined(__x86_64__)
- OSMemoryBarrier();
-#endif
-
+#if __ppc__
+ sync();
+ isync();
+#endif
vectorsEnabled--;
}
IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
if (!getPlatform()->atInterruptLevel()) {
- while (vector->interruptActive)
- {}
+ while (vector->interruptActive);
+#if __ppc__
+ isync();
+#endif
}
return kIOReturnSuccess;
@@ -679,37 +682,28 @@
IOService * nub,
int /*source*/)
{
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector;
for (vectorNumber = 0; vectorNumber < numVectors; vectorNumber++) {
vector = &vectors[vectorNumber];
vector->interruptActive = 1;
-#if !defined(__i386__) && !defined(__x86_64__)
- OSMemoryBarrier();
-#endif
-
- if (!vector->interruptDisabledSoft) {
-
- // Call the handler if it exists.
- if (vector->interruptRegistered) {
-
- bool trace = (gIOKitTrace & kIOTraceInterrupts) ? true : false;
-
- if (trace)
- IOTimeStampStartConstant(IODBG_INTC(IOINTC_HANDLER),
- (uintptr_t) vectorNumber, (uintptr_t) vector->handler, (uintptr_t)vector->target);
-
- // Call handler.
- vector->handler(vector->target, vector->refCon, vector->nub, vector->source);
-
- if (trace)
- IOTimeStampEndConstant(IODBG_INTC(IOINTC_HANDLER),
- (uintptr_t) vectorNumber, (uintptr_t) vector->handler, (uintptr_t)vector->target);
-
- }
- }
+#if __ppc__
+ sync();
+ isync();
+#endif
+ if (!vector->interruptDisabledSoft) {
+#if __ppc__
+ isync();
+#endif
+
+ // Call the handler if it exists.
+ if (vector->interruptRegistered) {
+ vector->handler(vector->target, vector->refCon,
+ vector->nub, vector->source);
+ }
+ }
vector->interruptActive = 0;
}