linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Dave Carroll <dcarroll@astekcorp.com>
To: 'Benjamin Herrenschmidt' <benh@kernel.crashing.org>
Cc: "Paul Mackerras \(E-mail\)" <paulus@samba.org>,
	"LPPC \(E-mail\)" <linuxppc-dev@lists.ozlabs.org>,
	"LKML \(E-mail\)" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2]powerpc: Force page alignment for initrd
Date: Fri, 20 May 2011 17:23:36 -0600	[thread overview]
Message-ID: <522F24EF533FC546962ECFA2054FF777373072AB72@MAILSERVER2.cos.astekcorp.com> (raw)
In-Reply-To: <1305930459.7481.194.camel@pasglop>


When using 64K pages with a separate cpio rootfs, U-Boot will align the roo=
tfs
on a 4K page boundary. When the memory is reserved, and subsequent early
memblock_alloc is called, it will allocate memory between the 64K page alig=
nment
and reserved memory. When the reserved memory is subsequently freed, it is =
done
so by pages, causing the early memblock_alloc requests to be re-used, which=
 in
my case, caused the device-tree to be clobbered.

This patch forces initrd to be kernel page aligned, to match the mechanism =
used
to free reserved memory.

Signed-off-by: Dave Carroll <dcarroll@astekcorp.com>
---
 arch/powerpc/kernel/prom.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 48aeb55..7e58f6b 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -555,7 +555,8 @@ static void __init early_reserve_mem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
        /* then reserve the initrd, if any */
        if (initrd_start && (initrd_end > initrd_start))
-               memblock_reserve(__pa(initrd_start), initrd_end - initrd_st=
art);
+               memblock_reserve(_ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE)=
,
+                       PAGE_ALIGN(initrd_end) - _ALIGN_DOWN(initrd_start, =
PAGE_SIZE));
 #endif /* CONFIG_BLK_DEV_INITRD */

 #ifdef CONFIG_PPC32
--
1.7.4

  reply	other threads:[~2011-05-20 23:23 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-20 21:26 [PATCH]powerpc: Force page alignment for early reserved memory Dave Carroll
2011-05-20 22:27 ` Benjamin Herrenschmidt
2011-05-20 23:23   ` Dave Carroll [this message]
2011-05-21 10:36     ` [v2] powerpc: Force page alignment for initrd Milton Miller
2011-05-21 17:05       ` [PATCH v3] powerpc: Force page alignment for initrd reserved memory Dave Carroll
2011-05-22 21:17         ` [PATCH v3] powerpc: Force page alignment for initrd reserved memory, " 'Milton Miller'
2011-05-23  1:29           ` Dave Carroll
2011-05-23  2:31           ` [PATCH v4] " Dave Carroll
2011-05-23 16:50             ` [ " Dave Carroll
2011-05-23 17:39               ` Milton Miller
2011-05-23 22:54                 ` [PATCH v5] " Dave Carroll
2011-05-25  9:28                   ` [v5] " Milton Miller
2011-05-26  2:00                     ` [PATCH v6] " Dave Carroll
2011-05-26  2:32                     ` [PATCH v7] " Dave Carroll
2011-05-26 11:18                       ` Milton Miller
2011-05-26 16:53                         ` [PATCH v8] " Dave Carroll
2011-06-11  1:38                     ` [PATCH 1/2] powerpc: Move free_initmem to common code Dave Carroll
2011-06-11  1:38                       ` [PATCH 2/2] powerpc: Add printk companion for ppc_md.progress Dave Carroll

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=522F24EF533FC546962ECFA2054FF777373072AB72@MAILSERVER2.cos.astekcorp.com \
    --to=dcarroll@astekcorp.com \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.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).