Loading...
--- xnu/xnu-201/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-4570.51.1/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -1,31 +1,29 @@
/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, 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) 1998 Apple Computer, Inc. All rights reserved.
- *
- * HISTORY
- * 23 Nov 98 sdouglas, created from IODeviceTreeBus.m, & MacOS exp mgr.
- * 05 Apr 99 sdouglas, add interrupt mapping.
- *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
#include <IOKit/IODeviceTreeSupport.h>
@@ -37,13 +35,22 @@
#include <IOKit/IOLib.h>
#include <IOKit/IOKitKeys.h>
-#include <DeviceTree.h>
+#include <pexpert/device_tree.h>
+
+#if __arm64__
+typedef UInt64 dtptr_t;
+#else
+typedef UInt32 dtptr_t;
+#endif
+
+#include <machine/machine_routines.h>
+
extern "C" {
- #include <machine/machine_routines.h>
- void DTInit( void * data );
-
- int IODTGetLoaderInfo( char *key, void **infoAddr, int *infosize );
- void IODTFreeLoaderInfo( char *key, void *infoAddr, int infoSize );
+
+int IODTGetLoaderInfo( const char *key, void **infoAddr, int *infosize );
+void IODTFreeLoaderInfo( const char *key, void *infoAddr, int infoSize );
+int IODTGetDefault(const char *key, void *infoAddr, unsigned int infoSize );
+
}
#include <IOKit/assert.h>
@@ -52,14 +59,16 @@
const IORegistryPlane * gIODTPlane;
-static OSArray * gIODTPHandles;
-static OSArray * gIODTPHandleMap;
+static OSArray * gIODTPHandles;
+static OSArray * gIODTPHandleMap;
+static OSData * gIODTResolvers;
const OSSymbol * gIODTNameKey;
const OSSymbol * gIODTUnitKey;
const OSSymbol * gIODTCompatibleKey;
const OSSymbol * gIODTTypeKey;
const OSSymbol * gIODTModelKey;
+const OSSymbol * gIODTTargetTypeKey;
const OSSymbol * gIODTSizeCellKey;
const OSSymbol * gIODTAddressCellKey;
@@ -74,29 +83,31 @@
const OSSymbol * gIODTInterruptParentKey;
const OSSymbol * gIODTNWInterruptMappingKey;
+OSDictionary * gIODTSharedInterrupts;
+
+static IOLock * gIODTResolversLock;
static IORegistryEntry * MakeReferenceTable( DTEntry dtEntry, bool copy );
static void AddPHandle( IORegistryEntry * regEntry );
static void FreePhysicalMemory( vm_offset_t * range );
+static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary * allInts );
IORegistryEntry *
IODeviceTreeAlloc( void * dtTop )
{
- IORegistryEntry *parent;
- IORegistryEntry *child;
- IORegistryIterator *regIter;
- DTEntryIterator iter;
- DTEntry dtChild;
- DTEntry mapEntry;
- OSArray *stack;
- OSData *prop;
- OSObject *obj;
- vm_offset_t *dtMap;
- int propSize;
- bool intMap;
- bool freeDT;
-
- IOLog("IODeviceTreeSupport ");
+ IORegistryEntry * parent;
+ IORegistryEntry * child;
+ IORegistryIterator * regIter;
+ OpaqueDTEntryIterator iter;
+ DTEntry dtChild;
+ DTEntry mapEntry;
+ OSArray * stack;
+ OSData * prop;
+ OSDictionary * allInts;
+ vm_offset_t * dtMap;
+ unsigned int propSize;
+ bool intMap;
+ bool freeDT;
gIODTPlane = IORegistryEntry::makePlane( kIODeviceTreePlane );
@@ -105,6 +116,7 @@
gIODTCompatibleKey = OSSymbol::withCStringNoCopy( "compatible" );
gIODTTypeKey = OSSymbol::withCStringNoCopy( "device_type" );
gIODTModelKey = OSSymbol::withCStringNoCopy( "model" );
+ gIODTTargetTypeKey = OSSymbol::withCStringNoCopy( "target-type" );
gIODTSizeCellKey = OSSymbol::withCStringNoCopy( "#size-cells" );
gIODTAddressCellKey = OSSymbol::withCStringNoCopy( "#address-cells" );
gIODTRangeKey = OSSymbol::withCStringNoCopy( "ranges" );
@@ -130,6 +142,9 @@
gIODTPHandles = OSArray::withCapacity( 1 );
gIODTPHandleMap = OSArray::withCapacity( 1 );
+ gIODTResolvers = OSData::withCapacity(16);
+
+ gIODTResolversLock = IOLockAlloc();
gIODTInterruptCellKey
= OSSymbol::withCStringNoCopy("#interrupt-cells");
@@ -137,52 +152,52 @@
assert( gIODTDefaultInterruptController && gIODTNWInterruptMappingKey
&& gIODTAAPLInterruptsKey
&& gIODTPHandleKey && gIODTInterruptParentKey
- && gIODTPHandles && gIODTPHandleMap
+ && gIODTPHandles && gIODTPHandleMap && gIODTResolvers && gIODTResolversLock
&& gIODTInterruptCellKey
);
freeDT = (kSuccess == DTLookupEntry( 0, "/chosen/memory-map", &mapEntry ))
&& (kSuccess == DTGetProperty( mapEntry,
"DeviceTree", (void **) &dtMap, &propSize ))
- && ((2 * sizeof( vm_offset_t)) == propSize);
+ && ((2 * sizeof(uint32_t)) == propSize);
parent = MakeReferenceTable( (DTEntry)dtTop, freeDT );
- stack = OSArray::withObjects( & (const OSObject *) parent, 1, 10 );
- DTCreateEntryIterator( (DTEntry)dtTop, &iter );
+ stack = OSArray::withObjects( (const OSObject **) &parent, 1, 10 );
+ DTInitEntryIterator( (DTEntry)dtTop, &iter );
do {
parent = (IORegistryEntry *)stack->getObject( stack->getCount() - 1);
- //parent->release();
+ //parent->release();
stack->removeObject( stack->getCount() - 1);
- while( kSuccess == DTIterateEntries( iter, &dtChild) ) {
+ while( kSuccess == DTIterateEntries( &iter, &dtChild) ) {
child = MakeReferenceTable( dtChild, freeDT );
child->attachToParent( parent, gIODTPlane);
- AddPHandle( child );
-
- if( kSuccess == DTEnterEntry( iter, dtChild)) {
+ AddPHandle( child );
+
+ if( kSuccess == DTEnterEntry( &iter, dtChild)) {
stack->setObject( parent);
parent = child;
}
- // only registry holds retain
- child->release();
+ // only registry holds retain
+ child->release();
}
} while( stack->getCount()
- && (kSuccess == DTExitEntry( iter, &dtChild)));
+ && (kSuccess == DTExitEntry( &iter, &dtChild)));
stack->release();
- DTDisposeEntryIterator( iter);
+ assert(kSuccess != DTExitEntry(&iter, &dtChild));
// parent is now root of the created tree
// make root name first compatible entry (purely cosmetic)
if( (prop = (OSData *) parent->getProperty( gIODTCompatibleKey))) {
- parent->setName( parent->getName(), gIODTPlane );
- parent->setName( (const char *) prop->getBytesNoCopy() );
+ parent->setName( parent->getName(), gIODTPlane );
+ parent->setName( (const char *) prop->getBytesNoCopy() );
}
// attach tree to meta root
@@ -190,80 +205,94 @@
parent->release();
if( freeDT ) {
- // free original device tree
+ // free original device tree
DTInit(0);
IODTFreeLoaderInfo( "DeviceTree",
- (void *)dtMap[0], round_page(dtMap[1]) );
+ (void *)dtMap[0], (int) round_page(dtMap[1]) );
}
// adjust tree
+
+ gIODTSharedInterrupts = OSDictionary::withCapacity(4);
+ allInts = OSDictionary::withCapacity(4);
intMap = false;
regIter = IORegistryIterator::iterateOver( gIODTPlane,
kIORegistryIterateRecursively );
- assert( regIter );
- if( regIter) {
- while( (child = regIter->getNextObject())) {
- IODTMapInterrupts( child );
- if( !intMap && child->getProperty( gIODTInterruptParentKey))
- intMap = true;
-
- // Look for a "driver,AAPL,MacOSX,PowerPC" property.
- if( (obj = child->getProperty( "driver,AAPL,MacOSX,PowerPC"))) {
- gIOCatalogue->addExtensionsFromArchive((OSData *)obj);
-
- child->removeProperty( "driver,AAPL,MacOSX,PowerPC");
- }
-
- // some gross pruning
- child->removeProperty( "lanLib,AAPL,MacOS,PowerPC");
-
- if( (obj = child->getProperty( "driver,AAPL,MacOS,PowerPC"))) {
-
- if( (0 == (prop = (OSData *)child->getProperty( gIODTTypeKey )))
- || (strcmp( "display", (char *) prop->getBytesNoCopy())) ) {
- child->removeProperty( "driver,AAPL,MacOS,PowerPC");
- }
- }
- }
- regIter->release();
- }
+ assert( regIter && allInts && gIODTSharedInterrupts );
+ if( regIter && allInts && gIODTSharedInterrupts ) {
+ while( (child = regIter->getNextObject())) {
+ IODTMapInterruptsSharing( child, allInts );
+ if( !intMap && child->getProperty( gIODTInterruptParentKey))
+ intMap = true;
+
+ }
+ regIter->release();
+ }
+
+#if IODTSUPPORTDEBUG
+ parent->setProperty("allInts", allInts);
+ parent->setProperty("sharedInts", gIODTSharedInterrupts);
+
+ regIter = IORegistryIterator::iterateOver( gIODTPlane,
+ kIORegistryIterateRecursively );
+ if (regIter) {
+ while( (child = regIter->getNextObject())) {
+ OSArray *
+ array = OSDynamicCast(OSArray, child->getProperty( gIOInterruptSpecifiersKey ));
+ for( UInt32 i = 0; array && (i < array->getCount()); i++)
+ {
+ IOOptionBits options;
+ IOReturn ret = IODTGetInterruptOptions( child, i, &options );
+ if( (ret != kIOReturnSuccess) || options)
+ IOLog("%s[%ld] %ld (%x)\n", child->getName(), i, options, ret);
+ }
+ }
+ regIter->release();
+ }
+#endif
+
+ allInts->release();
if( intMap)
- // set a key in the root to indicate we found NW interrupt mapping
- parent->setProperty( gIODTNWInterruptMappingKey,
- (OSObject *) gIODTNWInterruptMappingKey );
-
- IOLog("done\n");
+ // set a key in the root to indicate we found NW interrupt mapping
+ parent->setProperty( gIODTNWInterruptMappingKey,
+ (OSObject *) gIODTNWInterruptMappingKey );
return( parent);
}
-int IODTGetLoaderInfo( char *key, void **infoAddr, int *infoSize )
+int IODTGetLoaderInfo( const char *key, void **infoAddr, int *infoSize )
{
IORegistryEntry *chosen;
OSData *propObj;
- unsigned int *propPtr;
+ dtptr_t *propPtr;
unsigned int propSize;
+ int ret = -1;
chosen = IORegistryEntry::fromPath( "/chosen/memory-map", gIODTPlane );
if ( chosen == 0 ) return -1;
propObj = OSDynamicCast( OSData, chosen->getProperty(key) );
- if ( propObj == 0 ) return -1;
+ if ( propObj == 0 ) goto cleanup;
propSize = propObj->getLength();
- if ( propSize != (2 * sizeof(UInt32)) ) return -1;
+ if ( propSize != (2 * sizeof(dtptr_t)) ) goto cleanup;
- propPtr = (unsigned int *)propObj->getBytesNoCopy();
- if ( propPtr == 0 ) return -1;
-
- *infoAddr = (void *)propPtr[0] ;
- *infoSize = (int) propPtr[1];
-
- return 0;
-}
-
-void IODTFreeLoaderInfo( char *key, void *infoAddr, int infoSize )
+ propPtr = (dtptr_t *)propObj->getBytesNoCopy();
+ if ( propPtr == 0 ) goto cleanup;
+
+ *infoAddr = (void *)(uintptr_t) (propPtr[0]);
+ *infoSize = (int) (propPtr[1]);
+
+ ret = 0;
+
+cleanup:
+ chosen->release();
+
+ return ret;
+}
+
+void IODTFreeLoaderInfo( const char *key, void *infoAddr, int infoSize )
{
vm_offset_t range[2];
IORegistryEntry *chosen;
@@ -276,8 +305,29 @@
chosen = IORegistryEntry::fromPath( "/chosen/memory-map", gIODTPlane );
if ( chosen != 0 ) {
chosen->removeProperty(key);
+ chosen->release();
}
}
+}
+
+int IODTGetDefault(const char *key, void *infoAddr, unsigned int infoSize )
+{
+ IORegistryEntry *defaults;
+ OSData *defaultObj;
+ unsigned int defaultSize;
+
+ defaults = IORegistryEntry::fromPath( "/defaults", gIODTPlane );
+ if ( defaults == 0 ) return -1;
+
+ defaultObj = OSDynamicCast( OSData, defaults->getProperty(key) );
+ if ( defaultObj == 0 ) return -1;
+
+ defaultSize = defaultObj->getLength();
+ if ( defaultSize > infoSize) return -1;
+
+ memcpy( infoAddr, defaultObj->getBytesNoCopy(), defaultSize );
+
+ return 0;
}
static void FreePhysicalMemory( vm_offset_t * range )
@@ -298,67 +348,72 @@
const OSSymbol *nameKey;
OSData *data;
const OSSymbol *sym;
- DTPropertyIterator dtIter;
+ OpaqueDTPropertyIterator dtIter;
void *prop;
- int propSize;
+ unsigned int propSize;
char *name;
char location[ 32 ];
bool noLocation = true;
+ bool kernelOnly;
regEntry = new IOService;
if( regEntry && (false == regEntry->init())) {
- regEntry->release();
- regEntry = 0;
+ regEntry->release();
+ regEntry = 0;
}
if( regEntry &&
- (kSuccess == DTCreatePropertyIterator( dtEntry, &dtIter))) {
-
+ (kSuccess == DTInitPropertyIterator( dtEntry, &dtIter))) {
+
+ kernelOnly = (kSuccess == DTGetProperty(dtEntry, "kernel-only", &prop, &propSize));
propTable = regEntry->getPropertyTable();
- while( kSuccess == DTIterateProperties( dtIter, &name)) {
-
- if( kSuccess != DTGetProperty( dtEntry, name, &prop, &propSize ))
- continue;
-
- if( copy) {
- nameKey = OSSymbol::withCString(name);
- data = OSData::withBytes(prop, propSize);
- } else {
- nameKey = OSSymbol::withCStringNoCopy(name);
- data = OSData::withBytesNoCopy(prop, propSize);
- }
- assert( nameKey && data );
-
- propTable->setObject( nameKey, data);
- data->release();
- nameKey->release();
-
- if( nameKey == gIODTNameKey ) {
- if( copy)
- sym = OSSymbol::withCString( (const char *) prop);
- else
- sym = OSSymbol::withCStringNoCopy( (const char *) prop);
- regEntry->setName( sym );
- sym->release();
- } else if( nameKey == gIODTUnitKey ) {
- // all OF strings are null terminated... except this one
- if( propSize >= (int) sizeof( location))
- propSize = sizeof( location) - 1;
- strncpy( location, (const char *) prop, propSize );
- location[ propSize ] = 0;
- regEntry->setLocation( location );
- propTable->removeObject( gIODTUnitKey );
- noLocation = false;
-
- } else if( noLocation && (0 == strcmp( name, "reg"))) {
- // default location - override later
- sprintf( location, "%lX", *((UInt32 *) prop) );
- regEntry->setLocation( location );
- }
- }
- DTDisposePropertyIterator( dtIter);
+ while( kSuccess == DTIterateProperties( &dtIter, &name)) {
+
+ if( kSuccess != DTGetProperty( dtEntry, name, &prop, &propSize ))
+ continue;
+
+ if( copy) {
+ nameKey = OSSymbol::withCString(name);
+ data = OSData::withBytes(prop, propSize);
+ } else {
+ nameKey = OSSymbol::withCStringNoCopy(name);
+ data = OSData::withBytesNoCopy(prop, propSize);
+ }
+ assert( nameKey && data );
+
+ if (kernelOnly)
+ data->setSerializable(false);
+
+ propTable->setObject( nameKey, data);
+ data->release();
+ nameKey->release();
+
+ if( nameKey == gIODTNameKey ) {
+ if( copy)
+ sym = OSSymbol::withCString( (const char *) prop);
+ else
+ sym = OSSymbol::withCStringNoCopy( (const char *) prop);
+ regEntry->setName( sym );
+ sym->release();
+
+ } else if( nameKey == gIODTUnitKey ) {
+ // all OF strings are null terminated... except this one
+ if( propSize >= (int) sizeof(location))
+ propSize = sizeof(location) - 1;
+ strncpy( location, (const char *) prop, propSize );
+ location[ propSize ] = 0;
+ regEntry->setLocation( location );
+ propTable->removeObject( gIODTUnitKey );
+ noLocation = false;
+
+ } else if(noLocation && (!strncmp(name, "reg", sizeof("reg")))) {
+ // default location - override later
+ snprintf(location, sizeof(location), "%X", *((uint32_t *) prop));
+ regEntry->setLocation( location );
+ }
+ }
}
return( regEntry);
@@ -369,10 +424,10 @@
OSData * data;
if( regEntry->getProperty( gIODTInterruptCellKey)
- && (data = OSDynamicCast( OSData, regEntry->getProperty( gIODTPHandleKey )))) {
- // a possible interrupt-parent
- gIODTPHandles->setObject( data );
- gIODTPHandleMap->setObject( regEntry );
+ && (data = OSDynamicCast( OSData, regEntry->getProperty( gIODTPHandleKey )))) {
+ // a possible interrupt-parent
+ gIODTPHandles->setObject( data );
+ gIODTPHandleMap->setObject( regEntry );
}
}
@@ -383,10 +438,10 @@
int i;
for( i = 0; (data = (OSData *)gIODTPHandles->getObject( i )); i++ ) {
- if( phandle == *((UInt32 *)data->getBytesNoCopy())) {
- regEntry = (IORegistryEntry *)
- gIODTPHandleMap->getObject( i );
- break;
+ if( phandle == *((UInt32 *)data->getBytesNoCopy())) {
+ regEntry = (IORegistryEntry *)
+ gIODTPHandleMap->getObject( i );
+ break;
}
}
@@ -396,28 +451,37 @@
static bool GetUInt32( IORegistryEntry * regEntry, const OSSymbol * name,
UInt32 * value )
{
- OSData *data;
-
- if( (data = OSDynamicCast( OSData, regEntry->getProperty( name )))
- && (4 == data->getLength())) {
- *value = *((UInt32 *) data->getBytesNoCopy());
- return( true );
- } else
- return( false );
-}
-
-IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry )
+ OSObject * obj;
+ OSData * data;
+ bool result;
+
+ if (!(obj = regEntry->copyProperty(name))) return (false);
+
+ result = ((data = OSDynamicCast(OSData, obj)) && (sizeof(UInt32) == data->getLength()));
+ if (result) *value = *((UInt32 *) data->getBytesNoCopy());
+
+ obj->release();
+ return(result);
+}
+
+static IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry, IOItemCount index )
{
IORegistryEntry * parent;
UInt32 phandle;
-
- if( GetUInt32( regEntry, gIODTInterruptParentKey, &phandle))
- parent = FindPHandle( phandle );
-
- else if( 0 == regEntry->getProperty( "interrupt-controller"))
- parent = regEntry->getParentEntry( gIODTPlane);
+ OSData * data;
+ unsigned int len;
+
+ if( (data = OSDynamicCast( OSData, regEntry->getProperty( gIODTInterruptParentKey )))
+ && (sizeof(UInt32) <= (len = data->getLength()))) {
+ if (((index + 1) * sizeof(UInt32)) > len)
+ index = 0;
+ phandle = ((UInt32 *) data->getBytesNoCopy())[index];
+ parent = FindPHandle( phandle );
+
+ } else if( 0 == regEntry->getProperty( "interrupt-controller"))
+ parent = regEntry->getParentEntry( gIODTPlane);
else
- parent = 0;
+ parent = 0;
return( parent );
}
@@ -425,18 +489,18 @@
const OSSymbol * IODTInterruptControllerName( IORegistryEntry * regEntry )
{
const OSSymbol *sym;
- UInt32 phandle;
- bool ok;
- char buf[48];
+ UInt32 phandle;
+ bool ok;
+ char buf[48];
ok = GetUInt32( regEntry, gIODTPHandleKey, &phandle);
assert( ok );
if( ok) {
- sprintf( buf, "IOInterruptController%08lX", phandle);
+ snprintf(buf, sizeof(buf), "IOInterruptController%08X", (uint32_t)phandle);
sym = OSSymbol::withCString( buf );
} else
- sym = 0;
+ sym = 0;
return( sym );
}
@@ -452,8 +516,8 @@
*aCellCount = 0;
}
-UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
- OSData ** spec, const OSSymbol ** controller )
+static UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec, UInt32 index,
+ OSData ** spec, const OSSymbol ** controller )
{
IORegistryEntry *parent = 0;
OSData *data;
@@ -465,77 +529,76 @@
UInt32 i, original_icells;
bool cmp, ok = false;
-
- parent = IODTFindInterruptParent( regEntry );
+ parent = IODTFindInterruptParent( regEntry, index );
IODTGetICellCounts( parent, &icells, &acells );
addrCmp = 0;
if( acells) {
- data = OSDynamicCast( OSData, regEntry->getProperty( "reg" ));
- if( data && (data->getLength() >= (acells * sizeof( UInt32))))
- addrCmp = (UInt32 *) data->getBytesNoCopy();
+ data = OSDynamicCast( OSData, regEntry->getProperty( "reg" ));
+ if( data && (data->getLength() >= (acells * sizeof(UInt32))))
+ addrCmp = (UInt32 *) data->getBytesNoCopy();
}
original_icells = icells;
regEntry = parent;
- do {
+ do {
#if IODTSUPPORTDEBUG
- kprintf ("IODTMapOneInterrupt: current regEntry name %s\n", regEntry->getName());
- kprintf ("acells - icells: ");
- for (i = 0; i < acells; i++) kprintf ("0x%08X ", addrCmp[i]);
- kprintf ("- ");
- for (i = 0; i < icells; i++) kprintf ("0x%08X ", intSpec[i]);
- kprintf ("\n");
+ kprintf ("IODTMapOneInterrupt: current regEntry name %s\n", regEntry->getName());
+ kprintf ("acells - icells: ");
+ for (i = 0; i < acells; i++) kprintf ("0x%08X ", addrCmp[i]);
+ kprintf ("- ");
+ for (i = 0; i < icells; i++) kprintf ("0x%08X ", intSpec[i]);
+ kprintf ("\n");
#endif
- if( parent && (data = OSDynamicCast( OSData,
- regEntry->getProperty( "interrupt-controller")))) {
- // found a controller - don't want to follow cascaded controllers
+ if( parent && (data = OSDynamicCast( OSData,
+ regEntry->getProperty( "interrupt-controller")))) {
+ // found a controller - don't want to follow cascaded controllers
parent = 0;
*spec = OSData::withBytesNoCopy( (void *) intSpec,
- icells * sizeof( UInt32));
+ icells * sizeof(UInt32));
*controller = IODTInterruptControllerName( regEntry );
- ok = (*spec && *controller);
- } else if( parent && (data = OSDynamicCast( OSData,
- regEntry->getProperty( "interrupt-map")))) {
+ ok = (*spec && *controller);
+ } else if( parent && (data = OSDynamicCast( OSData,
+ regEntry->getProperty( "interrupt-map")))) {
// interrupt-map
map = (UInt32 *) data->getBytesNoCopy();
endMap = map + (data->getLength() / sizeof(UInt32));
data = OSDynamicCast( OSData, regEntry->getProperty( "interrupt-map-mask" ));
- if( data && (data->getLength() >= ((acells + icells) * sizeof( UInt32))))
+ if( data && (data->getLength() >= ((acells + icells) * sizeof(UInt32))))
maskCmp = (UInt32 *) data->getBytesNoCopy();
- else
- maskCmp = 0;
+ else
+ maskCmp = 0;
#if IODTSUPPORTDEBUG
- if (maskCmp) {
- kprintf (" maskCmp: ");
- for (i = 0; i < acells + icells; i++) {
- if (i == acells)
- kprintf ("- ");
- kprintf ("0x%08X ", maskCmp[i]);
- }
- kprintf ("\n");
- kprintf (" masked: ");
- for (i = 0; i < acells + icells; i++) {
- if (i == acells)
- kprintf ("- ");
- kprintf ("0x%08X ", ((i < acells) ? addrCmp[i] : intSpec[i-acells]) & maskCmp[i]);
- }
- kprintf ("\n");
- } else
- kprintf ("no maskCmp\n");
+ if (maskCmp) {
+ kprintf (" maskCmp: ");
+ for (i = 0; i < acells + icells; i++) {
+ if (i == acells)
+ kprintf ("- ");
+ kprintf ("0x%08X ", maskCmp[i]);
+ }
+ kprintf ("\n");
+ kprintf (" masked: ");
+ for (i = 0; i < acells + icells; i++) {
+ if (i == acells)
+ kprintf ("- ");
+ kprintf ("0x%08X ", ((i < acells) ? addrCmp[i] : intSpec[i-acells]) & maskCmp[i]);
+ }
+ kprintf ("\n");
+ } else
+ kprintf ("no maskCmp\n");
#endif
- do {
+ do {
#if IODTSUPPORTDEBUG
- kprintf (" map: ");
- for (i = 0; i < acells + icells; i++) {
- if (i == acells)
- kprintf ("- ");
- kprintf ("0x%08X ", map[i]);
- }
- kprintf ("\n");
+ kprintf (" map: ");
+ for (i = 0; i < acells + icells; i++) {
+ if (i == acells)
+ kprintf ("- ");
+ kprintf ("0x%08X ", map[i]);
+ }
+ kprintf ("\n");
#endif
- for( i = 0, cmp = true; cmp && (i < (acells + icells)); i++) {
+ for( i = 0, cmp = true; cmp && (i < (acells + icells)); i++) {
cell = (i < acells) ? addrCmp[i] : intSpec[ i - acells ];
if( maskCmp)
cell &= maskCmp[i];
@@ -546,59 +609,100 @@
if( 0 == (parent = FindPHandle( *(map++) )))
unexpected(break);
- IODTGetICellCounts( parent, &picells, &pacells );
+ IODTGetICellCounts( parent, &picells, &pacells );
if( cmp) {
addrCmp = map;
intSpec = map + pacells;
regEntry = parent;
- } else {
+ } else {
map += pacells + picells;
- }
+ }
} while( !cmp && (map < endMap) );
if (!cmp)
- parent = 0;
- }
-
- if( parent) {
+ parent = 0;
+ }
+
+ if( parent) {
IODTGetICellCounts( parent, &icells, &acells );
- regEntry = parent;
- }
- } while( parent);
+ regEntry = parent;
+ }
+
+ } while( parent);
return( ok ? original_icells : 0 );
}
-bool IODTMapInterrupts( IORegistryEntry * regEntry )
-{
- IORegistryEntry *parent;
- OSData *local;
- OSData *local2;
- UInt32 *localBits;
- UInt32 *localEnd;
- OSData *map;
- OSArray *mapped;
- const OSSymbol *controller;
- OSArray *controllers;
- UInt32 skip = 1;
- bool ok, nw;
+IOReturn IODTGetInterruptOptions( IORegistryEntry * regEntry, int source, IOOptionBits * options )
+{
+ OSArray * controllers;
+ OSArray * specifiers;
+ OSArray * shared;
+ OSObject * spec;
+ OSObject * oneSpec;
+
+ *options = 0;
+
+ controllers = OSDynamicCast(OSArray, regEntry->getProperty(gIOInterruptControllersKey));
+ specifiers = OSDynamicCast(OSArray, regEntry->getProperty(gIOInterruptSpecifiersKey));
+
+ if( !controllers || !specifiers)
+ return (kIOReturnNoInterrupt);
+
+ shared = (OSArray *) gIODTSharedInterrupts->getObject(
+ (const OSSymbol *) controllers->getObject(source) );
+ if (!shared)
+ return (kIOReturnSuccess);
+
+ spec = specifiers->getObject(source);
+ if (!spec)
+ return (kIOReturnNoInterrupt);
+
+ for (unsigned int i = 0;
+ (oneSpec = shared->getObject(i))
+ && (!oneSpec->isEqualTo(spec));
+ i++ ) {}
+
+ if (oneSpec)
+ *options = kIODTInterruptShared;
+
+ return (kIOReturnSuccess);
+}
+
+static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary * allInts )
+{
+ IORegistryEntry * parent;
+ OSData * local;
+ OSData * local2;
+ UInt32 * localBits;
+ UInt32 * localEnd;
+ IOItemCount index;
+ OSData * map;
+ OSObject * oneMap;
+ OSArray * mapped;
+ OSArray * controllerInts;
+ const OSSymbol * controller = 0;
+ OSArray * controllers;
+ UInt32 skip = 1;
+ bool ok, nw;
nw = (0 == (local = OSDynamicCast( OSData,
- regEntry->getProperty( gIODTAAPLInterruptsKey))));
+ regEntry->getProperty( gIODTAAPLInterruptsKey))));
if( nw && (0 == (local = OSDynamicCast( OSData,
- regEntry->getProperty( "interrupts")))))
- return( true ); // nothing to see here
+ regEntry->getProperty( "interrupts")))))
+ return( true ); // nothing to see here
if( nw && (parent = regEntry->getParentEntry( gIODTPlane))) {
- // check for bridges on old world
- if( (local2 = OSDynamicCast( OSData,
- parent->getProperty( gIODTAAPLInterruptsKey)))) {
- local = local2;
- nw = false;
- }
+ // check for bridges on old world
+ if( (local2 = OSDynamicCast( OSData,
+ parent->getProperty( gIODTAAPLInterruptsKey)))) {
+ local = local2;
+ nw = false;
+ }
}
localBits = (UInt32 *) local->getBytesNoCopy();
- localEnd = localBits + (local->getLength() / sizeof( UInt32));
+ localEnd = localBits + (local->getLength() / sizeof(UInt32));
+ index = 0;
mapped = OSArray::withCapacity( 1 );
controllers = OSArray::withCapacity( 1 );
@@ -606,22 +710,63 @@
if( ok) do {
if( nw) {
- skip = IODTMapOneInterrupt( regEntry, localBits, &map, &controller );
+ skip = IODTMapOneInterrupt( regEntry, localBits, index, &map, &controller );
if( 0 == skip) {
IOLog("%s: error mapping interrupt[%d]\n",
- regEntry->getName(), mapped->getCount());
+ regEntry->getName(), mapped->getCount());
break;
}
} else {
- map = OSData::withData( local, mapped->getCount() * sizeof( UInt32),
- sizeof( UInt32));
+ map = OSData::withData( local, mapped->getCount() * sizeof(UInt32),
+ sizeof(UInt32));
controller = gIODTDefaultInterruptController;
+ controller->retain();
}
+ index++;
localBits += skip;
mapped->setObject( map );
+ controllers->setObject( controller );
+
+ if (allInts)
+ {
+ controllerInts = (OSArray *) allInts->getObject( controller );
+ if (controllerInts)
+ {
+ for (unsigned int i = 0; (oneMap = controllerInts->getObject(i)); i++)
+ {
+ if (map->isEqualTo(oneMap))
+ {
+ controllerInts = (OSArray *) gIODTSharedInterrupts->getObject( controller );
+ if (controllerInts)
+ controllerInts->setObject(map);
+ else
+ {
+ controllerInts = OSArray::withObjects( (const OSObject **) &map, 1, 4 );
+ if (controllerInts)
+ {
+ gIODTSharedInterrupts->setObject( controller, controllerInts );
+ controllerInts->release();
+ }
+ }
+ break;
+ }
+ }
+ if (!oneMap)
+ controllerInts->setObject(map);
+ }
+ else
+ {
+ controllerInts = OSArray::withObjects( (const OSObject **) &map, 1, 16 );
+ if (controllerInts)
+ {
+ allInts->setObject( controller, controllerInts );
+ controllerInts->release();
+ }
+ }
+ }
+
map->release();
- controllers->setObject( (OSObject *) controller );
controller->release();
} while( localBits < localEnd);
@@ -629,7 +774,7 @@
ok &= (localBits == localEnd);
if( ok ) {
- // store results
+ // store results
ok = regEntry->setProperty( gIOInterruptControllersKey, controllers);
ok &= regEntry->setProperty( gIOInterruptSpecifiersKey, mapped);
}
@@ -642,26 +787,32 @@
return( ok );
}
+bool IODTMapInterrupts( IORegistryEntry * regEntry )
+{
+ return( IODTMapInterruptsSharing( regEntry, 0 ));
+}
+
/*
*/
-static const char *
+static bool
CompareKey( OSString * key,
- const IORegistryEntry * table, const OSSymbol * propName )
+ const IORegistryEntry * table, const OSSymbol * propName,
+ OSString ** matchingName )
{
OSObject *prop;
OSData *data;
OSString *string;
const char *ckey;
UInt32 keyLen;
+ UInt32 nlen;
const char *names;
const char *lastName;
bool wild;
bool matched;
const char *result = 0;
- if( 0 == (prop = table->getProperty( propName )))
- return( 0 );
+ if( 0 == (prop = table->copyProperty( propName ))) return( 0 );
if( (data = OSDynamicCast( OSData, prop ))) {
names = (const char *) data->getBytesNoCopy();
@@ -669,47 +820,48 @@
} else if( (string = OSDynamicCast( OSString, prop ))) {
names = string->getCStringNoCopy();
lastName = names + string->getLength() + 1;
- } else
- return( 0 );
-
- ckey = key->getCStringNoCopy();
- keyLen = key->getLength();
- wild = ('*' == key->getChar( keyLen - 1 ));
-
- do {
- // for each name in the property
- if( wild)
- matched = (0 == strncmp( ckey, names, keyLen - 1 ));
- else
- matched = (keyLen == strlen( names ))
- && (0 == strncmp( ckey, names, keyLen ));
-
- if( matched)
- result = names;
-
- names = names + strlen( names) + 1;
-
- } while( (names < lastName) && (false == matched));
-
- return( result);
+ } else names = 0;
+
+ if (names) {
+ ckey = key->getCStringNoCopy();
+ keyLen = key->getLength();
+ wild = ('*' == key->getChar( keyLen - 1 ));
+
+ do {
+ // for each name in the property
+ nlen = strnlen(names, lastName - names);
+ if( wild)
+ matched = ((nlen >= (keyLen - 1)) && (0 == strncmp(ckey, names, keyLen - 1)));
+ else
+ matched = (keyLen == nlen) && (0 == strncmp(ckey, names, keyLen));
+
+ if( matched)
+ result = names;
+
+ names = names + nlen + 1;
+
+ } while( (names < lastName) && (false == matched));
+ }
+
+ if (result && matchingName) *matchingName = OSString::withCString( result );
+
+ if (prop) prop->release();
+
+ return (result != 0);
}
bool IODTCompareNubName( const IORegistryEntry * regEntry,
OSString * name, OSString ** matchingName )
{
- const char *result;
- bool matched;
-
- matched = (0 != (result = CompareKey( name, regEntry, gIODTNameKey)))
- || (0 != (result = CompareKey( name, regEntry, gIODTCompatibleKey)))
- || (0 != (result = CompareKey( name, regEntry, gIODTTypeKey)))
- || (0 != (result = CompareKey( name, regEntry, gIODTModelKey)));
-
- if( result && matchingName)
- *matchingName = OSString::withCString( result );
-
- return( result != 0 );
+ bool matched;
+
+ matched = CompareKey( name, regEntry, gIODTNameKey, matchingName)
+ || CompareKey( name, regEntry, gIODTCompatibleKey, matchingName)
+ || CompareKey( name, regEntry, gIODTTypeKey, matchingName)
+ || CompareKey( name, regEntry, gIODTModelKey, matchingName);
+
+ return (matched);
}
bool IODTMatchNubWithKeys( IORegistryEntry * regEntry,
@@ -724,8 +876,8 @@
result = regEntry->compareNames( obj );
obj->release();
}
-#ifdef DEBUG
- else IOLog("Couldn't unserialize %s\n", keys );
+#if DEBUG
+ else IOLog("Couldn't unserialize %s\n", keys );
#endif
return( result );
@@ -734,39 +886,48 @@
OSCollectionIterator * IODTFindMatchingEntries( IORegistryEntry * from,
IOOptionBits options, const char * keys )
{
- OSSet *result;
+ OSSet *result = 0;
IORegistryEntry *next;
IORegistryIterator *iter;
OSCollectionIterator *cIter;
bool cmp;
bool minus = options & kIODTExclusive;
- result = OSSet::withCapacity( 3 );
- if( !result)
- return( 0);
iter = IORegistryIterator::iterateOver( from, gIODTPlane,
(options & kIODTRecursive) ? kIORegistryIterateRecursively : 0 );
if( iter) {
- while( (next = iter->getNextObject())) {
-
- // Look for existence of a debug property to skip
- if( next->getProperty("AAPL,ignore"))
- continue;
-
- if( keys) {
- cmp = IODTMatchNubWithKeys( next, keys );
- if( (minus && (false == cmp))
- || ((false == minus) && (false != cmp)) )
+
+ do {
+
+ if( result)
+ result->release();
+ result = OSSet::withCapacity( 3 );
+ if( !result)
+ break;
+
+ iter->reset();
+ while( (next = iter->getNextObject())) {
+
+ // Look for existence of a debug property to skip
+ if( next->getProperty("AAPL,ignore"))
+ continue;
+
+ if( keys) {
+ cmp = IODTMatchNubWithKeys( next, keys );
+ if( (minus && (false == cmp))
+ || ((false == minus) && (false != cmp)) )
+ result->setObject( next);
+ } else
result->setObject( next);
- } else
- result->setObject( next);
- }
+ }
+ } while( !iter->isValid());
+
iter->release();
}
cIter = OSCollectionIterator::withCollection( result);
- result->release();
+ if (result) result->release();
return( cIter);
}
@@ -774,33 +935,101 @@
struct IODTPersistent {
IODTCompareAddressCellFunc compareFunc;
- IODTNVLocationFunc locationFunc;
};
void IODTSetResolving( IORegistryEntry * regEntry,
IODTCompareAddressCellFunc compareFunc,
- IODTNVLocationFunc locationFunc )
-{
- IODTPersistent persist;
- OSData *prop;
-
- persist.compareFunc = compareFunc;
- persist.locationFunc = locationFunc;
- prop = OSData::withBytes( &persist, sizeof( persist));
- if( !prop)
- return;
-
- regEntry->setProperty( gIODTPersistKey, prop);
- prop->release();
+ IODTNVLocationFunc locationFunc __unused )
+{
+ IODTPersistent persist;
+ IODTPersistent * entry;
+ OSNumber * num;
+ unsigned int index, count;
+
+ IOLockLock(gIODTResolversLock);
+
+ count = (gIODTResolvers->getLength() / sizeof(IODTPersistent));
+ entry = (typeof(entry)) gIODTResolvers->getBytesNoCopy();
+ for (index = 0; index < count; index++)
+ {
+ if (compareFunc == entry->compareFunc) break;
+ entry++;
+ }
+ if (index == count)
+ {
+ persist.compareFunc = compareFunc;
+ if (!gIODTResolvers->appendBytes(&persist, sizeof(IODTPersistent))) panic("IODTSetResolving");
+ }
+
+ IOLockUnlock(gIODTResolversLock);
+
+ num = OSNumber::withNumber(index, 32);
+ regEntry->setProperty(gIODTPersistKey, num);
+ OSSafeReleaseNULL(num);
+
return;
}
+#if defined(__arm64__)
+static SInt64 DefaultCompare( UInt32 cellCount, UInt32 left[], UInt32 right[] )
+{
+ SInt64 diff = 0;
+
+ if (cellCount == 2) {
+ diff = IOPhysical32(left[1], left[0]) - IOPhysical32(right[1], right[0]);
+ } else if (cellCount == 1) {
+ diff = ( left[0] - right[0] );
+ } else {
+ panic("DefaultCompare only knows how to handle 1 or 2 cells.");
+ }
+
+ return diff;
+}
+#elif defined(__arm__) || defined(__i386__) || defined(__x86_64__)
static SInt32 DefaultCompare( UInt32 cellCount, UInt32 left[], UInt32 right[] )
{
- cellCount--;
- return( left[ cellCount ] - right[ cellCount ] );
-}
-
+ cellCount--;
+ return( left[ cellCount ] - right[ cellCount ] );
+}
+#else
+#error Unknown architecture.
+#endif
+
+static void AddLengthToCells( UInt32 numCells, UInt32 *cells, UInt64 offset)
+{
+ if (numCells == 1)
+ {
+ cells[0] += (UInt32)offset;
+ }
+ else {
+#if defined(__arm64__) || defined(__arm__)
+ UInt64 sum = cells[numCells - 2] + offset;
+ cells[numCells - 2] = (UInt32)sum;
+ if (sum > UINT32_MAX) {
+ cells[numCells - 1] += (UInt32)(sum >> 32);
+ }
+#else
+ UInt64 sum = cells[numCells - 1] + offset;
+ cells[numCells - 1] = (UInt32)sum;
+ if (sum > UINT32_MAX) {
+ cells[numCells - 2] += (UInt32)(sum >> 32);
+ }
+#endif
+ }
+}
+
+static IOPhysicalAddress CellsValue( UInt32 numCells, UInt32 *cells)
+{
+ if (numCells == 1) {
+ return IOPhysical32( 0, cells[0] );
+ } else {
+#if defined(__arm64__) || defined(arm)
+ return IOPhysical32( cells[numCells - 1], cells[numCells - 2] );
+#else
+ return IOPhysical32( cells[numCells - 2], cells[numCells - 1] );
+#endif
+ }
+}
void IODTGetCellCounts( IORegistryEntry * regEntry,
UInt32 * sizeCount, UInt32 * addressCount)
@@ -809,7 +1038,7 @@
*sizeCount = 1;
if( !GetUInt32( regEntry, gIODTAddressCellKey, addressCount))
*addressCount = 2;
- return;
+ return;
}
// Given addr & len cells from our child, find it in our ranges property, then
@@ -818,90 +1047,157 @@
// Range[]: child-addr our-addr child-len
// #cells: child ours child
-bool IODTResolveAddressCell( IORegistryEntry * regEntry,
+bool IODTResolveAddressCell( IORegistryEntry * startEntry,
UInt32 cellsIn[],
- IOPhysicalAddress * phys, IOPhysicalLength * len )
-{
- IORegistryEntry *parent;
- OSData *prop;
+ IOPhysicalAddress * phys, IOPhysicalLength * lenOut )
+{
+ IORegistryEntry * parent;
+ IORegistryEntry * regEntry;
+ OSData * prop;
+ OSNumber * num;
+ unsigned int index, count;
// cells in addresses at regEntry
- UInt32 sizeCells, addressCells;
+ UInt32 sizeCells, addressCells;
// cells in addresses below regEntry
- UInt32 childSizeCells, childAddressCells;
- UInt32 childCells;
- UInt32 cell[ 5 ], offset = 0, length;
- UInt32 *range;
- UInt32 *endRanges;
- bool ok = true;
- SInt32 diff;
-
- IODTPersistent *persist;
+ UInt32 childSizeCells, childAddressCells;
+ UInt32 childCells;
+ UInt32 cell[ 8 ], propLen;
+ UInt64 offset = 0;
+ UInt32 endCell[ 8 ];
+ UInt32 *range;
+ UInt32 *lookRange;
+ UInt32 *startRange;
+ UInt32 *endRanges;
+ bool ok = true;
+ SInt64 diff, diff2, endDiff;
+ UInt64 len, rangeLen;
+
+ IODTPersistent *persist;
IODTCompareAddressCellFunc compare;
+ regEntry = startEntry;
IODTGetCellCounts( regEntry, &childSizeCells, &childAddressCells );
childCells = childAddressCells + childSizeCells;
- bcopy( cellsIn, cell, 4 * childCells );
- if( childSizeCells > 1)
- *len = IOPhysical32( cellsIn[ childAddressCells ],
- cellsIn[ childAddressCells + 1 ] );
- else
- *len = IOPhysical32( 0, cellsIn[ childAddressCells ] );
-
- do {
+ if (childCells > sizeof(cell)/sizeof(cell[0]))
+ panic("IODTResolveAddressCell: Invalid device tree (%u,%u)", (uint32_t)childAddressCells, (uint32_t)childSizeCells);
+
+ bcopy( cellsIn, cell, sizeof(UInt32) * childCells );
+ *lenOut = CellsValue( childSizeCells, cellsIn + childAddressCells );
+
+ do
+ {
prop = OSDynamicCast( OSData, regEntry->getProperty( gIODTRangeKey ));
if( 0 == prop) {
- /* end of the road */
- *phys = IOPhysical32( 0, cell[ childAddressCells - 1 ] + offset);
+ /* end of the road */
+ *phys = CellsValue( childAddressCells, cell );
+ *phys += offset;
+ if (regEntry != startEntry) regEntry->release();
break;
}
- parent = regEntry->getParentEntry( gIODTPlane );
- IODTGetCellCounts( parent, &sizeCells, &addressCells );
-
- if( (length = prop->getLength())) {
+ parent = regEntry->copyParentEntry( gIODTPlane );
+ IODTGetCellCounts( parent, &sizeCells, &addressCells );
+
+ if( (propLen = prop->getLength())) {
// search
- range = (UInt32 *) prop->getBytesNoCopy();
- endRanges = range + (length / 4);
-
- prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
- if( prop) {
- persist = (IODTPersistent *) prop->getBytesNoCopy();
- compare = persist->compareFunc;
- } else
+ startRange = (UInt32 *) prop->getBytesNoCopy();
+ range = startRange;
+ endRanges = range + (propLen / sizeof(UInt32));
+
+ compare = NULL;
+ num = OSDynamicCast(OSNumber, regEntry->getProperty(gIODTPersistKey));
+ if (num)
+ {
+ IOLockLock(gIODTResolversLock);
+ index = num->unsigned32BitValue();
+ count = gIODTResolvers->getLength() / sizeof(IODTPersistent);
+ if (index < count)
+ {
+ persist = ((IODTPersistent *) gIODTResolvers->getBytesNoCopy()) + index;
+ compare = persist->compareFunc;
+ }
+ IOLockUnlock(gIODTResolversLock);
+ }
+
+ if (!compare && (addressCells == childAddressCells)) {
compare = DefaultCompare;
+ }
+ if (!compare) {
+ panic("There is no mixed comparison function yet...");
+ }
for( ok = false;
- range < endRanges;
- range += (childCells + addressCells) ) {
-
- // is cell >= range start?
+ range < endRanges;
+ range += (childCells + addressCells) ) {
+
+ // is cell start within range?
diff = (*compare)( childAddressCells, cell, range );
- if( diff < 0)
+
+ if (childAddressCells > sizeof(endCell)/sizeof(endCell[0]))
+ panic("IODTResolveAddressCell: Invalid device tree (%u)", (uint32_t)childAddressCells);
+
+ bcopy(range, endCell, childAddressCells * sizeof(UInt32));
+
+ rangeLen = CellsValue(childSizeCells, range + childAddressCells + addressCells);
+ AddLengthToCells(childAddressCells, endCell, rangeLen);
+
+ diff2 = (*compare)( childAddressCells, cell, endCell );
+
+ // if start of cell < start of range, or end of range >= start of cell, skip
+ if ((diff < 0) || (diff2 >= 0))
continue;
-
- // is cell + size <= range end?
- if( (diff + cell[ childCells - 1 ])
- > range[ childCells + addressCells - 1 ])
- continue;
-
+
+ len = CellsValue(childSizeCells, cell + childAddressCells);
+ ok = (0 == len);
+
+ if (!ok)
+ {
+ // search for cell end
+ bcopy(cell, endCell, childAddressCells * sizeof(UInt32));
+
+ AddLengthToCells(childAddressCells, endCell, len - 1);
+
+ for( lookRange = startRange;
+ lookRange < endRanges;
+ lookRange += (childCells + addressCells) )
+ {
+ // make sure end of cell >= range start
+ endDiff = (*compare)( childAddressCells, endCell, lookRange );
+ if( endDiff < 0)
+ continue;
+
+ UInt64 rangeStart = CellsValue(addressCells, range + childAddressCells);
+ UInt64 lookRangeStart = CellsValue(addressCells, lookRange + childAddressCells);
+ if ((endDiff - len + 1 + lookRangeStart) == (diff + rangeStart))
+ {
+ ok = true;
+ break;
+ }
+ }
+ if (!ok)
+ continue;
+ }
offset += diff;
- ok = true;
break;
}
+ if (addressCells + sizeCells > sizeof(cell)/sizeof(cell[0]))
+ panic("IODTResolveAddressCell: Invalid device tree (%u, %u)", (uint32_t)addressCells, (uint32_t)sizeCells);
+
// Get the physical start of the range from our parent
- bcopy( range + childAddressCells, cell, 4 * addressCells );
- bzero( cell + addressCells, 4 * sizeCells );
+ bcopy( range + childAddressCells, cell, sizeof(UInt32) * addressCells );
+ bzero( cell + addressCells, sizeof(UInt32) * sizeCells );
} /* else zero length range => pass thru to parent */
- regEntry = parent;
- childSizeCells = sizeCells;
- childAddressCells = addressCells;
- childCells = childAddressCells + childSizeCells;
-
- } while( ok && regEntry);
+ if (regEntry != startEntry) regEntry->release();
+ regEntry = parent;
+ childSizeCells = sizeCells;
+ childAddressCells = addressCells;
+ childCells = childAddressCells + childSizeCells;
+ }
+ while( ok && regEntry);
return( ok);
}
@@ -921,107 +1217,45 @@
OSArray *array;
IODeviceMemory *range;
- parentEntry = regEntry->getParentEntry( gIODTPlane );
- addressProperty = (OSData *) regEntry->getProperty( addressPropertyName );
- if( (0 == addressProperty) || (0 == parentEntry))
- return( 0);
-
- IODTGetCellCounts( parentEntry, &sizeCells, &addressCells );
- if( 0 == sizeCells)
- return( 0);
-
- cells = sizeCells + addressCells;
- reg = (UInt32 *) addressProperty->getBytesNoCopy();
- num = addressProperty->getLength() / (4 * cells);
-
- array = OSArray::withCapacity( 1 );
- if( 0 == array)
- return( 0);
-
- for( i = 0; i < num; i++) {
- if( IODTResolveAddressCell( parentEntry, reg, &phys, &len )) {
- range = 0;
- if( parent)
- range = IODeviceMemory::withSubRange( parent,
- phys - parent->getPhysicalAddress(), len );
- if( 0 == range)
- range = IODeviceMemory::withRange( phys, len );
- if( range)
- array->setObject( range );
- }
- reg += cells;
- }
-
- regEntry->setProperty( gIODeviceMemoryKey, array);
- array->release(); /* ??? */
-
- return( array);
-}
-
-static void IODTGetNVLocation(
- IORegistryEntry * parent,
- IORegistryEntry * regEntry,
- UInt8 * busNum, UInt8 * deviceNum, UInt8 * functionNum )
-{
-
- OSData *prop;
- IODTPersistent *persist;
- UInt32 *cell;
-
- prop = (OSData *) parent->getProperty( gIODTPersistKey );
- if( prop) {
- persist = (IODTPersistent *) prop->getBytesNoCopy();
- (*persist->locationFunc)( regEntry, busNum, deviceNum, functionNum );
- } else {
- prop = (OSData *) regEntry->getProperty( "reg" );
- *functionNum = 0;
- if( prop) {
- cell = (UInt32 *) prop->getBytesNoCopy();
- *busNum = 3;
- *deviceNum = 0x1f & (cell[ 0 ] >> 24);
- } else {
- *busNum = 0;
- *deviceNum = 0;
- }
- }
- return;
-}
-
-/*
- * Try to make the same messed up descriptor as Mac OS
- */
-
-IOReturn IODTMakeNVDescriptor( IORegistryEntry * regEntry,
- IONVRAMDescriptor * hdr )
-{
- IORegistryEntry *parent;
- UInt32 level;
- UInt32 bridgeDevices;
- UInt8 busNum;
- UInt8 deviceNum;
- UInt8 functionNum;
-
- hdr->format = 1;
- hdr->marker = 0;
-
- for(level = 0, bridgeDevices = 0;
- (parent = regEntry->getParentEntry( gIODTPlane )) && (level < 7); level++ ) {
-
- IODTGetNVLocation( parent, regEntry,
- &busNum, &deviceNum, &functionNum );
- if( level)
- bridgeDevices |= ((deviceNum & 0x1f) << ((level - 1) * 5));
- else {
- hdr->busNum = busNum;
- hdr->deviceNum = deviceNum;
- hdr->functionNum = functionNum;
- }
- regEntry = parent;
- }
- hdr->bridgeCount = level - 2;
- hdr->bridgeDevices = bridgeDevices;
-
- return( kIOReturnSuccess );
+ array = 0;
+ do
+ {
+ parentEntry = regEntry->copyParentEntry( gIODTPlane );
+ addressProperty = (OSData *) regEntry->getProperty( addressPropertyName );
+ if( (0 == addressProperty) || (0 == parentEntry)) break;
+
+ IODTGetCellCounts( parentEntry, &sizeCells, &addressCells );
+ if( 0 == sizeCells) break;
+
+ cells = sizeCells + addressCells;
+ reg = (UInt32 *) addressProperty->getBytesNoCopy();
+ num = addressProperty->getLength() / (4 * cells);
+
+ array = OSArray::withCapacity( 1 );
+ if( 0 == array) break;
+
+ for( i = 0; i < num; i++) {
+ if( IODTResolveAddressCell( parentEntry, reg, &phys, &len )) {
+ range = 0;
+ if( parent)
+ range = IODeviceMemory::withSubRange( parent,
+ phys - parent->getPhysicalSegment(0, 0, kIOMemoryMapperNone), len );
+ if( 0 == range)
+ range = IODeviceMemory::withRange( phys, len );
+ if( range)
+ array->setObject( range );
+ }
+ reg += cells;
+ }
+
+ regEntry->setProperty( gIODeviceMemoryKey, array);
+ array->release(); /* ??? */
+ }
+ while (false);
+
+ OSSafeReleaseNULL(parentEntry);
+
+ return (array);
}
OSData * IODTFindSlotName( IORegistryEntry * regEntry, UInt32 deviceNumber )
@@ -1031,44 +1265,54 @@
OSData *ret = 0;
UInt32 *bits;
UInt32 i;
+ size_t nlen;
char *names;
char *lastName;
UInt32 mask;
data = (OSData *) regEntry->getProperty("AAPL,slot-name");
- if( data)
- return( data);
- parent = regEntry->getParentEntry( gIODTPlane );
- if( !parent)
- return( 0 );
- data = OSDynamicCast( OSData, parent->getProperty("slot-names"));
- if( !data)
- return( 0 );
- if( data->getLength() <= 4)
- return( 0 );
-
- bits = (UInt32 *) data->getBytesNoCopy();
- mask = *bits;
- if( (0 == (mask & (1 << deviceNumber))))
- return( 0 );
-
- names = (char *)(bits + 1);
- lastName = names + (data->getLength() - 4);
-
- for( i = 0; (i <= deviceNumber) && (names < lastName); i++ ) {
-
- if( mask & (1 << i)) {
- if( i == deviceNumber) {
- data = OSData::withBytesNoCopy( names, 1 + strlen( names));
- if( data) {
- regEntry->setProperty("AAPL,slot-name", data);
- ret = data;
- data->release();
- }
- } else
- names += 1 + strlen( names);
+ if (data) return (data);
+
+ do
+ {
+ parent = regEntry->copyParentEntry( gIODTPlane );
+ if (!parent) break;
+
+ data = OSDynamicCast( OSData, parent->getProperty("slot-names"));
+ if (!data) break;
+ if (data->getLength() <= 4) break;
+
+ bits = (UInt32 *) data->getBytesNoCopy();
+ mask = *bits;
+ if ((0 == (mask & (1 << deviceNumber)))) break;
+
+ names = (char *)(bits + 1);
+ lastName = names + (data->getLength() - 4);
+
+ for( i = 0; (i <= deviceNumber) && (names < lastName); i++ ) {
+
+ if( mask & (1 << i)) {
+ nlen = 1 + strnlen(names, lastName - names);
+ if( i == deviceNumber) {
+ data = OSData::withBytesNoCopy(names, nlen);
+ if( data) {
+ regEntry->setProperty("AAPL,slot-name", data);
+ ret = data;
+ data->release();
+ }
+ } else
+ names += nlen;
+ }
}
}
+ while (false);
+
+ OSSafeReleaseNULL(parent);
return( ret );
}
+
+extern "C" IOReturn IONDRVLibrariesInitialize( IOService * provider )
+{
+ return( kIOReturnUnsupported );
+}