From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org>
Received: from kirsty.vergenet.net ([202.4.237.240])
 by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux))
 id 1VOj7P-0005cv-8A
 for kexec@lists.infradead.org; Wed, 25 Sep 2013 07:02:39 +0000
Date: Wed, 25 Sep 2013 16:02:16 +0900
From: Simon Horman <horms@verge.net.au>
Subject: Re: [PATCH] kexec/ppc: Add nodes for initrd in dtb
Message-ID: <20130925070216.GG6663@verge.net.au>
References: <20130924052240.4517.85639.stgit@localhost.localdomain>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20130924052240.4517.85639.stgit@localhost.localdomain>
List-Id: <kexec.lists.infradead.org>
List-Unsubscribe: <http://lists.infradead.org/mailman/options/kexec>,
 <mailto:kexec-request@lists.infradead.org?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/kexec/>
List-Post: <mailto:kexec@lists.infradead.org>
List-Help: <mailto:kexec-request@lists.infradead.org?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/kexec>,
 <mailto:kexec-request@lists.infradead.org?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "kexec" <kexec-bounces@lists.infradead.org>
Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org
To: Athira Rajeev <atrajeev@in.ibm.com>
Cc: kexec@lists.infradead.org, suzuki@in.ibm.com

On Tue, Sep 24, 2013 at 10:52:54AM +0530, 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.
> 
> Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
> Signed-off-by: Athira Rajeev<atrajeev@in.ibm.com>

Thanks, applied.

> ---
> 
>  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
> 

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec