X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0c530ab8987f0ae6a1a3d9284f40182b88852816..b0d623f7f2ae71ed96e60569f61f9a9a27016e80:/iokit/Kernel/IODeviceTreeSupport.cpp diff --git a/iokit/Kernel/IODeviceTreeSupport.cpp b/iokit/Kernel/IODeviceTreeSupport.cpp index 5c3afed44..afb221cf4 100644 --- a/iokit/Kernel/IODeviceTreeSupport.cpp +++ b/iokit/Kernel/IODeviceTreeSupport.cpp @@ -1,23 +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@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ #include @@ -85,10 +91,9 @@ IODeviceTreeAlloc( void * dtTop ) DTEntry mapEntry; OSArray * stack; OSData * prop; - OSObject * obj; OSDictionary * allInts; vm_offset_t * dtMap; - int propSize; + unsigned int propSize; bool intMap; bool freeDT; @@ -138,7 +143,7 @@ IODeviceTreeAlloc( void * dtTop ) 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 ); @@ -187,7 +192,7 @@ IODeviceTreeAlloc( void * dtTop ) // free original device tree DTInit(0); IODTFreeLoaderInfo( "DeviceTree", - (void *)dtMap[0], round_page_32(dtMap[1]) ); + (void *)dtMap[0], (int) round_page(dtMap[1]) ); } // adjust tree @@ -204,6 +209,9 @@ IODeviceTreeAlloc( void * dtTop ) if( !intMap && child->getProperty( gIODTInterruptParentKey)) intMap = true; +#if __ppc__ + OSObject * obj; + // Look for a "driver,AAPL,MacOSX,PowerPC" property. if( (obj = child->getProperty( "driver,AAPL,MacOSX,PowerPC"))) { gIOCatalogue->addExtensionsFromArchive((OSData *)obj); @@ -216,10 +224,11 @@ IODeviceTreeAlloc( void * dtTop ) if( (obj = child->getProperty( "driver,AAPL,MacOS,PowerPC"))) { if( (0 == (prop = (OSData *)child->getProperty( gIODTTypeKey ))) - || (strcmp( "display", (char *) prop->getBytesNoCopy())) ) { + || (strncmp("display", (char *)prop->getBytesNoCopy(), sizeof("display"))) ) { child->removeProperty( "driver,AAPL,MacOS,PowerPC"); } } +#endif /* __ppc__ */ } regIter->release(); } @@ -302,11 +311,7 @@ static void FreePhysicalMemory( vm_offset_t * range ) { vm_offset_t virt; -#if defined (__i386__) - virt = ml_boot_ptovirt( range[0] ); -#else virt = ml_static_ptovirt( range[0] ); -#endif if( virt) { ml_static_mfree( virt, range[1] ); } @@ -322,7 +327,7 @@ MakeReferenceTable( DTEntry dtEntry, bool copy ) const OSSymbol *sym; DTPropertyIterator dtIter; void *prop; - int propSize; + unsigned int propSize; char *name; char location[ 32 ]; bool noLocation = true; @@ -367,17 +372,17 @@ MakeReferenceTable( DTEntry dtEntry, bool copy ) } else if( nameKey == gIODTUnitKey ) { // all OF strings are null terminated... except this one - if( propSize >= (int) sizeof( location)) - propSize = sizeof( location) - 1; + 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"))) { + } else if(noLocation && (!strncmp(name, "reg", sizeof("reg")))) { // default location - override later - sprintf( location, "%lX", *((UInt32 *) prop) ); + snprintf(location, sizeof(location), "%X", *((uint32_t *) prop)); regEntry->setLocation( location ); } } @@ -429,15 +434,21 @@ static bool GetUInt32( IORegistryEntry * regEntry, const OSSymbol * name, return( false ); } -IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry ) +static IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry, IOItemCount index ) { IORegistryEntry * parent; UInt32 phandle; + OSData * data; + unsigned int len; - if( GetUInt32( regEntry, gIODTInterruptParentKey, &phandle)) - parent = FindPHandle( phandle ); + 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")) + } else if( 0 == regEntry->getProperty( "interrupt-controller")) parent = regEntry->getParentEntry( gIODTPlane); else parent = 0; @@ -456,7 +467,7 @@ const OSSymbol * IODTInterruptControllerName( IORegistryEntry * regEntry ) 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; @@ -475,8 +486,8 @@ static void IODTGetICellCounts( IORegistryEntry * regEntry, *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; @@ -488,12 +499,12 @@ UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec, 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)))) + if( data && (data->getLength() >= (acells * sizeof(UInt32)))) addrCmp = (UInt32 *) data->getBytesNoCopy(); } original_icells = icells; @@ -514,7 +525,7 @@ UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec, // 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, @@ -523,7 +534,7 @@ UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec, 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; @@ -634,11 +645,12 @@ static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary * OSData * local2; UInt32 * localBits; UInt32 * localEnd; + IOItemCount index; OSData * map; OSObject * oneMap; OSArray * mapped; OSArray * controllerInts; - const OSSymbol * controller; + const OSSymbol * controller = 0; OSArray * controllers; UInt32 skip = 1; bool ok, nw; @@ -659,7 +671,8 @@ static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary * } 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 ); @@ -667,19 +680,20 @@ static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary * 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()); 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 ); @@ -830,7 +844,7 @@ bool IODTMatchNubWithKeys( IORegistryEntry * regEntry, result = regEntry->compareNames( obj ); obj->release(); } -#ifdef DEBUG +#if DEBUG else IOLog("Couldn't unserialize %s\n", keys ); #endif @@ -901,7 +915,7 @@ void IODTSetResolving( IORegistryEntry * regEntry, persist.compareFunc = compareFunc; persist.locationFunc = locationFunc; - prop = OSData::withBytes( &persist, sizeof( persist)); + prop = OSData::withBytes( &persist, sizeof(persist)); if( !prop) return; @@ -950,7 +964,7 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry, UInt32 *startRange; UInt32 *endRanges; bool ok = true; - SInt32 diff, endDiff; + SInt32 diff, diff2, endDiff; IODTPersistent *persist; IODTCompareAddressCellFunc compare; @@ -958,7 +972,7 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry, IODTGetCellCounts( regEntry, &childSizeCells, &childAddressCells ); childCells = childAddressCells + childSizeCells; - bcopy( cellsIn, cell, 4 * childCells ); + bcopy( cellsIn, cell, sizeof(UInt32) * childCells ); if( childSizeCells > 1) *len = IOPhysical32( cellsIn[ childAddressCells ], cellsIn[ childAddressCells + 1 ] ); @@ -981,7 +995,7 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry, // search startRange = (UInt32 *) prop->getBytesNoCopy(); range = startRange; - endRanges = range + (length / 4); + endRanges = range + (length / sizeof(UInt32)); prop = (OSData *) regEntry->getProperty( gIODTPersistKey ); if( prop) { @@ -994,9 +1008,14 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry, range < endRanges; range += (childCells + addressCells) ) { - // is cell start >= range start? + // is cell start within range? diff = (*compare)( childAddressCells, cell, range ); - if( diff < 0) + + bcopy(range, endCell, childAddressCells * sizeof(UInt32)); + endCell[childAddressCells - 1] += range[childCells + addressCells - 1]; + diff2 = (*compare)( childAddressCells, cell, endCell ); + + if ((diff < 0) || (diff2 >= 0)) continue; ok = (0 == cell[childCells - 1]); @@ -1029,8 +1048,8 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry, } // 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 */ @@ -1081,7 +1100,7 @@ OSArray * IODTResolveAddressing( IORegistryEntry * regEntry, range = 0; if( parent) range = IODeviceMemory::withSubRange( parent, - phys - parent->getPhysicalAddress(), len ); + phys - parent->getPhysicalSegment(0, 0, kIOMemoryMapperNone), len ); if( 0 == range) range = IODeviceMemory::withRange( phys, len ); if( range)