From: Geoff Levand <geoffrey.levand@am•sony.com>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linuxppc-dev@ozlabs•org, cbe-oss-dev@ozlabs•org
Subject: Re: [Cbe-oss-dev] [PATCH] Ignore memory listed in PS3 device tree
Date: Fri, 06 Apr 2007 14:22:34 -0700 [thread overview]
Message-ID: <4616BA1A.3090309@am.sony.com> (raw)
In-Reply-To: <1175208237.3122.78.camel@pmac.infradead.org>
David Woodhouse wrote:
> The old 2.6.16 kernel handled memory statically and it was shown in the
> device tree. The current kernel deals with the hypervisor and hotplugs
> the memory, so we should just ignore anything that's reported in the
> device-tree. This enables the current kernel to be booted from 2.6.16
> without evil hacks in head_64.S to override the device-tree.
>
> Signed-off-by: David Woodhouse <dwmw2@infradead•org>
>
> diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
> index 08bd255..dd38408 100644
> --- a/arch/powerpc/kernel/prom.c
> +++ b/arch/powerpc/kernel/prom.c
> @@ -52,6 +52,7 @@
> #include <asm/pSeries_reconfig.h>
> #include <asm/pci-bridge.h>
> #include <asm/kexec.h>
> +#include <asm/firmware.h>
>
> #ifdef DEBUG
> #define DBG(fmt...) printk(KERN_ERR fmt)
> @@ -862,6 +863,9 @@ static int __init early_init_dt_scan_memory(unsigned long node,
> cell_t *reg, *endp;
> unsigned long l;
>
> + if (firmware_has_feature(FW_FEATURE_PS3_LV1))
> + return 0;
> +
> /* Look for the ibm,dynamic-reconfiguration-memory node */
> if (depth == 1 &&
> strcmp(uname, "ibm,dynamic-reconfiguration-memory") == 0)
>
I committed a change that pulls the command line out of the incompatible DT and
merges it with the built-in DT.
http://git.kernel.org/?p=linux/kernel/git/geoff/ps3-linux-patches.git;a=blob;f=ps3-hacks/ps3-no-bootwrapper-hack.diff
-Geoff
next prev parent reply other threads:[~2007-04-06 21:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-29 22:43 [PATCH] Ignore memory listed in PS3 device tree David Woodhouse
2007-03-29 23:23 ` [Cbe-oss-dev] " Benjamin Herrenschmidt
2007-03-30 0:27 ` David Woodhouse
2007-03-30 13:25 ` Segher Boessenkool
2007-04-02 0:20 ` Michael Ellerman
2007-04-02 17:36 ` Segher Boessenkool
2007-04-03 2:42 ` Michael Ellerman
2007-04-03 3:16 ` David Woodhouse
2007-04-03 14:45 ` David Woodhouse
2007-04-03 21:18 ` Geoff Levand
2007-04-03 21:48 ` David Woodhouse
2007-04-03 22:45 ` Geoff Levand
2007-04-03 22:55 ` Arnd Bergmann
2007-04-03 23:58 ` Geoff Levand
2007-04-04 0:10 ` David Woodhouse
2007-04-04 11:43 ` Segher Boessenkool
2007-04-04 1:30 ` Benjamin Herrenschmidt
2007-04-04 1:28 ` Benjamin Herrenschmidt
2007-04-04 1:26 ` Benjamin Herrenschmidt
2007-03-30 17:41 ` Geoff Levand
2007-03-30 17:45 ` David Woodhouse
2007-03-30 18:11 ` Segher Boessenkool
2007-03-30 18:13 ` David Woodhouse
2007-03-31 15:27 ` Segher Boessenkool
2007-03-31 22:34 ` Benjamin Herrenschmidt
2007-03-31 22:42 ` David Woodhouse
2007-04-06 21:22 ` Geoff Levand [this message]
2007-04-06 22:34 ` Benjamin Herrenschmidt
2007-04-06 22:43 ` David Woodhouse
2007-04-06 23:15 ` Geoff Levand
2007-04-06 23:35 ` Benjamin Herrenschmidt
2007-04-06 23:44 ` David Woodhouse
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=4616BA1A.3090309@am.sony.com \
--to=geoffrey.levand@am$(echo .)sony.com \
--cc=cbe-oss-dev@ozlabs$(echo .)org \
--cc=dwmw2@infradead$(echo .)org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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