Loading...
--- xnu/xnu-1228/iokit/Kernel/IOInterruptController.cpp
+++ xnu/xnu-344.26/iokit/Kernel/IOInterruptController.cpp
@@ -1,29 +1,23 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
*
- * 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.
+ * 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.
*
- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
/*
* Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
@@ -40,7 +34,6 @@
#include <IOKit/IOLib.h>
#include <IOKit/IOService.h>
#include <IOKit/IOPlatformExpert.h>
-#include <IOKit/IODeviceTreeSupport.h>
#include <IOKit/IOInterrupts.h>
#include <IOKit/IOInterruptController.h>
@@ -73,8 +66,6 @@
OSData *vectorData;
IOService *originalNub;
int originalSource;
- IOOptionBits options;
- bool canBeShared, shouldBeShared, wasAlreadyRegisterd;
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
@@ -84,22 +75,14 @@
// Get the lock for this vector.
IOTakeLock(vector->interruptLock);
- // Check if the interrupt source can/should be shared.
- canBeShared = vectorCanBeShared(vectorNumber, vector);
- IODTGetInterruptOptions(nub, source, &options);
- shouldBeShared = canBeShared && (options & kIODTInterruptShared);
- wasAlreadyRegisterd = vector->interruptRegistered;
-
- // If the vector is registered and can not be shared return error.
- if (wasAlreadyRegisterd && !canBeShared) {
- IOUnlock(vector->interruptLock);
- return kIOReturnNoResources;
- }
-
- // If this vector is already in use, and can be shared (implied),
- // or it is not registered and should be shared,
+ // If this vector is already in use, and can be shared,
// register as a shared interrupt.
- if (wasAlreadyRegisterd || shouldBeShared) {
+ if (vector->interruptRegistered) {
+ if (!vectorCanBeShared(vectorNumber, vector)) {
+ IOUnlock(vector->interruptLock);
+ return kIOReturnNoResources;
+ }
+
// If this vector is not already shared, break it out.
if (vector->sharedController == 0) {
// Make the IOShareInterruptController instance
@@ -109,57 +92,44 @@
return kIOReturnNoMemory;
}
- if (wasAlreadyRegisterd) {
- // Save the nub and source for the original consumer.
- originalNub = vector->nub;
- originalSource = vector->source;
-
- // Physically disable the interrupt, but mark it as being enabled in the hardware.
- // The interruptDisabledSoft now indicates the driver's request for enablement.
- disableVectorHard(vectorNumber, vector);
- vector->interruptDisabledHard = 0;
- }
+ // Save the nub and source for the original consumer.
+ originalNub = vector->nub;
+ originalSource = vector->source;
+
+ // Save the dis/enable state for the original consumer's interrupt.
+ // Then disable the source
+ wasDisabledSoft = vector->interruptDisabledSoft;
+ disableInterrupt(originalNub, originalSource);
// Initialize the new shared interrupt controller.
- error = vector->sharedController->initInterruptController(this, vectorData);
+ error = vector->sharedController->initInterruptController(this,
+ vectorData);
// If the IOSharedInterruptController could not be initalized,
- // if needed, put the original consumer's interrupt back to normal and
+ // put the original consumor's interrupt back to normal and
// get rid of whats left of the shared controller.
if (error != kIOReturnSuccess) {
- if (wasAlreadyRegisterd) enableInterrupt(originalNub, originalSource);
+ enableInterrupt(originalNub, originalSource);
vector->sharedController->release();
vector->sharedController = 0;
IOUnlock(vector->interruptLock);
return error;
}
- // If there was an original consumer try to register it on the shared controller.
- if (wasAlreadyRegisterd) {
- error = vector->sharedController->registerInterrupt(originalNub,
- originalSource,
- vector->target,
- vector->handler,
- vector->refCon);
- // If the original consumer could not be moved to the shared controller,
- // put the original consumor's interrupt back to normal and
- // get rid of whats left of the shared controller.
- if (error != kIOReturnSuccess) {
- // Save the driver's interrupt enablement state.
- wasDisabledSoft = vector->interruptDisabledSoft;
-
- // Make the interrupt really hard disabled.
- vector->interruptDisabledSoft = 1;
- vector->interruptDisabledHard = 1;
-
- // Enable the original consumer's interrupt if needed.
- if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);
- enableInterrupt(originalNub, originalSource);
-
- vector->sharedController->release();
- vector->sharedController = 0;
- IOUnlock(vector->interruptLock);
- return error;
- }
+ // Try to register the original consumer on the shared controller.
+ error = vector->sharedController->registerInterrupt(originalNub,
+ originalSource,
+ vector->target,
+ vector->handler,
+ vector->refCon);
+ // If the original consumer could not be moved to the shared controller,
+ // put the original consumor's interrupt back to normal and
+ // get rid of whats left of the shared controller.
+ if (error != kIOReturnSuccess) {
+ enableInterrupt(originalNub, originalSource);
+ vector->sharedController->release();
+ vector->sharedController = 0;
+ IOUnlock(vector->interruptLock);
+ return error;
}
// Fill in vector with the shared controller's info.
@@ -168,19 +138,6 @@
vector->source = 0;
vector->target = vector->sharedController;
vector->refCon = 0;
-
- // If the interrupt was already registered,
- // save the driver's interrupt enablement state.
- if (wasAlreadyRegisterd) wasDisabledSoft = vector->interruptDisabledSoft;
- else wasDisabledSoft = true;
-
- // Do any specific initalization for this vector if it has not yet been used.
- if (!wasAlreadyRegisterd) initVector(vectorNumber, vector);
-
- // Make the interrupt really hard disabled.
- vector->interruptDisabledSoft = 1;
- vector->interruptDisabledHard = 1;
- vector->interruptRegistered = 1;
// Enable the original consumer's interrupt if needed.
if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);
@@ -414,8 +371,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#define kIOSharedInterruptControllerDefaultVectors (128)
-
IOReturn IOSharedInterruptController::initInterruptController(IOInterruptController *parentController, OSData *parentSource)
{
int cnt, interruptType;
@@ -433,8 +388,6 @@
_numInterruptSources = 1;
// Set up the IOInterruptSource to point at this.
- parentController->retain();
- parentSource->retain();
_interruptSources[0].interruptController = parentController;
_interruptSources[0].vectorData = parentSource;
@@ -446,7 +399,7 @@
}
// Allocate the memory for the vectors
- numVectors = kIOSharedInterruptControllerDefaultVectors; // For now a constant number.
+ numVectors = 8; // For now a constant number.
vectors = (IOInterruptVector *)IOMalloc(numVectors * sizeof(IOInterruptVector));
if (vectors == NULL) {
IOFree(_interruptSources, sizeof(IOInterruptSource));
@@ -470,7 +423,6 @@
}
}
- numVectors = 0; // reset the high water mark for used vectors
vectorsRegistered = 0;
vectorsEnabled = 0;
controllerDisabled = 1;
@@ -493,9 +445,9 @@
interruptSources = nub->_interruptSources;
// Find a free vector.
- vectorNumber = kIOSharedInterruptControllerDefaultVectors;
- while (vectorsRegistered != kIOSharedInterruptControllerDefaultVectors) {
- for (vectorNumber = 0; vectorNumber < kIOSharedInterruptControllerDefaultVectors; vectorNumber++) {
+ vectorNumber = numVectors;
+ while (vectorsRegistered != numVectors) {
+ for (vectorNumber = 0; vectorNumber < numVectors; vectorNumber++) {
vector = &vectors[vectorNumber];
// Get the lock for this vector.
@@ -508,11 +460,11 @@
IOUnlock(vector->interruptLock);
}
- if (vectorNumber != kIOSharedInterruptControllerDefaultVectors) break;
+ if (vectorNumber != numVectors) break;
}
// Could not find a free one, so give up.
- if (vectorNumber == kIOSharedInterruptControllerDefaultVectors) {
+ if (vectorNumber == numVectors) {
return kIOReturnNoResources;
}
@@ -533,13 +485,12 @@
vector->target = target;
vector->refCon = refCon;
- // Get the vector ready. It starts off soft disabled.
+ // Get the vector ready. It start soft disabled.
vector->interruptDisabledSoft = 1;
vector->interruptRegistered = 1;
interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
- // Move the high water mark if needed
- if (++vectorsRegistered > numVectors) numVectors = vectorsRegistered;
+ vectorsRegistered++;
IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
IOUnlock(vector->interruptLock);
@@ -553,7 +504,7 @@
long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
- IOInterruptState interruptState;
+ IOInterruptState interruptState;;
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
@@ -569,7 +520,7 @@
return kIOReturnSuccess;
}
- // Soft disable the source and the controller too.
+ // Soft disable the source.
disableInterrupt(nub, source);
// Clear all the storage for the vector except for interruptLock.
@@ -588,13 +539,6 @@
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;
}
@@ -674,8 +618,7 @@
IOInterruptAction IOSharedInterruptController::getInterruptHandlerAddress(void)
{
- return OSMemberFunctionCast(IOInterruptAction,
- this, &IOSharedInterruptController::handleInterrupt);
+ return (IOInterruptAction)&IOSharedInterruptController::handleInterrupt;
}
IOReturn IOSharedInterruptController::handleInterrupt(void * /*refCon*/,