Re: [PATCH 06/11] of/flattree: merge early_init_devtree() and early_init_move_devtree()

2009-12-10 Thread Grant Likely 
On Wed, Nov 25, 2009 at 9:04 PM, Benjamin Herrenschmidt
b...@kernel.crashing.org wrote:
 On Tue, 2009-11-24 at 01:19 -0700, Grant Likely wrote:
  /**
 + * early_init_move_devtree - move tree to an unused area, if needed.
 + *
 + * The device tree may be allocated beyond our memory limit, or inside the
 + * crash kernel region for kdump. If so, move it out of the way.
 + */
 +#if defined(CONFIG_PPC)
 +static void __init early_init_move_devtree(void)

 And you still end up with an ifdef mess in the common code ...

The #ifdefs are temporary.  I'm leaving them in now exactly because
they are ugly and show where the code needs to be refactored and
reorganized.  Once everything is merged, I'll probably do exactly what
you suggest.  I just cannot yet tell the exact structure of it until I
see the merged version.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 06/11] of/flattree: merge early_init_devtree() and early_init_move_devtree()

2009-12-10 Thread Grant Likely 
On Mon, Dec 7, 2009 at 12:08 AM, Jeremy Kerr jeremy.k...@canonical.com wrote:
 Hi Grant,

 +     /* Scan memory nodes and rebuild LMBs */
 +     lmb_init();
 +     of_scan_flat_dt(early_init_dt_scan_root, NULL);
 +     of_scan_flat_dt(early_init_dt_scan_memory, NULL);
 +
 +     /* Save command line for /proc/cmdline and then parse parameters */
 +     strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
 +     parse_early_param();
 +
 +     /* This is in an arbitrary spot, but it is temporary.  After all
 +      * the common code is merged, the structure of the early init
 +      * code will be reevaluated and refactored */
 +     early_init_devtree_arch();
 +
 +     lmb_analyze();
 +     lmb_dump_all();

 So we're assuming that the arch has lmb support, or should we make this
 conditional on CONFIG_HAVE_LMB?

I'm not making any assumptions yet.  I'm just merging the code.  A lot
of it needs to be refactored after the merge.  Feel free to send
patches to rework want you need.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 06/11] of/flattree: merge early_init_devtree() and early_init_move_devtree()

2009-12-07 Thread Jeremy Kerr 
Hi Grant,

 + /* Scan memory nodes and rebuild LMBs */
 + lmb_init();
 + of_scan_flat_dt(early_init_dt_scan_root, NULL);
 + of_scan_flat_dt(early_init_dt_scan_memory, NULL);
 +
 + /* Save command line for /proc/cmdline and then parse parameters */
 + strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
 + parse_early_param();
 +
 + /* This is in an arbitrary spot, but it is temporary.  After all
 +  * the common code is merged, the structure of the early init
 +  * code will be reevaluated and refactored */
 + early_init_devtree_arch();
 +
 + lmb_analyze();
 + lmb_dump_all();

So we're assuming that the arch has lmb support, or should we make this 
conditional on CONFIG_HAVE_LMB?

Looks like ARM has its own lmb implementation (struct membank), so for the 
former case, I'd need to convert that to use lmb instead (which may not be a 
bad thing overall...)

Cheers,


Jeremy 
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 06/11] of/flattree: merge early_init_devtree() and early_init_move_devtree()

2009-11-25 Thread Benjamin Herrenschmidt 
On Tue, 2009-11-24 at 01:19 -0700, Grant Likely wrote:

  
 -static int __init early_init_dt_scan_cpus(unsigned long node,
 -   const char *uname, int depth,
 -   void *data)
 +int __init early_init_dt_scan_cpus(unsigned long node, const char *uname,
 +int depth, void *data)
  {

So now you make this one non-static as well with little hope of making
it static ever again

   static int logical_cpuid;
   char *type = of_get_flat_dt_prop(node, device_type, NULL);
 @@ -113,8 +112,8 @@ void __init early_init_dt_scan_chosen_arch(unsigned long 
 node)
   /* No Microblaze specific code here */
  }
  
 -static int __init early_init_dt_scan_memory(unsigned long node,
 - const char *uname, int depth, void *data)
 +int __init early_init_dt_scan_memory(unsigned long node, const char *uname,
 +  int depth, void *data)
  {

And this one

   char *type = of_get_flat_dt_prop(node, device_type, NULL);
   u32 *reg, *endp;
 @@ -201,7 +200,7 @@ static inline unsigned long 
 phyp_dump_calculate_reserve_size(void)
   * without reserving anything. The memory in case of dump being
   * active is freed when the dump is collected (by userland tools).
   */
 -static void __init phyp_dump_reserve_mem(void)
 +void __init phyp_dump_reserve_mem(void)
  {

And this one...

  /**
 + * early_init_move_devtree - move tree to an unused area, if needed.
 + *
 + * The device tree may be allocated beyond our memory limit, or inside the
 + * crash kernel region for kdump. If so, move it out of the way.
 + */
 +#if defined(CONFIG_PPC)
 +static void __init early_init_move_devtree(void)

And you still end up with an ifdef mess in the common code ...

Would it be possible instead to have one common early_init_devtree()
that calls into the common ones (which you can then make static again,
inside the common code) and then calls one arch_early_init_devtree()
which regroups the arch specific ones ?

Or there's too many ordering issues ?

Another option then is to call from that early_init_devtree() something
like:

arch_early_init_dt_mem()
arch_early_init_dt_cpu()
arch_early_init_move_devtree()

etc... in the right spots in the common code and have the archs who
don't do anything there just have them as empty inlines.

Cheers,
Ben.

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH 06/11] of/flattree: merge early_init_devtree() and early_init_move_devtree()

2009-11-24 Thread Grant Likely 
Merge common code between Microblaze and PowerPC

Signed-off-by: Grant Likely grant.lik...@secretlab.ca
---

 arch/microblaze/kernel/prom.c |   53 +++
 arch/powerpc/kernel/prom.c|   94 +++--
 drivers/of/fdt.c  |   92 
 include/linux/of_fdt.h|7 +++
 4 files changed, 115 insertions(+), 131 deletions(-)

diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 7ee021f..543465a 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -47,9 +47,8 @@ struct device_node *of_chosen;
 
 #define early_init_dt_scan_drconf_memory(node) 0
 
-static int __init early_init_dt_scan_cpus(unsigned long node,
- const char *uname, int depth,
- void *data)
+int __init early_init_dt_scan_cpus(unsigned long node, const char *uname,
+  int depth, void *data)
 {
static int logical_cpuid;
char *type = of_get_flat_dt_prop(node, device_type, NULL);
@@ -113,8 +112,8 @@ void __init early_init_dt_scan_chosen_arch(unsigned long 
node)
/* No Microblaze specific code here */
 }
 
-static int __init early_init_dt_scan_memory(unsigned long node,
-   const char *uname, int depth, void *data)
+int __init early_init_dt_scan_memory(unsigned long node, const char *uname,
+int depth, void *data)
 {
char *type = of_get_flat_dt_prop(node, device_type, NULL);
u32 *reg, *endp;
@@ -201,7 +200,7 @@ static inline unsigned long 
phyp_dump_calculate_reserve_size(void)
  * without reserving anything. The memory in case of dump being
  * active is freed when the dump is collected (by userland tools).
  */
-static void __init phyp_dump_reserve_mem(void)
+void __init phyp_dump_reserve_mem(void)
 {
unsigned long base, size;
unsigned long variable_reserve_size;
@@ -240,7 +239,7 @@ static void __init phyp_dump_reserve_mem(void)
}
 }
 #else
-static inline void __init phyp_dump_reserve_mem(void) {}
+inline void __init phyp_dump_reserve_mem(void) {}
 #endif /* CONFIG_PHYP_DUMP   CONFIG_PPC_RTAS */
 
 #ifdef CONFIG_EARLY_PRINTK
@@ -277,45 +276,9 @@ int __init early_uartlite_console(void)
 }
 #endif
 
-void __init early_init_devtree(void *params)
+void __init early_init_devtree_arch(void)
 {
-   pr_debug( - early_init_devtree(%p)\n, params);
-
-   /* Setup flat device-tree pointer */
-   initial_boot_params = params;
-
-#ifdef CONFIG_PHYP_DUMP
-   /* scan tree to see if dump occured during last boot */
-   of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL);
-#endif
-
-   /* Retrieve various informations from the /chosen node of the
-* device-tree, including the platform type, initrd location and
-* size, TCE reserve, and more ...
-*/
-   of_scan_flat_dt(early_init_dt_scan_chosen, NULL);
-
-   /* Scan memory nodes and rebuild LMBs */
-   lmb_init();
-   of_scan_flat_dt(early_init_dt_scan_root, NULL);
-   of_scan_flat_dt(early_init_dt_scan_memory, NULL);
-
-   /* Save command line for /proc/cmdline and then parse parameters */
-   strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
-   parse_early_param();
-
-   lmb_analyze();
-
-   pr_debug(Phys. mem: %lx\n, (unsigned long) lmb_phys_mem_size());
-
-   pr_debug(Scanning CPUs ...\n);
-
-   /* Retreive CPU related informations from the flat tree
-* (altivec support, boot CPU ID, ...)
-*/
-   of_scan_flat_dt(early_init_dt_scan_cpus, NULL);
-
-   pr_debug( - early_init_devtree()\n);
+   /* No Microblaze specific code here */
 }
 
 /**
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 2c7d4a3..a5b3b9d 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -84,33 +84,6 @@ static int __init early_parse_mem(char *p)
 }
 early_param(mem, early_parse_mem);
 
-/**
- * move_device_tree - move tree to an unused area, if needed.
- *
- * The device tree may be allocated beyond our memory limit, or inside the
- * crash kernel region for kdump. If so, move it out of the way.
- */
-static void __init move_device_tree(void)
-{
-   unsigned long start, size;
-   void *p;
-
-   DBG(- move_device_tree\n);
-
-   start = __pa(initial_boot_params);
-   size = initial_boot_params-totalsize;
-
-   if ((memory_limit  (start + size)  memory_limit) ||
-   overlaps_crashkernel(start, size)) {
-   p = __va(lmb_alloc_base(size, PAGE_SIZE, lmb.rmo_size));
-   memcpy(p, initial_boot_params, size);
-   initial_boot_params = (struct boot_param_header *)p;
-   DBG(Moved device tree to 0x%p\n, p);
-   }
-
-   DBG(- move_device_tree\n);
-}
-
 /*
  * ibm,pa-features is a per-cpu