From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [Xen-staging] [xen staging] ARM: parse separate DT properties for different commandlines Date: Mon, 07 Oct 2013 14:08:10 +0100 Message-ID: <5252B23A.5020808@linaro.org> References: <1379537250.11304.313.camel@hastur.hellion.org.uk> <523AB4C1.5080807@linaro.org> <1380621408.925.52.camel@kazak.uk.xensource.com> <1380622369.925.53.camel@kazak.uk.xensource.com> <5252A7B7.9020104@linaro.org> <1381149866.21562.100.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1381149866.21562.100.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: xen-devel@lists.xensource.com, Andre Przywara List-Id: xen-devel@lists.xenproject.org On 10/07/2013 01:44 PM, Ian Campbell wrote: > On Mon, 2013-10-07 at 13:23 +0100, Julien Grall wrote: >> On 10/01/2013 11:12 AM, Ian Campbell wrote: >>> On Tue, 2013-10-01 at 10:56 +0100, Ian Campbell wrote: >>>> On Thu, 2013-09-19 at 10:44 +0100, Julien Grall wrote: >>>>> >>>>> On 19 Sep 2013 09:29, "Andre Przywara" >>>>> wrote: >>>>>>> >>>>>>>> @@ -261,7 +261,12 @@ const char *device_tree_bootargs(const void >>>>> *fdt) >>>>>>>> if ( node < 0 ) >>>>>>>> return NULL; >>>>>>>> >>>>>>>> - prop = fdt_get_property(fdt, node, "bootargs", NULL); >>>>>>>> + prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); >>>>>>>> + if ( prop == NULL ) >>>>>>>> + { >>>>>>>> + if (fdt_get_property(fdt, node, "xen,dom0-bootargs", >>>>> NULL)) >>>>>>>> + prop = fdt_get_property(fdt, node, "bootargs", NULL); >>>>>>>> + } >>>>> >>>>> The logic seems wrong here, we returns bootargs only if the property >>>>> "xen,dom0-bootargs" exists. We should also check if the user give the >>>>> dom0 >>>>> command line via the multiboot module. >>>> >>>> Anyone investigating this? I've just been using the following, which is >>>> obviously bogus! >>> >>> How about this: >>> 8<------------------------------------ >>> >>> From a158dee49bb59e76c0f9103f512bb4bf9489f770 Mon Sep 17 00:00:00 2001 >>> From: Ian Campbell >>> Date: Fri, 20 Sep 2013 23:45:34 +0100 >>> Subject: [PATCH] xen: arm: fix usage of bootargs for Xen. >>> >>> The chosen node's bootargs property should be used for Xen if there is a dom0 >>> kernel multiboot module with a command line, not just if xen,dom0-bootargs is >>> present. >> >> From docs/misc/arm/device-tree/booting.txt: >> If no Xen specific properties are present, bootargs is for Dom0. >> >> The current behaviour seems logic. Can you update the documentation? > > You mean the patch is good but the docs need updating? Sure. Yes. -- Julien Grall