[PATCH 1/2] of: fix up /chosen node even when there are no bootargs

[PATCH 1/2] of: fix up /chosen node even when there are no bootargs

[Bastian Krause]

From: Ahmad Fatoum <a.fatoum@pengutronix.de>

Currently the /chosen fixups of "reset-source",
"reset-source-instance", "reset-source-device" and "bootsource" do not
happen if no bootargs are available.

Fix that by moving the actual bootargs fixup to a dedicated function
of_write_bootargs() and only return there early on empty bootargs, but
still perform the /chosen fixups mentioned above.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
[bst: dropped new line deletions and modified string comparison, moved of_write_bootargs() call to original position, add commit message]
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 common/oftree.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/common/oftree.c b/common/oftree.c
index 60d4327155..aaeb199a9e 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -161,16 +161,12 @@ static void watchdog_build_bootargs(struct watchdog *watchdog, struct device_nod
 	free(buf);
 }
 
-static int of_fixup_bootargs(struct device_node *root, void *unused)
+static int of_write_bootargs(struct device_node *node)
 {
-	struct device_node *node;
 	const char *str;
-	int err;
-	int instance = reset_source_get_instance();
-	struct device_d *dev;
 
 	if (IS_ENABLED(CONFIG_SYSTEMD_OF_WATCHDOG))
-		watchdog_build_bootargs(boot_get_enabled_watchdog(), root);
+		watchdog_build_bootargs(boot_get_enabled_watchdog(), of_get_parent(node));
 
 	str = linux_bootargs_get();
 	if (!str)
@@ -180,13 +176,23 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
 	if (strlen(str) == 0)
 		return 0;
 
+	return of_property_write_string(node, "bootargs", str);
+}
+
+static int of_fixup_bootargs(struct device_node *root, void *unused)
+{
+	struct device_node *node;
+	int err;
+	int instance = reset_source_get_instance();
+	struct device_d *dev;
+
 	node = of_create_node(root, "/chosen");
 	if (!node)
 		return -ENOMEM;
 
 	of_property_write_string(node, "barebox-version", release_string);
 
-	err = of_property_write_string(node, "bootargs", str);
+	err = of_write_bootargs(node);
 	if (err)
 		return err;
 
-- 
2.29.2


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

[PATCH 2/2] of: introduce global.linux.bootargs_overwrite

[Bastian Krause]

From: Ahmad Fatoum <a.fatoum@pengutronix.de>

By default, barebox overwrites the bootargs in the oftree if it itself
has any. Make this behavior configurable by adding a new global
variable. It allows either overwriting the oftree bootargs
(global.linux.bootargs_overwrite=1) or appending barebox' bootargs to
the oftree bootargs (global.linux.bootargs_overwrite=0).

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
[bst: dropped a new line removal, extend commit message]
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 common/oftree.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/common/oftree.c b/common/oftree.c
index aaeb199a9e..f3a5d9c5d1 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -16,6 +16,7 @@
 #include <reset_source.h>
 #include <watchdog.h>
 #include <globalvar.h>
+#include <magicvar.h>
 
 #define MAX_LEVEL	32		/* how deeply nested we will go */
 
@@ -161,9 +162,14 @@ static void watchdog_build_bootargs(struct watchdog *watchdog, struct device_nod
 	free(buf);
 }
 
+static int bootargs_overwrite = 1;
+BAREBOX_MAGICVAR(global.linux.bootargs_overwrite, "overwrite original oftree bootargs");
+
 static int of_write_bootargs(struct device_node *node)
 {
 	const char *str;
+	char *buf = NULL;
+	int ret;
 
 	if (IS_ENABLED(CONFIG_SYSTEMD_OF_WATCHDOG))
 		watchdog_build_bootargs(boot_get_enabled_watchdog(), of_get_parent(node));
@@ -176,7 +182,20 @@ static int of_write_bootargs(struct device_node *node)
 	if (strlen(str) == 0)
 		return 0;
 
-	return of_property_write_string(node, "bootargs", str);
+	if (!bootargs_overwrite) {
+		const char *oldstr;
+
+		ret = of_property_read_string(node, "bootargs", &oldstr);
+		if (!ret) {
+			str = buf = basprintf("%s %s", oldstr, str);
+			if (!buf)
+				return -ENOMEM;
+		}
+	}
+
+	ret = of_property_write_string(node, "bootargs", str);
+	free(buf);
+	return ret;
 }
 
 static int of_fixup_bootargs(struct device_node *root, void *unused)
@@ -218,6 +237,7 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
 
 static int of_register_bootargs_fixup(void)
 {
+	globalvar_add_simple_bool("linux.bootargs_overwrite", &bootargs_overwrite);
 	return of_register_fixup(of_fixup_bootargs, NULL);
 }
 late_initcall(of_register_bootargs_fixup);
-- 
2.29.2


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

Re: [PATCH 2/2] of: introduce global.linux.bootargs_overwrite

[Sascha Hauer]

On Fri, Apr 09, 2021 at 10:15:03AM +0200, Bastian Krause wrote:
> From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> 
> By default, barebox overwrites the bootargs in the oftree if it itself
> has any. Make this behavior configurable by adding a new global
> variable. It allows either overwriting the oftree bootargs
> (global.linux.bootargs_overwrite=1) or appending barebox' bootargs to
> the oftree bootargs (global.linux.bootargs_overwrite=0).
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> [bst: dropped a new line removal, extend commit message]
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
>  common/oftree.c | 22 +++++++++++++++++++++-
>  1 file changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/common/oftree.c b/common/oftree.c
> index aaeb199a9e..f3a5d9c5d1 100644
> --- a/common/oftree.c
> +++ b/common/oftree.c
> @@ -16,6 +16,7 @@
>  #include <reset_source.h>
>  #include <watchdog.h>
>  #include <globalvar.h>
> +#include <magicvar.h>
>  
>  #define MAX_LEVEL	32		/* how deeply nested we will go */
>  
> @@ -161,9 +162,14 @@ static void watchdog_build_bootargs(struct watchdog *watchdog, struct device_nod
>  	free(buf);
>  }
>  
> +static int bootargs_overwrite = 1;
> +BAREBOX_MAGICVAR(global.linux.bootargs_overwrite, "overwrite original oftree bootargs");

How about naming it global.linux.bootargs_append instead? It would make
it more clear that we are deviating from the default by setting the
variable to true.

Sascha

> +
>  static int of_write_bootargs(struct device_node *node)
>  {
>  	const char *str;
> +	char *buf = NULL;
> +	int ret;
>  
>  	if (IS_ENABLED(CONFIG_SYSTEMD_OF_WATCHDOG))
>  		watchdog_build_bootargs(boot_get_enabled_watchdog(), of_get_parent(node));
> @@ -176,7 +182,20 @@ static int of_write_bootargs(struct device_node *node)
>  	if (strlen(str) == 0)
>  		return 0;
>  
> -	return of_property_write_string(node, "bootargs", str);
> +	if (!bootargs_overwrite) {
> +		const char *oldstr;
> +
> +		ret = of_property_read_string(node, "bootargs", &oldstr);
> +		if (!ret) {
> +			str = buf = basprintf("%s %s", oldstr, str);
> +			if (!buf)
> +				return -ENOMEM;
> +		}
> +	}
> +
> +	ret = of_property_write_string(node, "bootargs", str);
> +	free(buf);
> +	return ret;
>  }
>  
>  static int of_fixup_bootargs(struct device_node *root, void *unused)
> @@ -218,6 +237,7 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
>  
>  static int of_register_bootargs_fixup(void)
>  {
> +	globalvar_add_simple_bool("linux.bootargs_overwrite", &bootargs_overwrite);
>  	return of_register_fixup(of_fixup_bootargs, NULL);
>  }
>  late_initcall(of_register_bootargs_fixup);
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

Re: [PATCH 2/2] of: introduce global.linux.bootargs_overwrite

[Bastian Krause]

On 4/13/21 7:16 AM, Sascha Hauer wrote:
> On Fri, Apr 09, 2021 at 10:15:03AM +0200, Bastian Krause wrote:
>> From: Ahmad Fatoum <a.fatoum@pengutronix.de>
>>
>> By default, barebox overwrites the bootargs in the oftree if it itself
>> has any. Make this behavior configurable by adding a new global
>> variable. It allows either overwriting the oftree bootargs
>> (global.linux.bootargs_overwrite=1) or appending barebox' bootargs to
>> the oftree bootargs (global.linux.bootargs_overwrite=0).
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>> [bst: dropped a new line removal, extend commit message]
>> Signed-off-by: Bastian Krause <bst@pengutronix.de>
>> ---
>>  common/oftree.c | 22 +++++++++++++++++++++-
>>  1 file changed, 21 insertions(+), 1 deletion(-)
>>
>> diff --git a/common/oftree.c b/common/oftree.c
>> index aaeb199a9e..f3a5d9c5d1 100644
>> --- a/common/oftree.c
>> +++ b/common/oftree.c
>> @@ -16,6 +16,7 @@
>>  #include <reset_source.h>
>>  #include <watchdog.h>
>>  #include <globalvar.h>
>> +#include <magicvar.h>
>>  
>>  #define MAX_LEVEL	32		/* how deeply nested we will go */
>>  
>> @@ -161,9 +162,14 @@ static void watchdog_build_bootargs(struct watchdog *watchdog, struct device_nod
>>  	free(buf);
>>  }
>>  
>> +static int bootargs_overwrite = 1;
>> +BAREBOX_MAGICVAR(global.linux.bootargs_overwrite, "overwrite original oftree bootargs");
> 
> How about naming it global.linux.bootargs_append instead? It would make
> it more clear that we are deviating from the default by setting the
> variable to true.
> 

That's fine with me.

Can you change that or should I send a v2?

Bastian

> 
>> +
>>  static int of_write_bootargs(struct device_node *node)
>>  {
>>  	const char *str;
>> +	char *buf = NULL;
>> +	int ret;
>>  
>>  	if (IS_ENABLED(CONFIG_SYSTEMD_OF_WATCHDOG))
>>  		watchdog_build_bootargs(boot_get_enabled_watchdog(), of_get_parent(node));
>> @@ -176,7 +182,20 @@ static int of_write_bootargs(struct device_node *node)
>>  	if (strlen(str) == 0)
>>  		return 0;
>>  
>> -	return of_property_write_string(node, "bootargs", str);
>> +	if (!bootargs_overwrite) {
>> +		const char *oldstr;
>> +
>> +		ret = of_property_read_string(node, "bootargs", &oldstr);
>> +		if (!ret) {
>> +			str = buf = basprintf("%s %s", oldstr, str);
>> +			if (!buf)
>> +				return -ENOMEM;
>> +		}
>> +	}
>> +
>> +	ret = of_property_write_string(node, "bootargs", str);
>> +	free(buf);
>> +	return ret;
>>  }
>>  
>>  static int of_fixup_bootargs(struct device_node *root, void *unused)
>> @@ -218,6 +237,7 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
>>  
>>  static int of_register_bootargs_fixup(void)
>>  {
>> +	globalvar_add_simple_bool("linux.bootargs_overwrite", &bootargs_overwrite);
>>  	return of_register_fixup(of_fixup_bootargs, NULL);
>>  }
>>  late_initcall(of_register_bootargs_fixup);
>> -- 
>> 2.29.2
>>
>>
>> _______________________________________________
>> barebox mailing list
>> barebox@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/barebox
>>
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

Re: [PATCH 2/2] of: introduce global.linux.bootargs_overwrite

[Sascha Hauer]

On Tue, Apr 13, 2021 at 10:22:07AM +0200, Bastian Krause wrote:
> On 4/13/21 7:16 AM, Sascha Hauer wrote:
> > On Fri, Apr 09, 2021 at 10:15:03AM +0200, Bastian Krause wrote:
> >> From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> >>
> >> By default, barebox overwrites the bootargs in the oftree if it itself
> >> has any. Make this behavior configurable by adding a new global
> >> variable. It allows either overwriting the oftree bootargs
> >> (global.linux.bootargs_overwrite=1) or appending barebox' bootargs to
> >> the oftree bootargs (global.linux.bootargs_overwrite=0).
> >>
> >> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> >> [bst: dropped a new line removal, extend commit message]
> >> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> >> ---
> >>  common/oftree.c | 22 +++++++++++++++++++++-
> >>  1 file changed, 21 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/common/oftree.c b/common/oftree.c
> >> index aaeb199a9e..f3a5d9c5d1 100644
> >> --- a/common/oftree.c
> >> +++ b/common/oftree.c
> >> @@ -16,6 +16,7 @@
> >>  #include <reset_source.h>
> >>  #include <watchdog.h>
> >>  #include <globalvar.h>
> >> +#include <magicvar.h>
> >>  
> >>  #define MAX_LEVEL	32		/* how deeply nested we will go */
> >>  
> >> @@ -161,9 +162,14 @@ static void watchdog_build_bootargs(struct watchdog *watchdog, struct device_nod
> >>  	free(buf);
> >>  }
> >>  
> >> +static int bootargs_overwrite = 1;
> >> +BAREBOX_MAGICVAR(global.linux.bootargs_overwrite, "overwrite original oftree bootargs");
> > 
> > How about naming it global.linux.bootargs_append instead? It would make
> > it more clear that we are deviating from the default by setting the
> > variable to true.
> > 
> 
> That's fine with me.
> 
> Can you change that or should I send a v2?

Please send a v2

Thanks
  Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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