Re: [PATCH v2 3/4] common: oftree: Pass bootsource and bootsource instance to kernel
On Thu, May 17, 2018 at 2:52 AM, Sascha Hauer wrote: > On Wed, May 16, 2018 at 01:18:26PM -0700, Andrey Smirnov wrote: >> Pass barebox-detected bootsource to Linux to make it availible to >> Linux userspace. That information is passed as full path to the node >> corresponding to the bootsource and is placed under /chosen/bootsource >> and it can be read under Linux in >> >> /sys/firmware/devicetree/base/chosen/bootsource >> >> Signed-off-by: Andrey Smirnov >> --- >> common/oftree.c | 46 +- >> 1 file changed, 45 insertions(+), 1 deletion(-) >> >> diff --git a/common/oftree.c b/common/oftree.c >> index 8a2ede4c6..5ab6bf089 100644 >> --- a/common/oftree.c >> +++ b/common/oftree.c >> @@ -11,6 +11,7 @@ >> #include >> #include >> #include >> +#include >> #include >> >> #define MAX_LEVEL32 /* how deeply nested we will go */ >> @@ -114,6 +115,47 @@ void of_print_cmdline(struct device_node *root) >> printf("commandline: %s\n", cmdline); >> } >> >> +static int of_fixup_bootargs_bootsource(struct device_node *root, >> + struct device_node *chosen) >> +{ >> + char *alias_name = bootsource_get_alias_name(); >> + struct device_node *bootsource; >> + struct device_node *aliasnp; >> + struct property *p; >> + int ret; >> + >> + if (!alias_name) >> + return 0; >> + >> + bootsource = of_find_node_by_alias(root, alias_name); >> + /* >> + * If kerenel DTB doesn't have the appropriate alias set up, >> + * give up and exit early. No error is reported. >> + */ > > s/kerenel/kernel/ > Will fix in v3. >> + if (!bootsource) { >> + ret = 0; >> + goto exit; >> + } >> + >> + aliasnp = of_find_node_by_path_from(root, "/aliases"); >> + if (!aliasnp) { >> + ret = -ENOENT; >> + goto exit; >> + } >> + >> + p = of_find_property(aliasnp, alias_name, NULL); >> + if (!p) { >> + ret = -ENOENT; >> + goto exit; >> + } > > This seems unnecessary. Pass bootsource->full_name to of_set_property > below. > Haven't thought about doing that. Will do in v3. Thanks, Andrey Smirnov ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH v2 3/4] common: oftree: Pass bootsource and bootsource instance to kernel
On Wed, May 16, 2018 at 01:18:26PM -0700, Andrey Smirnov wrote: > Pass barebox-detected bootsource to Linux to make it availible to > Linux userspace. That information is passed as full path to the node > corresponding to the bootsource and is placed under /chosen/bootsource > and it can be read under Linux in > > /sys/firmware/devicetree/base/chosen/bootsource > > Signed-off-by: Andrey Smirnov > --- > common/oftree.c | 46 +- > 1 file changed, 45 insertions(+), 1 deletion(-) > > diff --git a/common/oftree.c b/common/oftree.c > index 8a2ede4c6..5ab6bf089 100644 > --- a/common/oftree.c > +++ b/common/oftree.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > > #define MAX_LEVEL32 /* how deeply nested we will go */ > @@ -114,6 +115,47 @@ void of_print_cmdline(struct device_node *root) > printf("commandline: %s\n", cmdline); > } > > +static int of_fixup_bootargs_bootsource(struct device_node *root, > + struct device_node *chosen) > +{ > + char *alias_name = bootsource_get_alias_name(); > + struct device_node *bootsource; > + struct device_node *aliasnp; > + struct property *p; > + int ret; > + > + if (!alias_name) > + return 0; > + > + bootsource = of_find_node_by_alias(root, alias_name); > + /* > + * If kerenel DTB doesn't have the appropriate alias set up, > + * give up and exit early. No error is reported. > + */ s/kerenel/kernel/ > + if (!bootsource) { > + ret = 0; > + goto exit; > + } > + > + aliasnp = of_find_node_by_path_from(root, "/aliases"); > + if (!aliasnp) { > + ret = -ENOENT; > + goto exit; > + } > + > + p = of_find_property(aliasnp, alias_name, NULL); > + if (!p) { > + ret = -ENOENT; > + goto exit; > + } This seems unnecessary. Pass bootsource->full_name to of_set_property below. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox