X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..7ee9d059c4eecf68ae4f8b0fb99ae2471eda79af:/iokit/Kernel/IOMapper.cpp?ds=inline diff --git a/iokit/Kernel/IOMapper.cpp b/iokit/Kernel/IOMapper.cpp index 56d412bf3..23b0db10e 100644 --- a/iokit/Kernel/IOMapper.cpp +++ b/iokit/Kernel/IOMapper.cpp @@ -27,10 +27,9 @@ */ #include #include +#include #include -#include "IOCopyMapper.h" - __BEGIN_DECLS extern ppnum_t pmap_find_phys(pmap_t pmap, addr64_t va); __END_DECLS @@ -39,8 +38,8 @@ __END_DECLS OSDefineMetaClassAndAbstractStructors(IOMapper, IOService); OSMetaClassDefineReservedUsed(IOMapper, 0); -OSMetaClassDefineReservedUnused(IOMapper, 1); -OSMetaClassDefineReservedUnused(IOMapper, 2); +OSMetaClassDefineReservedUsed(IOMapper, 1); +OSMetaClassDefineReservedUsed(IOMapper, 2); OSMetaClassDefineReservedUnused(IOMapper, 3); OSMetaClassDefineReservedUnused(IOMapper, 4); OSMetaClassDefineReservedUnused(IOMapper, 5); @@ -73,6 +72,7 @@ static IOMapperLock sMapperLock; bool IOMapper::start(IOService *provider) { + OSObject * obj; if (!super::start(provider)) return false; @@ -86,6 +86,14 @@ bool IOMapper::start(IOService *provider) sMapperLock.unlock(); } + if (provider) + { + obj = provider->getProperty("iommu-id"); + if (!obj) + obj = provider->getProperty("AAPL,phandle"); + if (obj) + setProperty(gIOMapperIDKey, obj); + } return true; } @@ -123,11 +131,48 @@ void IOMapper::setMapperRequired(bool hasMapper) void IOMapper::waitForSystemMapper() { sMapperLock.lock(); - while ((vm_address_t) IOMapper::gSystem & kWaitMask) + while ((uintptr_t) IOMapper::gSystem & kWaitMask) sMapperLock.sleep(&IOMapper::gSystem); sMapperLock.unlock(); } +IOMapper * IOMapper::copyMapperForDevice(IOService * device) +{ + OSObject * obj; + IOMapper * mapper; + OSDictionary * matching; + + obj = device->copyProperty("iommu-parent"); + if (!obj) + return (NULL); + + if ((mapper = OSDynamicCast(IOMapper, obj))) + return (mapper); + + matching = IOService::propertyMatching(gIOMapperIDKey, obj); + if (matching) + { + mapper = OSDynamicCast(IOMapper, IOService::waitForMatchingService(matching)); + matching->release(); + } + if (mapper) + device->setProperty("iommu-parent", mapper); + else + obj->release(); + + return (mapper); +} + +ppnum_t IOMapper::iovmAllocDMACommand(IODMACommand * command, IOItemCount pageCount) +{ + return (0); +} + +void IOMapper::iovmFreeDMACommand(IODMACommand * command, + ppnum_t addr, IOItemCount pageCount) +{ +} + void IOMapper::iovmInsert(ppnum_t addr, IOItemCount offset, ppnum_t *pageList, IOItemCount pageCount) { @@ -151,8 +196,8 @@ NewARTTable(IOByteCount size, void ** virtAddrP, ppnum_t *physAddrP) kern_return_t kr; vm_address_t address; - size = round_page_32(size); - kr = kmem_alloc_contig(kernel_map, &address, size, PAGE_MASK, 0); + size = round_page(size); + kr = kmem_alloc_contig(kernel_map, &address, size, PAGE_MASK, 0 /*max_pnum*/, 0 /*pnum_mask*/, false); if (kr) return 0; @@ -173,7 +218,7 @@ void IOMapper::FreeARTTable(OSData *artHandle, IOByteCount size) { vm_address_t address = (vm_address_t) artHandle; - size = round_page_32(size); + size = round_page(size); kmem_free(kernel_map, address, size); // Just panic if address is 0 } @@ -343,24 +388,4 @@ void IOMappedWrite64(IOPhysicalAddress address, UInt64 value) ml_phys_write_double((vm_offset_t) address, value); } -mach_vm_address_t IOMallocPhysical(mach_vm_size_t size, mach_vm_address_t mask) -{ - mach_vm_address_t address = 0; - if (gIOCopyMapper) - { - address = ptoa_64(gIOCopyMapper->iovmAlloc(atop_64(round_page(size)))); - } - - return (address); -} - -void IOFreePhysical(mach_vm_address_t address, mach_vm_size_t size) -{ - if (gIOCopyMapper) - { - gIOCopyMapper->iovmFree(atop_64(address), atop_64(round_page(size))); - } -} - - __END_DECLS