From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: Re: [PATCH for-4.4] xen/arm: Correctly boot with an initrd and no linux command line Date: Mon, 10 Feb 2014 17:37:51 +0000 Message-ID: <52F90E6F.9040409@eu.citrix.com> References: <1392053686-16843-1-git-send-email-julien.grall@linaro.org> <52F90E0C.4000008@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCuoO-0004R7-6g for xen-devel@lists.xenproject.org; Mon, 10 Feb 2014 17:38:28 +0000 In-Reply-To: <52F90E0C.4000008@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Julien Grall Cc: xen-devel@lists.xenproject.org, tim@xen.org, ian.campbell@citrix.com, stefano.stabellini@citrix.com List-Id: xen-devel@lists.xenproject.org On 02/10/2014 05:36 PM, Julien Grall wrote: > Forget to cc George. > > On 02/10/2014 05:34 PM, Julien Grall wrote: >> When DOM0 device tree is building, the properties for initrd will >> only be added if there is a linux command line. This will result to a panic >> later: >> >> (XEN) *** LOADING DOMAIN 0 *** >> (XEN) Populate P2M 0x20000000->0x40000000 (1:1 mapping for dom0) >> (XEN) Loading kernel from boot module 2 >> (XEN) Loading zImage from 0000000001000000 to 0000000027c00000-0000000027eafb48 >> (XEN) Loading dom0 initrd from 0000000002000000 to 0x0000000028200000-0x0000000028c00000 >> (XEN) >> (XEN) **************************************** >> (XEN) Panic on CPU 0: >> (XEN) Cannot fix up "linux,initrd-start" property >> (XEN) **************************************** >> (XEN) >> >> Signed-off-by: Julien Grall >> >> --- >> This is a bug fix for Xen 4.4. Without this patch, Xen won't boot with >> initrd when the linux command is not set. Oops. :-) Looks like a good risk: Release-acked-by: George Dunlap >> --- >> xen/arch/arm/domain_build.c | 13 ++++++++----- >> 1 file changed, 8 insertions(+), 5 deletions(-) >> >> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c >> index 47b781b..5ca2f15 100644 >> --- a/xen/arch/arm/domain_build.c >> +++ b/xen/arch/arm/domain_build.c >> @@ -209,12 +209,15 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, >> return res; >> } >> >> - if ( dt_node_path_is_equal(node, "/chosen") && bootargs ) >> + if ( dt_node_path_is_equal(node, "/chosen") ) >> { >> - res = fdt_property(kinfo->fdt, "bootargs", bootargs, >> - strlen(bootargs) + 1); >> - if ( res ) >> - return res; >> + if ( bootargs ) >> + { >> + res = fdt_property(kinfo->fdt, "bootargs", bootargs, >> + strlen(bootargs) + 1); >> + if ( res ) >> + return res; >> + } >> >> /* >> * If the bootloader provides an initrd, we must create a placeholder >> >