Skip to content

Commit

Permalink
[POWERPC] Fix detection of loader-supplied initrd on OF platforms
Browse files Browse the repository at this point in the history
Commit 79c8541 introduced code to move
the initrd if it was in a place where it would get overwritten by the
kernel image.  Unfortunately this exposed the fact that the code that
checks whether the values passed in r3 and r4 are intended to indicate
the start address and size of an initrd image was not as thorough as the
kernel's checks.  The symptom is that on OF-based platforms, the
bootwrapper can cause an exception which causes the system to drop back
into OF.

Previously it didn't matter so much if the code incorrectly thought that
there was an initrd, since the values for start and size were just passed
through to the kernel.  Now the bootwrapper needs to apply the same checks
as the kernel since it is now using the initrd data itself (in the process
of copying it if necessary).  This adds the code to do that.

Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Paul Mackerras committed Apr 13, 2007
1 parent 0727702 commit 390cbb5
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/powerpc/boot/of.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,8 @@ void platform_init(unsigned long a1, unsigned long a2, void *promptr)

prom = (int (*)(void *))promptr;
loader_info.promptr = promptr;
loader_info.initrd_addr = a1;
loader_info.initrd_size = a2;
if (a1 && a2 && a2 != 0xdeadbeef) {
loader_info.initrd_addr = a1;
loader_info.initrd_size = a2;
}
}

0 comments on commit 390cbb5

Please sign in to comment.