linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH] powerpc: mark pages that don't exist as nosave
Date: Thu, 03 May 2007 14:29:30 +0200	[thread overview]
Message-ID: <1178195370.13233.113.camel@johannes.berg> (raw)
In-Reply-To: <1178195106.13233.108.camel@johannes.berg>

On some powerpc architectures (notably 64-bit powermac) there is a memory
hole, for example on powermacs between 2G and 4G. Since we use the flat
memory model regardless, these pages must be marked as nosave (for suspend
to disk.)

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>

---
Tested on powerbook and G5 powermac.

---
 arch/powerpc/mm/mem.c |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

--- wireless-dev.orig/arch/powerpc/mm/mem.c	2007-05-03 14:20:25.959165535 +0200
+++ wireless-dev/arch/powerpc/mm/mem.c	2007-05-03 14:21:09.659165535 +0200
@@ -31,6 +31,7 @@
 #include <linux/highmem.h>
 #include <linux/initrd.h>
 #include <linux/pagemap.h>
+#include <linux/suspend.h>
 
 #include <asm/pgalloc.h>
 #include <asm/prom.h>
@@ -277,6 +278,28 @@ void __init do_init_bootmem(void)
 	init_bootmem_done = 1;
 }
 
+/* mark pages that don't exist as nosave */
+static int __init mark_nonram_nosave(void)
+{
+	unsigned long lmb_next_region_start_pfn,
+		      lmb_region_max_pfn;
+	int i;
+
+	for (i = 0; i < lmb.memory.cnt - 1; i++) {
+		lmb_region_max_pfn =
+			(lmb.memory.region[i].base >> PAGE_SHIFT) +
+			(lmb.memory.region[i].size >> PAGE_SHIFT);
+		lmb_next_region_start_pfn =
+			lmb.memory.region[i+1].base >> PAGE_SHIFT;
+
+		if (lmb_region_max_pfn < lmb_next_region_start_pfn)
+			register_nosave_region(lmb_region_max_pfn,
+					       lmb_next_region_start_pfn);
+	}
+
+	return 0;
+}
+
 /*
  * paging_init() sets up the page tables - in fact we've already done this.
  */
@@ -308,6 +331,8 @@ void __init paging_init(void)
 	max_zone_pfns[ZONE_DMA] = top_of_ram >> PAGE_SHIFT;
 #endif
 	free_area_init_nodes(max_zone_pfns);
+
+	mark_nonram_nosave();
 }
 #endif /* ! CONFIG_NEED_MULTIPLE_NODES */
 

  parent reply	other threads:[~2007-05-03 12:28 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-27 11:25 patches for 2.6.22 Paul Mackerras
2007-04-27 12:00 ` Johannes Berg
2007-04-27 21:41 ` [PATCH] powerpc: fix suspend states again Johannes Berg
2007-04-27 21:53   ` Olof Johansson
2007-04-27 21:54     ` Johannes Berg
2007-04-27 21:57       ` Olof Johansson
2007-04-27 22:00       ` [PATCH] powerpc: put enable_kernel_spe into a header Johannes Berg
2007-04-27 22:02       ` [PATCH v2] powerpc: fix suspend states again Johannes Berg
2007-04-27 23:13         ` Olof Johansson
2007-04-30  0:14         ` Paul Mackerras
2007-04-30 11:35           ` Johannes Berg
2007-04-30 11:37           ` [PATCH v3] " Johannes Berg
2007-05-01 14:16             ` Johannes Berg
2007-04-27 23:42 ` patches for 2.6.22 Arnd Bergmann
2007-04-28  2:49 ` [PATCH] cell: cbe_cpufreq cleanup and crash fix Arnd Bergmann
2007-04-28  7:49 ` [PATCH] powermac: proper sleep management Johannes Berg
2007-04-28  8:08   ` Paul Mackerras
2007-04-28 12:52     ` Johannes Berg
2007-04-28  8:38   ` Benjamin Herrenschmidt
2007-04-28 12:51     ` Johannes Berg
2007-04-28 12:01   ` Paul Mackerras
2007-04-28 13:46     ` Johannes Berg
2007-04-30  5:31       ` Paul Mackerras
2007-04-30 12:08         ` Johannes Berg
2007-05-01 12:14           ` Paul Mackerras
2007-05-01 12:24             ` Johannes Berg
2007-04-30 11:44   ` [PATCH v3] " Johannes Berg
2007-05-01  8:55     ` Johannes Berg
2007-04-30 19:51 ` patches for 2.6.22 Kim Phillips
2007-05-01  3:38   ` Paul Mackerras
2007-05-02 14:12   ` Kumar Gala
2007-05-02 14:19     ` Kim Phillips
2007-05-01  9:06 ` Johannes Berg
2007-05-02  5:33 ` [PATCH] adb: replace sleep notifier with platform driver suspend/resume hooks Johannes Berg
2007-05-02  5:34 ` [PATCH] apm_emu: use generic apm-emulation Johannes Berg
2007-05-02  5:36 ` [PATCH] via-pmu: remove LED sleep notifier Johannes Berg
2007-05-02 10:57   ` Stephen Rothwell
2007-05-02 14:32     ` [PATCH v2] " Johannes Berg
2007-05-07  8:47       ` Paul Mackerras
2007-05-07  8:58         ` Johannes Berg
2007-05-07 15:08         ` [PATCH v3] " Johannes Berg
2007-05-02  5:39 ` [PATCH] remove awacs dmasound Johannes Berg
2007-05-02  6:18 ` [PATCH] via-pmu: kill sleep notifiers completely Johannes Berg
2007-05-02  6:21 ` [PATCH] powermac: support G5 CPU hotplug Johannes Berg
2007-05-02 10:55   ` Paul Mackerras
2007-05-02 14:33     ` Johannes Berg
2007-05-02 17:57       ` Segher Boessenkool
2007-05-02 22:03       ` Benjamin Herrenschmidt
2007-05-02 23:47         ` Segher Boessenkool
2007-05-02 23:59           ` Benjamin Herrenschmidt
2007-05-03  0:05             ` Segher Boessenkool
2007-05-03  0:18               ` Benjamin Herrenschmidt
2007-05-03  0:01         ` Paul Mackerras
2007-05-03  0:08           ` Benjamin Herrenschmidt
2007-05-03  0:10             ` Benjamin Herrenschmidt
2007-05-03  0:19             ` Segher Boessenkool
2007-05-03  0:17           ` Segher Boessenkool
2007-05-03  0:21             ` Benjamin Herrenschmidt
2007-05-03  0:24               ` Benjamin Herrenschmidt
2007-05-03  1:01               ` Segher Boessenkool
2007-05-03  2:11                 ` Benjamin Herrenschmidt
2007-05-03 16:49                   ` Segher Boessenkool
2007-05-02 20:33     ` [PATCH v2] " Johannes Berg
2007-05-02  6:33 ` [PATCH] powerpc: MPIC sys_device & suspend/resume Johannes Berg
2007-05-02  6:35 ` [PATCH] powermac: fix G5-cpufreq for cpu on/offline Johannes Berg
2007-05-03 12:25 ` patches for 2.6.22 Johannes Berg
2007-05-03 12:28   ` [PATCH] powerpc: dart iommu suspend Johannes Berg
2007-05-03 12:30     ` Benjamin Herrenschmidt
2007-05-03 12:34       ` Johannes Berg
2007-05-03 12:34         ` Benjamin Herrenschmidt
2007-05-03 12:48       ` Johannes Berg
2007-05-03 14:24         ` Olof Johansson
2007-05-04 10:51           ` Johannes Berg
2007-05-03 12:29   ` Johannes Berg [this message]
2007-05-03 12:31   ` [PATCH] powermac: suspend to disk on G5 Johannes Berg
2007-07-17 13:28 ` [PATCH] remove awacs dmasound Johannes Berg
2007-07-17 13:37   ` Adrian Bunk
2007-07-17 13:43     ` Johannes Berg
  -- strict thread matches above, loose matches on Subject: below --
2007-05-08  9:25 [PATCH] powerpc: mark pages that don't exist as nosave Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1178195370.13233.113.camel@johannes.berg \
    --to=johannes@sipsolutions.net \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).