From: mlarkin <mlarkin@openbsd.org>
Date: Wed, 16 Jul 2014 17:44:16 +0000 (+0000)
Subject: Save and restore NVS ranges when hibernating, as per The Spec.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d3189fec8917b0d7012fa9e5337de731438b48b5;p=openbsd

Save and restore NVS ranges when hibernating, as per The Spec.

ok kettenis@, deraadt@
---

diff --git a/sys/arch/amd64/amd64/hibernate_machdep.c b/sys/arch/amd64/amd64/hibernate_machdep.c
index 5d8f8de31c5..97e2f8cf49f 100644
--- a/sys/arch/amd64/amd64/hibernate_machdep.c
+++ b/sys/arch/amd64/amd64/hibernate_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hibernate_machdep.c,v 1.25 2014/07/09 15:03:12 mlarkin Exp $	*/
+/*	$OpenBSD: hibernate_machdep.c,v 1.26 2014/07/16 17:44:16 mlarkin Exp $	*/
 
 /*
  * Copyright (c) 2012 Mike Larkin <mlarkin@openbsd.org>
@@ -57,6 +57,7 @@ extern	void hibernate_flush(void);
 extern	caddr_t start, end;
 extern	int mem_cluster_cnt;
 extern  phys_ram_seg_t mem_clusters[];
+extern	bios_memmap_t *bios_memmap;
 extern	struct hibernate_state *hibernate_state;
 
 /*
@@ -107,6 +108,7 @@ int
 get_hibernate_info_md(union hibernate_info *hiber_info)
 {
 	int i;
+	bios_memmap_t *bmp;
 
 	/* Calculate memory ranges */
 	hiber_info->nranges = mem_cluster_cnt;
@@ -120,6 +122,8 @@ get_hibernate_info_md(union hibernate_info *hiber_info)
 	}
 
 #if NACPI > 0
+	if (hiber_info->nranges >= VM_PHYSSEG_MAX)
+		return (1);
 	hiber_info->ranges[hiber_info->nranges].base = ACPI_TRAMPOLINE;
 	hiber_info->ranges[hiber_info->nranges].end =
 	    hiber_info->ranges[hiber_info->nranges].base + PAGE_SIZE;
@@ -127,6 +131,8 @@ get_hibernate_info_md(union hibernate_info *hiber_info)
 	hiber_info->nranges++;
 #endif
 #ifdef MULTIPROCESSOR
+	if (hiber_info->nranges >= VM_PHYSSEG_MAX)
+		return (1);
 	hiber_info->ranges[hiber_info->nranges].base = MP_TRAMPOLINE;
 	hiber_info->ranges[hiber_info->nranges].end =
 	    hiber_info->ranges[hiber_info->nranges].base + PAGE_SIZE;
@@ -134,6 +140,21 @@ get_hibernate_info_md(union hibernate_info *hiber_info)
 	hiber_info->nranges++;
 #endif
 
+	for (bmp = bios_memmap; bmp->type != BIOS_MAP_END; bmp++) {
+		/* Skip non-NVS ranges (already processed) */
+		if (bmp->type != BIOS_MAP_NVS)
+			continue;
+		if (hiber_info->nranges >= VM_PHYSSEG_MAX)
+			return (1);
+
+		i = hiber_info->nranges;	
+		hiber_info->ranges[i].base = round_page(bmp->addr);
+		hiber_info->ranges[i].end = trunc_page(bmp->addr + bmp->size);
+		hiber_info->image_size += hiber_info->ranges[i].end -
+			hiber_info->ranges[i].base;
+		hiber_info->nranges++;
+	}
+
 	hibernate_sort_ranges(hiber_info);
 
 	return (0);
diff --git a/sys/arch/i386/i386/hibernate_machdep.c b/sys/arch/i386/i386/hibernate_machdep.c
index b3e249f8ec9..f0078574a98 100644
--- a/sys/arch/i386/i386/hibernate_machdep.c
+++ b/sys/arch/i386/i386/hibernate_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hibernate_machdep.c,v 1.35 2014/07/09 15:03:12 mlarkin Exp $	*/
+/*	$OpenBSD: hibernate_machdep.c,v 1.36 2014/07/16 17:44:16 mlarkin Exp $	*/
 
 /*
  * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org>
@@ -55,6 +55,7 @@ extern	void hibernate_flush(void);
 extern	caddr_t start, end;
 extern	int ndumpmem;
 extern  struct dumpmem dumpmem[];
+extern	bios_memmap_t *bios_memmap;
 extern	struct hibernate_state *hibernate_state;
 
 /*
@@ -104,6 +105,7 @@ int
 get_hibernate_info_md(union hibernate_info *hiber_info)
 {
 	int i;
+	bios_memmap_t *bmp;
 
 	/* Calculate memory ranges */
 	hiber_info->nranges = ndumpmem;
@@ -117,6 +119,8 @@ get_hibernate_info_md(union hibernate_info *hiber_info)
 	}
 
 #if NACPI > 0
+	if (hiber_info->nranges >= VM_PHYSSEG_MAX)
+		return (1);
 	hiber_info->ranges[hiber_info->nranges].base = ACPI_TRAMPOLINE;
 	hiber_info->ranges[hiber_info->nranges].end =
 	    hiber_info->ranges[hiber_info->nranges].base + PAGE_SIZE;
@@ -124,6 +128,8 @@ get_hibernate_info_md(union hibernate_info *hiber_info)
 	hiber_info->nranges++;
 #endif
 #ifdef MULTIPROCESSOR
+	if (hiber_info->nranges >= VM_PHYSSEG_MAX)
+		return (1);
 	hiber_info->ranges[hiber_info->nranges].base = MP_TRAMPOLINE;
 	hiber_info->ranges[hiber_info->nranges].end =
 	    hiber_info->ranges[hiber_info->nranges].base + PAGE_SIZE;
@@ -131,6 +137,21 @@ get_hibernate_info_md(union hibernate_info *hiber_info)
 	hiber_info->nranges++;
 #endif
 
+	for (bmp = bios_memmap; bmp->type != BIOS_MAP_END; bmp++) {
+		/* Skip non-NVS ranges (already processed) */
+		if (bmp->type != BIOS_MAP_NVS)
+			continue;
+		if (hiber_info->nranges >= VM_PHYSSEG_MAX)
+			return (1);
+
+		i = hiber_info->nranges;	
+		hiber_info->ranges[i].base = round_page(bmp->addr);
+		hiber_info->ranges[i].end = trunc_page(bmp->addr + bmp->size);
+		hiber_info->image_size += hiber_info->ranges[i].end -
+			hiber_info->ranges[i].base;
+		hiber_info->nranges++;
+	}
+
 	hibernate_sort_ranges(hiber_info);
 
 	return (0);