xnu-344.21.73.tar.gz

[apple/xnu.git] / bsd / dev / ppc / mem.c

diff --git a/bsd/dev/ppc/mem.c b/bsd/dev/ppc/mem.c
index ba9a0f80037c0fc36656a1d70150b1296e99d33f..7bd8b66f7d42ec7329c865cba3e47b613cf6b244 100644 (file)
--- a/bsd/dev/ppc/mem.c
+++ b/bsd/dev/ppc/mem.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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@
  */
@@ -86,7 +89,6 @@
 
 static caddr_t devzerobuf;
 
-extern vm_offset_t mem_actual;
 extern pmap_t kernel_pmap;
 
 mmread(dev, uio)
@@ -112,6 +114,7 @@ mmrw(dev, uio, rw)
 {
        register int o;
        register u_int c, v;
+       addr64_t vll;
        register struct iovec *iov;
        int error = 0;
        vm_offset_t     where;
@@ -132,45 +135,48 @@ mmrw(dev, uio, rw)
 
 /* minor device 0 is physical memory */
                case 0:
-                       v = trunc_page(uio->uio_offset);
-                       if (uio->uio_offset >= ((dgWork.dgFlags & enaDiagDM) ? mem_actual : mem_size))
+                       vll = trunc_page_64(uio->uio_offset);
+                       if(((vll >> 31) == 1) || vll >= ((dgWork.dgFlags & enaDiagDM) ? mem_actual : max_mem))
                                goto fault;
 
-                       size= PAGE_SIZE;
-
                        if(dgWork.dgFlags & enaDiagDM) {                        /* Can we really get all memory? */
-                               if (kmem_alloc_pageable(kernel_map, &where, size) != KERN_SUCCESS) {
+                               if (kmem_alloc_pageable(kernel_map, &where, PAGE_SIZE) != KERN_SUCCESS) {
                                        goto fault;
                                }
                                else {
-                                       (void)mapping_make(kernel_pmap, 0, where, v, 
-                                               VM_PROT_READ, 2, 0);    /* Map it in for the moment */
+                                       addr64_t collad;
+                                       
+                                       collad = mapping_make(kernel_pmap, (addr64_t)where, (ppnum_t)(vll >> 12), 0, 1, VM_PROT_READ);  /* Map it in for the moment */
+                                       if(collad) {                                            /* See if it failed (shouldn't happen)  */
+                                               kmem_free(kernel_map, where, PAGE_SIZE);        /* Toss the page */
+                                               goto fault;                                             /* Kill the transfer */
+                                       }
                                }
                        }
                        else {
-                               if (kmem_alloc(kernel_map, &where, size) 
+                               if (kmem_alloc(kernel_map, &where, 4096) 
                                        != KERN_SUCCESS) {
                                        goto fault;
                                }
                        }
-                       o = uio->uio_offset - v;
+                       o = uio->uio_offset - vll;
                        c = min(PAGE_SIZE - o, (u_int)iov->iov_len);
-                       error = uiomove((caddr_t) (where + o), c, uio);
+                       error = uiomove((where + o), c, uio);
 
-                       if(dgWork.dgFlags & enaDiagDM) (void)mapping_remove(kernel_pmap, where);        /* Unmap it */
+                       if(dgWork.dgFlags & enaDiagDM) (void)mapping_remove(kernel_pmap, (addr64_t)where);      /* Unmap it */
                        kmem_free(kernel_map, where, PAGE_SIZE);
                        continue;
 
                /* minor device 1 is kernel memory */
                case 1:
                        /* Do some sanity checking */
-                       if (((caddr_t)uio->uio_offset >= VM_MAX_KERNEL_ADDRESS) ||
-                               ((caddr_t)uio->uio_offset <= VM_MIN_KERNEL_ADDRESS))
+                       if (((addr64_t)uio->uio_offset > vm_last_addr) ||
+                               ((addr64_t)uio->uio_offset < VM_MIN_KERNEL_ADDRESS))
                                goto fault;
                        c = iov->iov_len;
-                       if (!kernacc((caddr_t)uio->uio_offset, c))
+                       if (!kernacc(uio->uio_offset, c))
                                goto fault;
-                       error = uiomove((caddr_t)uio->uio_offset, (int)c, uio);
+                       error = uiomove64(uio->uio_offset, (int)c, uio);
                        continue;
 
                /* minor device 2 is EOF/RATHOLE */