Skip to contentSkip to conversation

Introduce the sysinfo command

PATCH Superseded Detlev Casanova 2 participants 7 messages Jun 28, 2023 – Jun 29, 2023 Arm/RISC-V/Renesas architecture

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover Introduce the sysinfo command

The command can be used to show various information that can be used to identify the running system.

Currently supported subcommands are:
* model: A string representing the model
* id: The id of the board
* revision: The revision of this board.

I'm also not sure if a test should be added and where to start to test this kind of command.

Changes since v1:
- Removed shell function to select linux device tree. This will be distributions job.
- Break revision in rev_major and rev_minor in the sysinfo driver.

Detlev Casanova (4):
sysinfo: Add IDs for board id and revision
cmd: Add a sysinfo command
sysinfo: rcar3: Use int instead of char for revision
sysinfo: rcar3: Implement BOARD_ID and BOARD_REVISION_*

 cmd/Kconfig             |   6 ++
 cmd/Makefile            |   1 +
 cmd/sysinfo.c           | 134 ++++++++++++++++++++++++++++++++++++++
 drivers/sysinfo/rcar3.c | 141 ++++++++++++++++++++++++++++------------
 include/sysinfo.h       |   5 ++
 5 files changed, 245 insertions(+), 42 deletions(-)
 create mode 100644 cmd/sysinfo.c
Signature · 1 line
2.39.3
#1 lore raw

PATCH v2 1/4 sysinfo: Add IDs for board id and revision

These IDs will be used by the sysinfo command. The new IDs are:
* SYSINFO_ID_BOARD_ID: The board ID as an integer
* SYSINFO_ID_BOARD_REVISION: The board revision as a string

---
 include/sysinfo.h | 5 +++++
 1 file changed, 5 insertions(+)
include/sysinfo.h +5 -0
index b140d742e93..43d9e91212d 100644
@@ -47,6 +47,11 @@ enum sysinfo_id {
 	/* For show_board_info() */
 	SYSINFO_ID_BOARD_MODEL,
 
+	/* For sysinfo command */
+	SYSINFO_ID_BOARD_ID,
+	SYSINFO_ID_BOARD_REVISION_MAJOR,
+	SYSINFO_ID_BOARD_REVISION_MINOR,
+
 	/* First value available for downstream/board used */
 	SYSINFO_ID_USER = 0x1000,
 };
Signature · 1 line
2.39.3
#2 lore raw

Re: [PATCH v2 1/4] sysinfo: Add IDs for board id and revision

Hi Detlev,

Quoted 15 lines · Detlev Casanova

These IDs will be used by the sysinfo command. The new IDs are:
* SYSINFO_ID_BOARD_ID: The board ID as an integer
* SYSINFO_ID_BOARD_REVISION: The board revision as a string

---
 include/sysinfo.h | 5 +++++
 1 file changed, 5 insertions(+)
include/sysinfo.h +0 -0
index b140d742e93..43d9e91212d 100644

include/sysinfo.h enum sysinfo_id { · line 53

Quoted 7 lines
include/sysinfo.h +4 -0
@@ -47,6 +47,11 @@ enum sysinfo_id {
        /* For show_board_info() */
        SYSINFO_ID_BOARD_MODEL,
 
+       /* For sysinfo command */
+       SYSINFO_ID_BOARD_ID,
+       SYSINFO_ID_BOARD_REVISION_MAJOR,
+       SYSINFO_ID_BOARD_REVISION_MINOR,

Please mention that these are strings. Are they?

Also how about REV instead of REVISION as it is shorter

Quoted 7 lines
include/sysinfo.h +1 -1
+
        /* First value available for downstream/board used */
        SYSINFO_ID_USER = 0x1000,
 };
--

2.39.3

Regards,
Simon

#3 lore raw

PATCH v2 2/4 cmd: Add a sysinfo command

In reply to Detlev Casanova

The command is able to show different information for the running system:
* Model name
* Board ID
* Revision

This command can be used by boot shell scripts to select configurations depending on the specific running system.

---
 cmd/Kconfig   |   6 +++
 cmd/Makefile  |   1 +
 cmd/sysinfo.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 141 insertions(+)
 create mode 100644 cmd/sysinfo.c
cmd/Kconfig +6 -0
index 02e54f1e50f..9fb778ce809 100644
@@ -210,6 +210,12 @@ config CMD_SBI
 	help
 	  Display information about the SBI implementation.
 
+config CMD_SYSINFO
+	bool "sysinfo"
+	depends on SYSINFO
+	help
+	  Display information about the system.
+
 endmenu
 
 menu "Boot commands"
cmd/Makefile +1 -0
index 6c37521b4e2..ba4d6de9a1b 100644
@@ -165,6 +165,7 @@ obj-$(CONFIG_CMD_SPI) += spi.o
 obj-$(CONFIG_CMD_STRINGS) += strings.o
 obj-$(CONFIG_CMD_SMC) += smccc.o
 obj-$(CONFIG_CMD_SYSBOOT) += sysboot.o
+obj-$(CONFIG_CMD_SYSINFO) += sysinfo.o
 obj-$(CONFIG_CMD_STACKPROTECTOR_TEST) += stackprot_test.o
 obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o
 obj-$(CONFIG_CMD_TERMINAL) += terminal.o
cmd/sysinfo.c new file +134 -0

134 lines not on this page · raw message

Signature · 1 line
2.39.3
#4 lore raw

Re: [PATCH v2 2/4] cmd: Add a sysinfo command

Hi Detlev,

Quoted 10 lines · Detlev Casanova

The command is able to show different information for the running system:
* Model name
* Board ID
* Revision

This command can be used by boot shell scripts to select configurations depending on the specific running system.

Quoted 7 lines
---
 cmd/Kconfig   |   6 +++
 cmd/Makefile  |   1 +
 cmd/sysinfo.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 141 insertions(+)
 create mode 100644 cmd/sysinfo.c

Please add a test - see test/dm/sysinfo.c

Please also add doc/usage/cmd/sysinfo.rst

Quoted 38 lines
cmd/Kconfig +6 -0
index 02e54f1e50f..9fb778ce809 100644
@@ -210,6 +210,12 @@ config CMD_SBI
        help
          Display information about the SBI implementation.
 
+config CMD_SYSINFO
+       bool "sysinfo"
+       depends on SYSINFO
+       help
+         Display information about the system.
+
 endmenu
 
 menu "Boot commands"
cmd/Makefile +1 -0
index 6c37521b4e2..ba4d6de9a1b 100644
@@ -165,6 +165,7 @@ obj-$(CONFIG_CMD_SPI) += spi.o
 obj-$(CONFIG_CMD_STRINGS) += strings.o
 obj-$(CONFIG_CMD_SMC) += smccc.o
 obj-$(CONFIG_CMD_SYSBOOT) += sysboot.o
+obj-$(CONFIG_CMD_SYSINFO) += sysinfo.o
 obj-$(CONFIG_CMD_STACKPROTECTOR_TEST) += stackprot_test.o
 obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o
 obj-$(CONFIG_CMD_TERMINAL) += terminal.o
cmd/sysinfo.c new file +2 -0
new file mode 100644
index 00000000000..513ea0416a2
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*

cmd/sysinfo.c line 12

Quoted 10 lines
cmd/sysinfo.c new file +10 -0
+ * Copyright 2023
+ * Detlev Casanova <[email protected]>
+ */
+
+#include <command.h>
+#include <env.h>
+#include <sysinfo.h>
+#include <vsprintf.h>
+
+static int get_sysinfo(struct udevice **dev)

Please use devp since this is the common convention (indicating it is a return value)

cmd/sysinfo.c line 17

Quoted 5 lines
cmd/sysinfo.c new file +5 -0
+{
+       int ret = sysinfo_get(dev);
+
+       if (ret) {
+               debug("Cannot get sysinfo: %d\n", ret);

printf() to be more helpful?

cmd/sysinfo.c line 23

Quoted 6 lines
cmd/sysinfo.c new file +6 -0
+               return ret;
+       }
+
+       ret = sysinfo_detect(*dev);
+       if (ret) {
+               debug("Cannot detect sysinfo: %d\n", ret);

printf() to be more helpful?

Quoted 18 lines
cmd/sysinfo.c new file +18 -0
+               return ret;
+       }
+
+       return 0;
+}
+
+static int do_sysinfo_model(struct cmd_tbl *cmdtp, int flag, int argc,
+                           char *const argv[])
+{
+       struct udevice *dev;
+       char model[64];
+       int ret = get_sysinfo(&dev);
+
+       if (ret)
+               return CMD_RET_FAILURE;
+
+       ret = sysinfo_get_str(dev,
+                             SYSINFO_ID_BOARD_MODEL,

cmd/sysinfo.c line 51

Quoted 10 lines
cmd/sysinfo.c new file +10 -0
+                             sizeof(model),
+                             model);
+
+       if (ret) {
+               debug("Cannot get sysinfo str: %d\n", ret);
+               return CMD_RET_FAILURE;
+       }
+
+       if (argc == 2)
+               env_set(argv[1], model);

check return value

same below

Quoted 9 lines
cmd/sysinfo.c new file +9 -0
+       else
+               printf("%s\n", model);
+
+       return CMD_RET_SUCCESS;
+}
+
+static int do_sysinfo_id(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
+{

cmd/sysinfo.c line 70

Quoted 10 lines
cmd/sysinfo.c new file +10 -0
+       struct udevice *dev;
+       u32 board_id;
+       int ret = get_sysinfo(&dev);
+
+       if (ret)
+               return CMD_RET_FAILURE;
+
+       ret = sysinfo_get_int(dev,
+                             SYSINFO_ID_BOARD_ID,
+                             &board_id);

can you fit on one line?

Quoted 29 lines
cmd/sysinfo.c new file +29 -0
+
+       if (ret) {
+               debug("Cannot get sysinfo int: %d\n", ret);
+               return CMD_RET_FAILURE;
+       }
+
+       if (argc == 2)
+               env_set_hex(argv[1], board_id);
+       else
+               printf("0x%02x\n", board_id);
+
+       return CMD_RET_SUCCESS;
+}
+
+static int do_sysinfo_revision(struct cmd_tbl *cmdtp, int flag, int argc,
+                              char *const argv[])
+{
+       struct udevice *dev;
+       int rev_major;
+       int rev_minor;
+       char rev[4];
+       int ret = get_sysinfo(&dev);
+
+       if (ret)
+               return CMD_RET_FAILURE;
+
+       ret = sysinfo_get_int(dev,
+                             SYSINFO_ID_BOARD_REVISION_MAJOR,
+                             &rev_major);

cmd/sysinfo.c line 109

Quoted 10 lines
cmd/sysinfo.c new file +10 -0
+
+       if (ret) {
+               debug("Cannot get sysinfo int: %d\n", ret);
+               return CMD_RET_FAILURE;
+       }
+
+       ret = sysinfo_get_int(dev,
+                             SYSINFO_ID_BOARD_REVISION_MINOR,
+                             &rev_minor);
+

drop blank line between ret = and if (ret) ...please fix globally

Quoted 26 lines
cmd/sysinfo.c new file +25 -1
+       if (ret) {
+               debug("Cannot get sysinfo int: %d\n", ret);
+               return CMD_RET_FAILURE;
+       }
+
+       snprintf(rev, sizeof(rev), "%d.%d", rev_major, rev_minor);
+
+       if (argc == 2)
+               env_set(argv[1], rev);
+       else
+               printf("%s\n", rev);
+
+       return CMD_RET_SUCCESS;
+}
+
+static char sysinfo_help_text[] =
+       "model <varname>     - Show or set the board model in varname\n"
+       "sysinfo id <varname>        - Show or set the board id in varname (in format 0xHH)\n"
+       "sysinfo revision <varname>  - Show or set the board revision in varname";
+
+U_BOOT_CMD_WITH_SUBCMDS(sysinfo, "System information", sysinfo_help_text,
+                       U_BOOT_SUBCMD_MKENT(model, 2, 1, do_sysinfo_model),
+                       U_BOOT_SUBCMD_MKENT(id, 2, 1, do_sysinfo_id),
+                       U_BOOT_SUBCMD_MKENT(revision, 2, 1, do_sysinfo_revision),
+);
--
Quoted 2 lines

2.39.3

Regards,
Simon

#5 lore raw

PATCH v2 3/4 sysinfo: rcar3: Use int instead of char for revision

In reply to Detlev Casanova

To be used with the sysinfo command, revision values must be considered as integers, not chars as some boards will implement BOARD_REVISION_* and might use numbers greater than 9.

---
 drivers/sysinfo/rcar3.c | 104 ++++++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 42 deletions(-)
drivers/sysinfo/rcar3.c +62 -42
index 7b127986da7..450a4c26773 100644
@@ -68,90 +68,110 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
 	bool salvator_xs = false;
 	bool ebisu_4d = false;
 	bool condor_i = false;
-	char rev_major = '?';
-	char rev_minor = '?';
+	char model[64];
+	char rev[4] = "?.?";
+	u8 rev_major = 0;
+	u8 rev_minor = 0;
 
 	switch (board_id) {
 	case BOARD_SALVATOR_XS:
 		salvator_xs = true;
 		fallthrough;
 	case BOARD_SALVATOR_X:
+		snprintf(model, sizeof(model),
+			 "Renesas Salvator-X%s board", salvator_xs ? "S" : "");
 		if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */
-			rev_major = '1';
-			rev_minor = '0' + (board_rev & BIT(0));
+			rev_major = 1;
+			rev_minor = board_rev & BIT(0);
+			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
 		}
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
-			 "Renesas Salvator-X%s board rev %c.%c",
-			 salvator_xs ? "S" : "", rev_major, rev_minor);
+
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
+			 model, rev);
+
 		return;
 	case BOARD_STARTER_KIT:
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+			 "Renesas Starter Kit board");
 		if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */
-			rev_major = (board_rev & BIT(0)) ? '3' : '1';
-			rev_minor = '0';
+			rev_major = (board_rev & BIT(0)) ? 3 : 1;
+			rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
 		}
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
-			 "Renesas Starter Kit board rev %c.%c",
-			 rev_major, rev_minor);
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
+			 model, rev);
 		return;
 	case BOARD_STARTER_KIT_PRE:
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+			 "Renesas Starter Kit Premier board");
 		if (!(board_rev & ~3)) { /* Only rev 0..3 is valid */
-			rev_major = (board_rev & BIT(1)) ? '2' : '1';
-			rev_minor = (board_rev == 3) ? '1' : '0';
+			rev_major = (board_rev & BIT(1)) ? 2 : 1;
+			rev_minor = (board_rev == 3) ? 1 : 0;
+			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
 		}
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
-			 "Renesas Starter Kit Premier board rev %c.%c",
-			 rev_major, rev_minor);
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
+			 model, rev);
 		return;
 	case BOARD_EAGLE:
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+			 "Renesas Eagle board");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = '1';
-			rev_minor = '0';
+			rev_major = 1;
+			rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
 		}
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
-			 "Renesas Eagle board rev %c.%c",
-			 rev_major, rev_minor);
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
+			 model, rev);
 		return;
 	case BOARD_EBISU_4D:
 		ebisu_4d = true;
 		fallthrough;
 	case BOARD_EBISU:
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+			 "Renesas Ebisu%s board", ebisu_4d ? "-4D" : "");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = '1';
-			rev_minor = '0';
+			rev_major = 1;
+			rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
 		}
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
-			 "Renesas Ebisu%s board rev %c.%c",
-			 ebisu_4d ? "-4D" : "", rev_major, rev_minor);
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
+			 model, rev);
 		return;
 	case BOARD_DRAAK:
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+			 "Renesas Draak board");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = '1';
-			rev_minor = '0';
+			rev_major = 1;
+			rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
 		}
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
-			 "Renesas Draak board rev %c.%c",
-			 rev_major, rev_minor);
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
+			 model, rev);
 		return;
 	case BOARD_KRIEK:
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+			 "Renesas Kriek board");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = '1';
-			rev_minor = '0';
+			rev_major = 1;
+			rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
 		}
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
-			 "Renesas Kriek board rev %c.%c",
-			 rev_major, rev_minor);
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
+			 model, rev);
 		return;
 	case BOARD_CONDOR_I:
 		condor_i = true;
 		fallthrough;
 	case BOARD_CONDOR:
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+			 "Renesas Condor%s board", condor_i ? "-I" : "");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = '1';
-			rev_minor = '0';
+			rev_major = 1;
+			rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
 		}
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
-			"Renesas Condor%s board rev %c.%c",
-			condor_i ? "-I" : "", rev_major, rev_minor);
+		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
+			 model, rev);
 		return;
 	default:
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
Signature · 1 line
2.39.3
#6 lore raw

PATCH v2 4/4 sysinfo: rcar3: Implement BOARD_ID and BOARD_REVISION_*

In reply to Detlev Casanova

Expose that information to the command shell to let scripts select the correct devicetree name.

---
 drivers/sysinfo/rcar3.c | 103 +++++++++++++++++++++++++++-------------
 1 file changed, 70 insertions(+), 33 deletions(-)
drivers/sysinfo/rcar3.c +70 -33
index 450a4c26773..1a99642bf75 100644
@@ -32,6 +32,10 @@
  */
 struct sysinfo_rcar_priv {
 	char	boardmodel[64];
+	u8	id;
+	u8	rev_major;
+	u8	rev_minor;
+	bool	has_rev;
 	u8	val;
 };
 
@@ -56,9 +60,33 @@ static int sysinfo_rcar_get_str(struct udevice *dev, int id, size_t size, char *
 	};
 }
 
+static int sysinfo_rcar_get_int(struct udevice *dev, int id, int *val)
+{
+	struct sysinfo_rcar_priv *priv = dev_get_priv(dev);
+
+	switch (id) {
+	case SYSINFO_ID_BOARD_ID:
+		*val = priv->id;
+		return 0;
+	case SYSINFO_ID_BOARD_REVISION_MAJOR:
+		if (!priv->has_rev)
+			return -EINVAL;
+		*val = priv->rev_major;
+		return 0;
+	case SYSINFO_ID_BOARD_REVISION_MINOR:
+		if (!priv->has_rev)
+			return -EINVAL;
+		*val = priv->rev_minor;
+		return 0;
+	default:
+		return -EINVAL;
+	};
+}
+
 static const struct sysinfo_ops sysinfo_rcar_ops = {
 	.detect = sysinfo_rcar_detect,
 	.get_str = sysinfo_rcar_get_str,
+	.get_int = sysinfo_rcar_get_int,
 };
 
 static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
@@ -70,8 +98,9 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
 	bool condor_i = false;
 	char model[64];
 	char rev[4] = "?.?";
-	u8 rev_major = 0;
-	u8 rev_minor = 0;
+
+	priv->id = board_id;
+	priv->has_rev = false;
 
 	switch (board_id) {
 	case BOARD_SALVATOR_XS:
@@ -81,9 +110,10 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
 		snprintf(model, sizeof(model),
 			 "Renesas Salvator-X%s board", salvator_xs ? "S" : "");
 		if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */
-			rev_major = 1;
-			rev_minor = board_rev & BIT(0);
-			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
+			priv->rev_major = 1;
+			priv->rev_minor = board_rev & BIT(0);
+			priv->has_rev = true;
+			snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major, priv->rev_minor);
 		}
 
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
@@ -91,34 +121,37 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
 
 		return;
 	case BOARD_STARTER_KIT:
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+		snprintf(model, sizeof(model),
 			 "Renesas Starter Kit board");
 		if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */
-			rev_major = (board_rev & BIT(0)) ? 3 : 1;
-			rev_minor = 0;
-			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
+			priv->rev_major = (board_rev & BIT(0)) ? 3 : 1;
+			priv->rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major, priv->rev_minor);
+			priv->has_rev = true;
 		}
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
 			 model, rev);
 		return;
 	case BOARD_STARTER_KIT_PRE:
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+		snprintf(model, sizeof(model),
 			 "Renesas Starter Kit Premier board");
 		if (!(board_rev & ~3)) { /* Only rev 0..3 is valid */
-			rev_major = (board_rev & BIT(1)) ? 2 : 1;
-			rev_minor = (board_rev == 3) ? 1 : 0;
-			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
+			priv->rev_major = (board_rev & BIT(1)) ? 2 : 1;
+			priv->rev_minor = (board_rev == 3) ? 1 : 0;
+			snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major, priv->rev_minor);
+			priv->has_rev = true;
 		}
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
 			 model, rev);
 		return;
 	case BOARD_EAGLE:
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+		snprintf(model, sizeof(model),
 			 "Renesas Eagle board");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = 1;
-			rev_minor = 0;
-			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
+			priv->rev_major = 1;
+			priv->rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major, priv->rev_minor);
+			priv->has_rev = true;
 		}
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
 			 model, rev);
@@ -127,34 +160,37 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
 		ebisu_4d = true;
 		fallthrough;
 	case BOARD_EBISU:
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+		snprintf(model, sizeof(model),
 			 "Renesas Ebisu%s board", ebisu_4d ? "-4D" : "");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = 1;
-			rev_minor = 0;
-			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
+			priv->rev_major = 1;
+			priv->rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major, priv->rev_minor);
+			priv->has_rev = true;
 		}
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
 			 model, rev);
 		return;
 	case BOARD_DRAAK:
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+		snprintf(model, sizeof(model),
 			 "Renesas Draak board");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = 1;
-			rev_minor = 0;
-			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
+			priv->rev_major = 1;
+			priv->rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major, priv->rev_minor);
+			priv->has_rev = true;
 		}
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
 			 model, rev);
 		return;
 	case BOARD_KRIEK:
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+		snprintf(model, sizeof(model),
 			 "Renesas Kriek board");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = 1;
-			rev_minor = 0;
-			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
+			priv->rev_major = 1;
+			priv->rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major, priv->rev_minor);
+			priv->has_rev = true;
 		}
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
 			 model, rev);
@@ -163,12 +199,13 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
 		condor_i = true;
 		fallthrough;
 	case BOARD_CONDOR:
-		snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+		snprintf(model, sizeof(model),
 			 "Renesas Condor%s board", condor_i ? "-I" : "");
 		if (!board_rev) { /* Only rev 0 is valid */
-			rev_major = 1;
-			rev_minor = 0;
-			snprintf(rev, sizeof(rev), "%u.%u", rev_major, rev_minor);
+			priv->rev_major = 1;
+			priv->rev_minor = 0;
+			snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major, priv->rev_minor);
+			priv->has_rev = true;
 		}
 		snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev %s",
 			 model, rev);
Signature · 1 line
2.39.3