[PATCH v3 0/4] Pass reset and boot sources via /chosen node

[PATCH v3 0/4] Pass reset and boot sources via /chosen node

[Andrey Smirnov]

Everyone:

The following patches are really usefull for Linux userspace
applications that need to know the details about reset and boot
sources.

Feedback is welcome!

Changes since [v2]:

	- Dropped unnecessary code in bootsource_get_alias_name().

	- Chagned bootsource_get_alias_name() to bail out if
          bootsource_instance is not properly set up

	- Converted BOOTSOURCE_I2C_EEPROM and BOOTSOURCE_SPI_EEPROM to
          be handled more explicitly

	- Dropped unnecessary code in of_fixup_bootargs_bootsource()

Changes since [v1]:

	- Series reworked to pass bootsource as a pointer to a
          devicetree node corresponding to detected bootsource

[v1] http://lists.infradead.org/pipermail/barebox/2018-May/032814.html
[v2] http://lists.infradead.org/pipermail/barebox/2018-May/032909.html

Andrey Smirnov (4):
  of: Make of_property_get_value() public
  bootsource: Add bootsource alias name API
  common: oftree: Pass bootsource and bootsource instance to kernel
  common: oftree: Pass reset source and reset source instance to kernel

 common/bootsource.c  | 68 ++++++++++++++++++++++++++++++++++++++++++++
 common/oftree.c      | 33 ++++++++++++++++++++-
 drivers/of/base.c    |  5 ----
 include/bootsource.h |  2 ++
 include/of.h         |  6 ++++
 5 files changed, 108 insertions(+), 6 deletions(-)

-- 
2.17.0


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

[PATCH v3 1/4] of: Make of_property_get_value() public

[Andrey Smirnov]

Make of_property_get_value() public, so it can be used in other part
of the system.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/of/base.c | 5 -----
 include/of.h      | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 4bcc11364..fc01a99ef 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -129,11 +129,6 @@ struct property *of_find_property(const struct device_node *np,
 }
 EXPORT_SYMBOL(of_find_property);
 
-static const void *of_property_get_value(struct property *pp)
-{
-	return pp->value ? pp->value : pp->value_const;
-}
-
 static void of_alias_add(struct alias_prop *ap, struct device_node *np,
 			 int id, const char *stem, int stem_len)
 {
diff --git a/include/of.h b/include/of.h
index fec51bb94..7fc4b7791 100644
--- a/include/of.h
+++ b/include/of.h
@@ -94,6 +94,12 @@ static inline void of_write_number(void *__cell, u64 val, int size)
 	}
 }
 
+static inline const void *of_property_get_value(struct property *pp)
+{
+	return pp->value ? pp->value : pp->value_const;
+}
+
+
 void of_print_property(const void *data, int len);
 void of_print_cmdline(struct device_node *root);
 
-- 
2.17.0


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

[PATCH v3 2/4] bootsource: Add bootsource alias name API

[Andrey Smirnov]

Add API allowing to query and override the name of the alias pointing
at DTB node representing current bootsource.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 common/bootsource.c  | 68 ++++++++++++++++++++++++++++++++++++++++++++
 include/bootsource.h |  2 ++
 2 files changed, 70 insertions(+)

diff --git a/common/bootsource.c b/common/bootsource.c
index 78ecd8267..e68338faa 100644
--- a/common/bootsource.c
+++ b/common/bootsource.c
@@ -41,6 +41,74 @@ static const char *bootsource_str[] = {
 
 static enum bootsource bootsource = BOOTSOURCE_UNKNOWN;
 static int bootsource_instance = BOOTSOURCE_INSTANCE_UNKNOWN;
+const char *bootsource_alias_name = NULL;
+
+/**
+ * bootsource_get_alias_name() - Get the name of the bootsource alias
+ *
+ * This function will return newly allocated string containing name of
+ * the alias that is expected to point to DTB node corresponding to
+ * detected bootsource
+ *
+ * NOTE: Caller is expected to free() the string allocated by this
+ * function
+ */
+char *bootsource_get_alias_name(void)
+{
+	const char *stem;
+
+	/*
+	 * If alias name was overridden via
+	 * bootsource_set_alias_name() return that value without
+	 * asking any questions.
+	 *
+	 * Note that we have to strdup() the result to make it
+	 * free-able.
+	 */
+	if (bootsource_alias_name)
+		return strdup(bootsource_alias_name);
+
+	switch (bootsource) {
+		/*
+		 * For I2C and SPI EEPROMs we set the stem to be 'i2c'
+		 * and 'spi' correspondingly. The resulting alias will
+		 * be pointing at the controller said EEPROM is
+		 * attached to.
+		 *
+		 * NOTE: This code assumes single bootable EEPROM per
+		 * controller
+		 */
+	case BOOTSOURCE_I2C_EEPROM:
+		stem = bootsource_str[BOOTSOURCE_I2C];
+		break;
+	case BOOTSOURCE_SPI_EEPROM:
+		stem = bootsource_str[BOOTSOURCE_SPI];
+		break;
+	case BOOTSOURCE_SERIAL:	/* FALLTHROUGH */
+	case BOOTSOURCE_I2C:	/* FALLTHROUGH */
+	case BOOTSOURCE_MMC:	/* FALLTHROUGH */
+	case BOOTSOURCE_SPI:	/* FALLTHROUGH */
+	case BOOTSOURCE_CAN:
+		stem = bootsource_str[bootsource];
+		break;
+	default:
+		return NULL;
+	}
+
+	/*
+	 * We expect SoC specific bootsource detction code to properly
+	 * initalize bootsource_instance, so we bail out if it didn't
+	 */
+	if (bootsource_instance == BOOTSOURCE_INSTANCE_UNKNOWN)
+		return NULL;
+
+	return basprintf("%s%d", stem, bootsource_instance);
+}
+
+void bootsource_set_alias_name(const char *name)
+{
+	bootsource_alias_name = name;
+}
 
 void bootsource_set(enum bootsource src)
 {
diff --git a/include/bootsource.h b/include/bootsource.h
index 064f6b9a2..29347aaeb 100644
--- a/include/bootsource.h
+++ b/include/bootsource.h
@@ -25,5 +25,7 @@ enum bootsource bootsource_get(void);
 int bootsource_get_instance(void);
 void bootsource_set(enum bootsource src);
 void bootsource_set_instance(int instance);
+void bootsource_set_alias_name(const char *name);
+char *bootsource_get_alias_name(void);
 
 #endif	/* __BOOTSOURCE_H__ */
-- 
2.17.0


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

[PATCH v3 3/4] common: oftree: Pass bootsource and bootsource instance to kernel

[Andrey Smirnov]

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 <andrew.smirnov@gmail.com>
---
 common/oftree.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/common/oftree.c b/common/oftree.c
index 8a2ede4c6..a38dfff29 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -11,6 +11,7 @@
 #include <getopt.h>
 #include <init.h>
 #include <boot.h>
+#include <bootsource.h>
 #include <i2c/i2c.h>
 
 #define MAX_LEVEL	32		/* how deeply nested we will go */
@@ -114,6 +115,29 @@ 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;
+	int ret = 0;
+
+	if (!alias_name)
+		return 0;
+
+	bootsource = of_find_node_by_alias(root, alias_name);
+	/*
+	 * If kernel DTB doesn't have the appropriate alias set up,
+	 * give up and exit early. No error is reported.
+	 */
+	if (bootsource)
+		ret = of_set_property(chosen, "bootsource", bootsource->full_name,
+				      strlen(bootsource->full_name) + 1, true);
+
+	free(alias_name);
+	return ret;
+}
+
 static int of_fixup_bootargs(struct device_node *root, void *unused)
 {
 	struct device_node *node;
@@ -131,8 +155,10 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
 	of_property_write_string(node, "barebox-version", release_string);
 
 	err = of_property_write_string(node, "bootargs", str);
+	if (err)
+		return err;
 
-	return err;
+	return of_fixup_bootargs_bootsource(root, node);
 }
 
 static int of_register_bootargs_fixup(void)
-- 
2.17.0


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

[PATCH v3 4/4] common: oftree: Pass reset source and reset source instance to kernel

[Andrey Smirnov]

Detecting reset reason is, in some cases, a destructive operation and
in such cases it is impossible to obtain that information in the
kernel without some help from barebox.

Pass reset source and reset source instance to kernel to Linux to make
it availible to Linux userspace. This info is placeed under
/chosen/bootsource and it can be read under Linux in

/sys/firmware/devicetree/base/chosen/reset-source.

and

/sys/firmware/devicetree/base/chosen/reset-source-instance.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 common/oftree.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/oftree.c b/common/oftree.c
index a38dfff29..5bb5420a7 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -13,6 +13,7 @@
 #include <boot.h>
 #include <bootsource.h>
 #include <i2c/i2c.h>
+#include <reset_source.h>
 
 #define MAX_LEVEL	32		/* how deeply nested we will go */
 
@@ -158,6 +159,10 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
 	if (err)
 		return err;
 
+	of_property_write_string(node, "reset-source", reset_source_name());
+	of_property_write_u32(node, "reset-source-instance",
+			      reset_source_get_instance());
+
 	return of_fixup_bootargs_bootsource(root, node);
 }
 
-- 
2.17.0


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

Re: [PATCH v3 0/4] Pass reset and boot sources via /chosen node

[Sascha Hauer]

On Thu, May 17, 2018 at 02:29:13PM -0700, Andrey Smirnov wrote:
> Everyone:
> 
> The following patches are really usefull for Linux userspace
> applications that need to know the details about reset and boot
> sources.
> 
> Feedback is welcome!

Applied, thanks

Sascha

> 
> Changes since [v2]:
> 
> 	- Dropped unnecessary code in bootsource_get_alias_name().
> 
> 	- Chagned bootsource_get_alias_name() to bail out if
>           bootsource_instance is not properly set up
> 
> 	- Converted BOOTSOURCE_I2C_EEPROM and BOOTSOURCE_SPI_EEPROM to
>           be handled more explicitly
> 
> 	- Dropped unnecessary code in of_fixup_bootargs_bootsource()
> 
> Changes since [v1]:
> 
> 	- Series reworked to pass bootsource as a pointer to a
>           devicetree node corresponding to detected bootsource
> 
> [v1] http://lists.infradead.org/pipermail/barebox/2018-May/032814.html
> [v2] http://lists.infradead.org/pipermail/barebox/2018-May/032909.html
> 
> Andrey Smirnov (4):
>   of: Make of_property_get_value() public
>   bootsource: Add bootsource alias name API
>   common: oftree: Pass bootsource and bootsource instance to kernel
>   common: oftree: Pass reset source and reset source instance to kernel
> 
>  common/bootsource.c  | 68 ++++++++++++++++++++++++++++++++++++++++++++
>  common/oftree.c      | 33 ++++++++++++++++++++-
>  drivers/of/base.c    |  5 ----
>  include/bootsource.h |  2 ++
>  include/of.h         |  6 ++++
>  5 files changed, 108 insertions(+), 6 deletions(-)
> 
> -- 
> 2.17.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

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

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