From: "Suzuki K. Poulose" <suzuki@in.ibm.com>
To: Athira Rajeev <atrajeev@in.ibm.com>
Cc: horms@verge.net.au, kexec@lists.infradead.org
Subject: Re: [PATCH] kexec/ppc: Add nodes for initrd in dtb
Date: Tue, 24 Sep 2013 15:52:44 +0530 [thread overview]
Message-ID: <524167F4.6030709@in.ibm.com> (raw)
In-Reply-To: <20130924052240.4517.85639.stgit@localhost.localdomain>
On 09/24/2013 10:52 AM, Athira Rajeev wrote:
> From: Suzuki K. Poulose <suzuki@in.ibm.com>
>
> If the primary kernel doesn't use an initrd,
> we may not have linux,initrd-* entries in the
> device-tree, and hence the initial flat tree
> may not contain them.
>
> Make sure we add the entries in the dtb if the
> second kernel needs an initrd.
Simon,
Without this patch, one cannot use an initrd with kexec on a machine
which is booted without an initrd. (e.g, network booted boards.)
Please pull this one.
Thanks
Suzuki
>
> Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
> Signed-off-by: Athira Rajeev<atrajeev@in.ibm.com>
> ---
>
> kexec/arch/ppc/fs2dt.c | 18 ++++++++++++++----
> 1 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c
> index a49f85e..4121c7d 100644
> --- a/kexec/arch/ppc/fs2dt.c
> +++ b/kexec/arch/ppc/fs2dt.c
> @@ -342,8 +342,17 @@ static void putnode(void)
>
> putprops(dn, namelist, numlist);
>
> - /* Add initrd entries to the second kernel */
> - if (initrd_base && !strcmp(basename, "chosen/")) {
> + /*
> + * Add initrd entries to the second kernel
> + * if
> + * a) a ramdisk is specified in cmdline
> + * OR
> + * b) reuseinitrd is specified and a initrd is
> + * used by the kernel.
> + *
> + */
> + if ((ramdisk || (initrd_base && reuse_initrd))
> + && !strcmp(basename, "chosen/")) {
> int len = 8;
> unsigned long long initrd_end;
> *dt++ = 3;
> @@ -362,8 +371,9 @@ static void putnode(void)
>
> memcpy(dt, &initrd_end, len);
> dt += (len + 3)/4;
> -
> - reserve(initrd_base, initrd_size);
> + /* reserve the existing initrd image in case of reuse_initrd */
> + if (initrd_base && initrd_size && reuse_initrd)
> + reserve(initrd_base, initrd_size);
> }
>
> for (i = 0; i < numlist; i++) {
>
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2013-09-24 10:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-24 5:22 [PATCH] kexec/ppc: Add nodes for initrd in dtb Athira Rajeev
2013-09-24 10:22 ` Suzuki K. Poulose [this message]
2013-09-25 0:58 ` Simon Horman
2013-09-25 7:02 ` Simon Horman
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=524167F4.6030709@in.ibm.com \
--to=suzuki@in.ibm.com \
--cc=atrajeev@in.ibm.com \
--cc=horms@verge.net.au \
--cc=kexec@lists.infradead.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