/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <pexpert/device_tree.h>
+#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>
DTEntry mapEntry;
OSArray * stack;
OSData * prop;
- OSObject * obj;
OSDictionary * allInts;
vm_offset_t * dtMap;
- int propSize;
+ unsigned int propSize;
bool intMap;
bool freeDT;
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 );
// 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
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();
}
return( parent);
}
-int IODTGetLoaderInfo( char *key, void **infoAddr, int *infoSize )
+int IODTGetLoaderInfo( const char *key, void **infoAddr, int *infoSize )
{
IORegistryEntry *chosen;
OSData *propObj;
return 0;
}
-void IODTFreeLoaderInfo( char *key, void *infoAddr, int infoSize )
+void IODTFreeLoaderInfo( const char *key, void *infoAddr, int infoSize )
{
vm_offset_t range[2];
IORegistryEntry *chosen;
}
}
+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 )
{
vm_offset_t virt;
const OSSymbol *sym;
DTPropertyIterator dtIter;
void *prop;
- int propSize;
+ unsigned int propSize;
char *name;
char location[ 32 ];
bool noLocation = true;
} 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 );
}
}
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;
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;
*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;
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;
// 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,
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;
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;
}
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 );
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 );
result = regEntry->compareNames( obj );
obj->release();
}
-#ifdef DEBUG
+#if DEBUG
else IOLog("Couldn't unserialize %s\n", keys );
#endif
persist.compareFunc = compareFunc;
persist.locationFunc = locationFunc;
- prop = OSData::withBytes( &persist, sizeof( persist));
+ prop = OSData::withBytes( &persist, sizeof(persist));
if( !prop)
return;
+ prop->setSerializable(false);
regEntry->setProperty( gIODTPersistKey, prop);
prop->release();
return;
static SInt32 DefaultCompare( UInt32 cellCount, UInt32 left[], UInt32 right[] )
{
- cellCount--;
- return( left[ cellCount ] - right[ cellCount ] );
+ cellCount--;
+ return( left[ cellCount ] - right[ cellCount ] );
}
void IODTGetCellCounts( IORegistryEntry * regEntry,
// cells in addresses below regEntry
UInt32 childSizeCells, childAddressCells;
UInt32 childCells;
- UInt32 cell[ 5 ], offset = 0, length;
- UInt32 endCell[ 5 ];
+ UInt32 cell[ 8 ], length;
+ UInt64 offset = 0;
+ UInt32 endCell[ 8 ];
UInt32 *range;
UInt32 *lookRange;
UInt32 *startRange;
UInt32 *endRanges;
bool ok = true;
- SInt32 diff, endDiff;
+ SInt64 diff, diff2, endDiff;
IODTPersistent *persist;
IODTCompareAddressCellFunc compare;
IODTGetCellCounts( regEntry, &childSizeCells, &childAddressCells );
childCells = childAddressCells + childSizeCells;
- bcopy( cellsIn, cell, 4 * childCells );
+ 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 );
if( childSizeCells > 1)
- *len = IOPhysical32( cellsIn[ childAddressCells ],
- cellsIn[ childAddressCells + 1 ] );
+ *len = IOPhysical32( cellsIn[ childAddressCells + 1],
+ cellsIn[ childAddressCells] );
else
*len = IOPhysical32( 0, cellsIn[ childAddressCells ] );
{
prop = OSDynamicCast( OSData, regEntry->getProperty( gIODTRangeKey ));
if( 0 == prop) {
- /* end of the road */
- *phys = IOPhysical32( 0, cell[ childAddressCells - 1 ] + offset);
+ /* end of the road */
+ if (childAddressCells == 2) {
+ *phys = IOPhysical32( cell[ childAddressCells - 1 ], cell [ childAddressCells - 2 ]);
+ } else {
+ *phys = IOPhysical32( 0, cell[ childAddressCells - 1 ]);
+ }
+ *phys += offset;
break;
}
// search
startRange = (UInt32 *) prop->getBytesNoCopy();
range = startRange;
- endRanges = range + (length / 4);
+ endRanges = range + (length / sizeof(UInt32));
prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
if( prop) {
persist = (IODTPersistent *) prop->getBytesNoCopy();
compare = persist->compareFunc;
- } else
+ } else if (addressCells == childAddressCells) {
compare = DefaultCompare;
+ } else {
+ panic("There is no mixed comparison function yet...");
+ }
for( ok = false;
range < endRanges;
range += (childCells + addressCells) ) {
- // is cell start >= range start?
+ // 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));
+
+ if (childAddressCells == 2) {
+ uint64_t sum = endCell[childAddressCells - 2] + IOPhysical32(range[childCells + addressCells - 1], range[childCells + addressCells - 2]);
+ endCell[childAddressCells - 2] = (uint32_t)(sum & 0x00000000FFFFFFFFULL);
+ if (sum > UINT32_MAX) {
+ endCell[childAddressCells - 1] += (uint32_t)((sum & 0xFFFFFFFF00000000ULL) >> 32);
+ }
+ } else {
+ endCell[childAddressCells - 1] += range[childCells + addressCells - 1];
+ }
+
+ diff2 = (*compare)( childAddressCells, cell, endCell );
+
+ if ((diff < 0) || (diff2 >= 0))
continue;
ok = (0 == cell[childCells - 1]);
{
// search for cell end
bcopy(cell, endCell, childAddressCells * sizeof(UInt32));
- endCell[childAddressCells - 1] += cell[childCells - 1] - 1;
+
+ if (childSizeCells == 2) {
+ uint64_t sum;
+ sum = endCell[childAddressCells - 2] + IOPhysical32(cell[childCells - 1], cell[childCells - 2]) - 1;
+ endCell[childAddressCells - 2] = (uint32_t)(sum & 0x00000000FFFFFFFFULL);
+ if (sum > UINT32_MAX) {
+ endCell[childAddressCells - 1] += (uint32_t)((sum & 0xFFFFFFFF00000000ULL) >> 32);
+ }
+ } else {
+ endCell[childAddressCells - 1] += cell[childCells - 1] - 1;
+ }
lookRange = startRange;
for( ;
lookRange < endRanges;
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 */
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)
projects / apple / xnu.git / blobdiff