* Consolidate cuboot initialization code
@ 2007-05-30 2:01 David Gibson
2007-05-30 15:09 ` Scott Wood
0 siblings, 1 reply; 5+ messages in thread
From: David Gibson @ 2007-05-30 2:01 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
The various cuboot platforms (i.e. pre-device tree aware u-boot for
83xx, 85xx and Ebony) share a certain amount of code for parsing the
boot parameters. To a certain extent that's inevitable, since they
platforms have different definitions of the bd_t structure. However,
with some macro work and a helper function, this patch improves the
situation a bit.
In the process, this fixes a bug on Ebony, which was incorrectly
handling the parameters passed form u-boot for the command line (the
bug was copied from 83xx and 85xx which have subsequently been fixed).
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Index: working-2.6/arch/powerpc/boot/cuboot.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ working-2.6/arch/powerpc/boot/cuboot.c 2007-05-29 17:23:39.000000000 +1000
@@ -0,0 +1,35 @@
+/*
+ * Compatibility for old (not device tree aware) U-Boot versions
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ * Consolidated using macros by David Gibson <david@gibson.dropbear.id.au>
+ *
+ * Copyright 2007 David Gibson, IBM Corporation.
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+
+#include "ppcboot.h"
+
+extern char _end[];
+extern char _dtb_start[], _dtb_end[];
+
+void cuboot_init(unsigned long r4, unsigned long r5,
+ unsigned long r6, unsigned long r7,
+ unsigned long end_of_ram)
+{
+ unsigned long avail_ram = end_of_ram - (unsigned long)_end;
+
+ loader_info.initrd_addr = r4;
+ loader_info.initrd_size = r4 ? r5 - r4 : 0;
+ loader_info.cmdline = (char *)r6;
+ loader_info.cmdline_len = r7 - r6;
+
+ simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);
+}
Index: working-2.6/arch/powerpc/boot/cuboot-83xx.c
===================================================================
--- working-2.6.orig/arch/powerpc/boot/cuboot-83xx.c 2007-05-29 17:23:36.000000000 +1000
+++ working-2.6/arch/powerpc/boot/cuboot-83xx.c 2007-05-29 17:23:39.000000000 +1000
@@ -12,12 +12,12 @@
#include "ops.h"
#include "stdio.h"
+#include "cuboot.h"
#define TARGET_83xx
#include "ppcboot.h"
static bd_t bd;
-extern char _end[];
extern char _dtb_start[], _dtb_end[];
static void platform_fixups(void)
@@ -52,16 +52,7 @@ static void platform_fixups(void)
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7)
{
- unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;
- unsigned long avail_ram = end_of_ram - (unsigned long)_end;
-
- memcpy(&bd, (bd_t *)r3, sizeof(bd));
- loader_info.initrd_addr = r4;
- loader_info.initrd_size = r4 ? r5 - r4 : 0;
- loader_info.cmdline = (char *)r6;
- loader_info.cmdline_len = r7 - r6;
-
- simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);
+ CUBOOT_INIT();
ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
serial_console_init();
platform_ops.fixups = platform_fixups;
Index: working-2.6/arch/powerpc/boot/cuboot-85xx.c
===================================================================
--- working-2.6.orig/arch/powerpc/boot/cuboot-85xx.c 2007-05-29 17:23:36.000000000 +1000
+++ working-2.6/arch/powerpc/boot/cuboot-85xx.c 2007-05-29 17:23:39.000000000 +1000
@@ -12,12 +12,12 @@
#include "ops.h"
#include "stdio.h"
+#include "cuboot.h"
#define TARGET_85xx
#include "ppcboot.h"
static bd_t bd;
-extern char _end[];
extern char _dtb_start[], _dtb_end[];
static void platform_fixups(void)
@@ -53,16 +53,7 @@ static void platform_fixups(void)
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7)
{
- unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;
- unsigned long avail_ram = end_of_ram - (unsigned long)_end;
-
- memcpy(&bd, (bd_t *)r3, sizeof(bd));
- loader_info.initrd_addr = r4;
- loader_info.initrd_size = r4 ? r5 - r4 : 0;
- loader_info.cmdline = (char *)r6;
- loader_info.cmdline_len = r7 - r6;
-
- simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);
+ CUBOOT_INIT();
ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
serial_console_init();
platform_ops.fixups = platform_fixups;
Index: working-2.6/arch/powerpc/boot/cuboot.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ working-2.6/arch/powerpc/boot/cuboot.h 2007-05-29 17:23:39.000000000 +1000
@@ -0,0 +1,14 @@
+#ifndef _PPC_BOOT_CUBOOT_H_
+#define _PPC_BOOT_CUBOOT_H_
+
+void cuboot_init(unsigned long r4, unsigned long r5,
+ unsigned long r6, unsigned long r7,
+ unsigned long end_of_ram);
+
+#define CUBOOT_INIT() \
+ do { \
+ memcpy(&bd, (bd_t *)r3, sizeof(bd)); \
+ cuboot_init(r4, r5, r6, r7, bd.bi_memstart + bd.bi_memsize); \
+ } while (0)
+
+#endif /* _PPC_BOOT_CUBOOT_H_ */
Index: working-2.6/arch/powerpc/boot/cuboot-ebony.c
===================================================================
--- working-2.6.orig/arch/powerpc/boot/cuboot-ebony.c 2007-05-29 17:23:36.000000000 +1000
+++ working-2.6/arch/powerpc/boot/cuboot-ebony.c 2007-05-29 17:23:39.000000000 +1000
@@ -15,28 +15,16 @@
#include "ops.h"
#include "stdio.h"
#include "44x.h"
+#include "cuboot.h"
#define TARGET_44x
#include "ppcboot.h"
static bd_t bd;
-extern char _end[];
-
-BSS_STACK(4096);
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7)
{
- unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;
- unsigned long avail_ram = end_of_ram - (unsigned long)_end;
-
- memcpy(&bd, (bd_t *)r3, sizeof(bd));
- loader_info.initrd_addr = r4;
- loader_info.initrd_size = r4 ? r5 : 0;
- loader_info.cmdline = (char *)r6;
- loader_info.cmdline_len = r7 - r6;
-
- simple_alloc_init(_end, avail_ram, 32, 64);
-
+ CUBOOT_INIT();
ebony_init(&bd.bi_enetaddr, &bd.bi_enet1addr);
}
Index: working-2.6/arch/powerpc/boot/Makefile
===================================================================
--- working-2.6.orig/arch/powerpc/boot/Makefile 2007-05-29 17:23:53.000000000 +1000
+++ working-2.6/arch/powerpc/boot/Makefile 2007-05-29 17:24:16.000000000 +1000
@@ -44,7 +44,7 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.
src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
ns16550.c serial.c simple_alloc.c div64.S util.S \
gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
- 44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c
+ 44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c
src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
cuboot-ebony.c treeboot-ebony.c prpmc2800.c
src-boot := $(src-wlib) $(src-plat) empty.c
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Consolidate cuboot initialization code
2007-05-30 2:01 Consolidate cuboot initialization code David Gibson
@ 2007-05-30 15:09 ` Scott Wood
2007-05-30 15:12 ` David Gibson
0 siblings, 1 reply; 5+ messages in thread
From: Scott Wood @ 2007-05-30 15:09 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev, Paul Mackerras
David Gibson wrote:
> +void cuboot_init(unsigned long r4, unsigned long r5,
> + unsigned long r6, unsigned long r7,
> + unsigned long end_of_ram);
> +
> +#define CUBOOT_INIT() \
> + do { \
> + memcpy(&bd, (bd_t *)r3, sizeof(bd)); \
> + cuboot_init(r4, r5, r6, r7, bd.bi_memstart + bd.bi_memsize); \
> + } while (0)
Is there any particular reason to not just do a direct call to
cuboot_init, and move the memcpy and end-of-ram calculation there? I'd
rather avoid macros if possible.
Also, the "extern char _dtb_start[], _dtb_end[];" line in cuboot.c
doesn't appear to be needed.
Other than that, it looks good.
-Scott
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Consolidate cuboot initialization code
2007-05-30 15:09 ` Scott Wood
@ 2007-05-30 15:12 ` David Gibson
2007-05-30 15:21 ` Scott Wood
0 siblings, 1 reply; 5+ messages in thread
From: David Gibson @ 2007-05-30 15:12 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev, Paul Mackerras
On Wed, May 30, 2007 at 10:09:11AM -0500, Scott Wood wrote:
> David Gibson wrote:
> > +void cuboot_init(unsigned long r4, unsigned long r5,
> > + unsigned long r6, unsigned long r7,
> > + unsigned long end_of_ram);
> > +
> > +#define CUBOOT_INIT() \
> > + do { \
> > + memcpy(&bd, (bd_t *)r3, sizeof(bd)); \
> > + cuboot_init(r4, r5, r6, r7, bd.bi_memstart + bd.bi_memsize); \
> > + } while (0)
>
> Is there any particular reason to not just do a direct call to
> cuboot_init, and move the memcpy and end-of-ram calculation there? I'd
> rather avoid macros if possible.
Uh.. yeah.. because cuboot_init() doesn't know the size to memcpy(),
because it doesn't have the right bd_t definition.
> Also, the "extern char _dtb_start[], _dtb_end[];" line in cuboot.c
> doesn't appear to be needed.
Oh, yeah, that's a hangover from when I had the ft initialization in
there as well. That works for 83xx and 85xx, but not ebony.
> Other than that, it looks good.
>
> -Scott
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Consolidate cuboot initialization code
2007-05-30 15:12 ` David Gibson
@ 2007-05-30 15:21 ` Scott Wood
2007-05-31 1:33 ` David Gibson
0 siblings, 1 reply; 5+ messages in thread
From: Scott Wood @ 2007-05-30 15:21 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev, Paul Mackerras
David Gibson wrote:
> On Wed, May 30, 2007 at 10:09:11AM -0500, Scott Wood wrote:
>>Is there any particular reason to not just do a direct call to
>>cuboot_init, and move the memcpy and end-of-ram calculation there? I'd
>>rather avoid macros if possible.
>
> Uh.. yeah.. because cuboot_init() doesn't know the size to memcpy(),
> because it doesn't have the right bd_t definition.
Ah, yes. Don't mind me, it's still morning here... :-P
We could probably do away with the copy altogether, though, as u-boot
puts the bd_t near the stack, which is exempted from the bootwrapper's
heap with the 1MiB exclusion.
-Scott
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Consolidate cuboot initialization code
2007-05-30 15:21 ` Scott Wood
@ 2007-05-31 1:33 ` David Gibson
0 siblings, 0 replies; 5+ messages in thread
From: David Gibson @ 2007-05-31 1:33 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev, Paul Mackerras
On Wed, May 30, 2007 at 10:21:22AM -0500, Scott Wood wrote:
> David Gibson wrote:
> > On Wed, May 30, 2007 at 10:09:11AM -0500, Scott Wood wrote:
> >>Is there any particular reason to not just do a direct call to
> >>cuboot_init, and move the memcpy and end-of-ram calculation there? I'd
> >>rather avoid macros if possible.
> >
> > Uh.. yeah.. because cuboot_init() doesn't know the size to memcpy(),
> > because it doesn't have the right bd_t definition.
>
> Ah, yes. Don't mind me, it's still morning here... :-P
>
> We could probably do away with the copy altogether, though, as u-boot
> puts the bd_t near the stack, which is exempted from the bootwrapper's
> heap with the 1MiB exclusion.
Possibly, though the copy is safer. I'm hoping to be able to merge
libfdt in a few weeks, which with luck will let me get rid of malloc()
entirely. I'll think about revisiting this then.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-05-31 1:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-30 2:01 Consolidate cuboot initialization code David Gibson
2007-05-30 15:09 ` Scott Wood
2007-05-30 15:12 ` David Gibson
2007-05-30 15:21 ` Scott Wood
2007-05-31 1:33 ` David Gibson
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).