/*
* Copyright (c) 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,
- * 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 <kern/machine.h>
#include <IOKit/IOHibernatePrivate.h>
#include <vm/vm_page.h>
-#include "i386_lowmem.h"
+#include <i386/i386_lowmem.h>
#define MAX_BANKS 32
hibernate_bitmap_t dram_ranges[MAX_BANKS];
boot_args * args = (boot_args *) PE_state.bootArgs;
- mptr = args->MemoryMap;
+ mptr = (EfiMemoryRange *)ml_static_ptovirt(args->MemoryMap);
if (args->MemoryMapDescriptorSize == 0)
panic("Invalid memory map descriptor size");
msize = args->MemoryMapDescriptorSize;
case kEfiBootServicesCode:
case kEfiBootServicesData:
case kEfiConventionalMemory:
- case kEfiACPIReclaimMemory:
case kEfiACPIMemoryNVS:
case kEfiPalCode:
- if (!num_banks || (base != (1 + dram_ranges[num_banks - 1].last_page)))
+ for (bank = 0; bank < num_banks; bank++)
+ {
+ if (dram_ranges[bank].first_page <= base)
+ continue;
+ if ((base + num) == dram_ranges[bank].first_page)
+ {
+ dram_ranges[bank].first_page = base;
+ num = 0;
+ }
+ break;
+ }
+ if (!num) break;
+
+ if (bank && (base == (1 + dram_ranges[bank - 1].last_page)))
+ bank--;
+ else
{
num_banks++;
- if (num_banks >= MAX_BANKS)
- break;
- dram_ranges[num_banks - 1].first_page = base;
+ if (num_banks >= MAX_BANKS) break;
+ bcopy(&dram_ranges[bank],
+ &dram_ranges[bank + 1],
+ (num_banks - bank - 1) * sizeof(hibernate_bitmap_t));
+ dram_ranges[bank].first_page = base;
}
- dram_ranges[num_banks - 1].last_page = base + num - 1;
+ dram_ranges[bank].last_page = base + num - 1;
break;
// runtime services will be restarted, so no save
case kEfiRuntimeServicesCode:
case kEfiRuntimeServicesData:
+ // contents are volatile once the platform expert starts
+ case kEfiACPIReclaimMemory:
// non dram
case kEfiReservedMemoryType:
case kEfiUnusableMemory:
if (!list)
return (list);
- list->list_size = size;
+ list->list_size = (uint32_t)size;
list->page_count = page_count;
list->bank_count = num_banks;
{
boot_args * args = (boot_args *) PE_state.bootArgs;
+#if !defined(x86_64)
hibernate_set_page_state(page_list, page_list_wired,
I386_HIB_PAGETABLE, I386_HIB_PAGETABLE_COUNT,
kIOHibernatePageStateFree);
*pagesOut -= I386_HIB_PAGETABLE_COUNT;
+#endif
if (args->efiRuntimeServicesPageStart)
{
header->runtimePages = args->efiRuntimeServicesPageStart;
header->runtimePageCount = args->efiRuntimeServicesPageCount;
+ header->runtimeVirtualPages = args->efiRuntimeServicesVirtualPageStart;
+ if (args->Version == kBootArgsVersion1 && args->Revision >= kBootArgsRevision1_6) {
+ header->performanceDataStart = args->performanceDataStart;
+ header->performanceDataSize = args->performanceDataSize;
+ } else {
+ header->performanceDataStart = 0;
+ header->performanceDataSize = 0;
+ }
return (KERN_SUCCESS);
}
if (current_cpu_datap()->cpu_hibernate)
{
vm_page_lock_queues();
- mutex_lock(&vm_page_queue_free_lock);
+ lck_mtx_lock(&vm_page_queue_free_lock);
+
+ if (vm_page_local_q) {
+ uint32_t i;
+
+ for (i = 0; i < vm_page_local_q_count; i++) {
+ struct vpl *lq;
+
+ lq = &vm_page_local_q[i].vpl_un.vpl;
+
+ VPL_LOCK(&lq->vpl_lock);
+ }
+ }
}
}
{
if (current_cpu_datap()->cpu_hibernate)
{
- mutex_unlock(&vm_page_queue_free_lock);
+ if (vm_page_local_q) {
+ uint32_t i;
+
+ for (i = 0; i < vm_page_local_q_count; i++) {
+ struct vpl *lq;
+
+ lq = &vm_page_local_q[i].vpl_un.vpl;
+
+ VPL_UNLOCK(&lq->vpl_lock);
+ }
+ }
+ lck_mtx_unlock(&vm_page_queue_free_lock);
vm_page_unlock_queues();
}
}
projects / apple / xnu.git / blobdiff