[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1215051876.5628.35.camel@rzhang-dt.sh.intel.com>
Date: Thu, 03 Jul 2008 10:24:36 +0800
From: Zhang Rui <rui.zhang@...el.com>
To: linux-pm <linux-pm@...ts.linux-foundation.org>,
linux-acpi <linux-acpi@...r.kernel.org>,
linux-kernel <linux-kernel@...r.kernel.org>
Cc: "Rafael J. Wysocki" <rjw@...k.pl>, Len Brown <lenb@...nel.org>
Subject: [RFC PATCH 3/4] x86_64: mark ACPI NVS memory region
x86_64: Mark ACPI NVS memory region.
Signed-off-by: Zhang Rui <rui.zhang@...el.com>
---
arch/x86/kernel/e820_64.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
Index: linux-2.6/arch/x86/kernel/e820_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820_64.c 2008-06-19 15:09:52.000000000 +0800
+++ linux-2.6/arch/x86/kernel/e820_64.c 2008-06-19 15:11:45.000000000 +0800
@@ -19,6 +19,8 @@
#include <linux/mm.h>
#include <linux/suspend.h>
#include <linux/pfn.h>
+#include <linux/efi.h>
+#include <linux/acpi.h>
#include <asm/pgtable.h>
#include <asm/page.h>
@@ -377,6 +379,33 @@
}
}
+#ifdef CONFIG_HIBERNATION
+/* Mark ACPI NVS region, so that OS can save/restore it during hibernation */
+static int __init e820_mark_nvs_memory(void)
+{
+ int i;
+
+ if (efi_enabled)
+ return 0;
+
+ for (i = 0; i < e820.nr_map; i++) {
+ struct e820entry *ei = &e820.map[i];
+ unsigned long start, end;
+
+ if (ei->type != E820_NVS)
+ continue;
+ start = round_up(ei->addr, PAGE_SIZE) >> PAGE_SHIFT;
+ end = round_down(ei->addr + ei->size, PAGE_SIZE) >> PAGE_SHIFT;
+ if (start >= end)
+ continue;
+
+ acpi_mark_nvs_region(start, end - 1);
+ }
+ return 0;
+}
+core_initcall(e820_mark_nvs_memory);
+#endif
+
/*
* Finds an active region in the address range from start_pfn to end_pfn and
* returns its range in ei_startpfn and ei_endpfn for the e820 entry.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists