xnu-1504.7.4.tar.gz

[apple/xnu.git] / iokit / Kernel / IOMapper.cpp

diff --git a/iokit/Kernel/IOMapper.cpp b/iokit/Kernel/IOMapper.cpp
index f2f0633c3f96ff865e5059fe3e498951c224ac1c..171e22ff34b6c4a1d5dcdfa22a0f9e541bbe53bf 100644 (file)
--- a/iokit/Kernel/IOMapper.cpp
+++ b/iokit/Kernel/IOMapper.cpp
@@ -1,26 +1,33 @@
 /*
  * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 1998-2004 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,
  * 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 <IOKit/IOLib.h>
 #include <IOKit/IOMapper.h>
  */
 #include <IOKit/IOLib.h>
 #include <IOKit/IOMapper.h>

+#include <IOKit/IODMACommand.h>

 #include <libkern/c++/OSData.h>
 
 #include "IOCopyMapper.h"
 #include <libkern/c++/OSData.h>
 
 #include "IOCopyMapper.h"


@@ -33,8 +40,8 @@ __END_DECLS
 OSDefineMetaClassAndAbstractStructors(IOMapper, IOService);
 
 OSMetaClassDefineReservedUsed(IOMapper, 0);
 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);
 OSMetaClassDefineReservedUnused(IOMapper, 3);
 OSMetaClassDefineReservedUnused(IOMapper, 4);
 OSMetaClassDefineReservedUnused(IOMapper, 5);


@@ -67,6 +74,7 @@ static IOMapperLock sMapperLock;
 
 bool IOMapper::start(IOService *provider)
 {
 
 bool IOMapper::start(IOService *provider)
 {

+    OSObject * obj;

     if (!super::start(provider))
         return false;
 
     if (!super::start(provider))
         return false;
 


@@ -80,6 +88,14 @@ bool IOMapper::start(IOService *provider)
         sMapperLock.unlock();
     }
 
         sMapperLock.unlock();
     }
 

+    if (provider)
+    {
+       obj = provider->getProperty("iommu-id");
+       if (!obj)
+           obj = provider->getProperty("AAPL,phandle");
+       if (obj)
+           setProperty(gIOMapperIDKey, obj);
+    }

     return true;
 }
 
     return true;
 }
 


@@ -117,11 +133,48 @@ void IOMapper::setMapperRequired(bool hasMapper)
 void IOMapper::waitForSystemMapper()
 {
     sMapperLock.lock();
 void IOMapper::waitForSystemMapper()
 {
     sMapperLock.lock();

-    while ((vm_address_t) IOMapper::gSystem & kWaitMask)
+    while ((uintptr_t) IOMapper::gSystem & kWaitMask)

         sMapperLock.sleep(&IOMapper::gSystem);
     sMapperLock.unlock();
 }
 
         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)
 {
 void IOMapper::iovmInsert(ppnum_t addr, IOItemCount offset,
                             ppnum_t *pageList, IOItemCount pageCount)
 {


@@ -145,8 +198,8 @@ NewARTTable(IOByteCount size, void ** virtAddrP, ppnum_t *physAddrP)
     kern_return_t kr;
     vm_address_t address;
 
     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;
 
     if (kr)
         return 0;
 


@@ -167,7 +220,7 @@ void IOMapper::FreeARTTable(OSData *artHandle, IOByteCount size)
 {
     vm_address_t address = (vm_address_t) artHandle;
 
 {
     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
 }
 
     kmem_free(kernel_map, address, size);      // Just panic if address is 0
 }
 


@@ -344,7 +397,6 @@ mach_vm_address_t IOMallocPhysical(mach_vm_size_t size, mach_vm_address_t mask)
     {
        address = ptoa_64(gIOCopyMapper->iovmAlloc(atop_64(round_page(size))));
     }
     {
        address = ptoa_64(gIOCopyMapper->iovmAlloc(atop_64(round_page(size))));
     }

-

     return (address);
 }
 
     return (address);
 }