xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / i386 / io_map.c

diff --git a/osfmk/i386/io_map.c b/osfmk/i386/io_map.c
index 9b7c831323e61e77f0425c4b2715c6277d3e4852..2a0a4adf4c411d7a6ee3d3eb5554986055ad2a88 100644 (file)
--- a/osfmk/i386/io_map.c
+++ b/osfmk/i386/io_map.c
@@ -1,17 +1,20 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *

  * 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
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
+ * 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.
+ *
+ * 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,
  * 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,


@@ -19,34 +22,34 @@
  * 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.
  * 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@

  */
 /*
  * @OSF_COPYRIGHT@
  */
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/* 
+/*

  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

- * 
+ *

  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.

- * 
+ *

  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.

- * 
+ *

  * Carnegie Mellon requests users of this software to return to
  * Carnegie Mellon requests users of this software to return to

- * 
+ *

  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890

- * 
+ *

  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */


@@ -58,31 +61,45 @@
 #include <vm/vm_map.h>
 #include <i386/pmap.h>
 #include <i386/io_map_entries.h>
 #include <vm/vm_map.h>
 #include <i386/pmap.h>
 #include <i386/io_map_entries.h>

+#include <san/kasan.h>

 
 

-extern vm_offset_t     virtual_avail;
+extern vm_offset_t      virtual_avail;

 
 /*
  * Allocate and map memory for devices that may need to be mapped before
  * Mach VM is running.
  */
 vm_offset_t
 
 /*
  * Allocate and map memory for devices that may need to be mapped before
  * Mach VM is running.
  */
 vm_offset_t

-io_map(phys_addr, size)
-       vm_offset_t     phys_addr;
-       vm_size_t       size;
+io_map(vm_map_offset_t phys_addr, vm_size_t size, unsigned int flags)

 {
 {

-       vm_offset_t     start;
+       vm_offset_t     start;

 
        if (kernel_map == VM_MAP_NULL) {
 
        if (kernel_map == VM_MAP_NULL) {

-           /*
-            * VM is not initialized.  Grab memory.
-            */
-           start = virtual_avail;
-           virtual_avail += round_page(size);
-       }
-       else {
-           (void) kmem_alloc_pageable(kernel_map, &start, round_page(size));
+               /*
+                * VM is not initialized.  Grab memory.
+                */
+               start = virtual_avail;
+               virtual_avail += round_page(size);
+
+#if KASAN
+               kasan_notify_address(start, size);
+#endif
+               (void) pmap_map_bd(start, phys_addr, phys_addr + round_page(size),
+                   VM_PROT_READ | VM_PROT_WRITE,
+                   flags);
+       } else {
+               (void) kmem_alloc_pageable(kernel_map, &start, round_page(size), VM_KERN_MEMORY_IOKIT);
+               (void) pmap_map(start, phys_addr, phys_addr + round_page(size),
+                   VM_PROT_READ | VM_PROT_WRITE,
+                   flags);

        }
        }

-       (void) pmap_map_bd(start, phys_addr, phys_addr + round_page(size),
-                       VM_PROT_READ|VM_PROT_WRITE);
-       return (start);
+       return start;
+}
+
+/* just wrap this since io_map handles it */
+
+vm_offset_t
+io_map_spec(vm_map_offset_t phys_addr, vm_size_t size, unsigned int flags)
+{
+       return io_map(phys_addr, size, flags);

 }
 }