diff mbox

[U-Boot] rpi: set board serial number in environment

Message ID 1456175207-5329-1-git-send-email-lkundrak@v3.sk
State Accepted
Commit 757cd149b9c6928734fab0b831a7624168a0b71c
Delegated to: Tom Rini
Headers show

Commit Message

Lubomir Rintel Feb. 22, 2016, 9:06 p.m. UTC 
Gets propagated into the device tree and then into /proc/cpuinfo where
users often expect it.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/mach-bcm283x/include/mach/mbox.h | 11 +++++++++++
 board/raspberrypi/rpi/rpi.c               | 33 +++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

Comments

Stephen Warren Feb. 23, 2016, 6:30 a.m. UTC | #1 
On 02/22/2016 02:06 PM, Lubomir Rintel wrote:
> Gets propagated into the device tree and then into /proc/cpuinfo where
> users often expect it.

Tested-by: Stephen Warren <swarren@wwwdotorg.org>
(on qemu-0xabu at least)

Reviewed-by: Stephen Warren <swarren@wwwdotorg.org>
Tom Rini Feb. 25, 2016, 3:26 p.m. UTC | #2 
On Mon, Feb 22, 2016 at 10:06:47PM +0100, Lubomir Rintel wrote:

> Gets propagated into the device tree and then into /proc/cpuinfo where
> users often expect it.
> 
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> Tested-by: Stephen Warren <swarren@wwwdotorg.org>
> Reviewed-by: Stephen Warren <swarren@wwwdotorg.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index 0039d09..072ff2d 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -150,6 +150,17 @@  struct bcm2835_mbox_tag_get_mac_address {
 	} body;
 };
 
+#define BCM2835_MBOX_TAG_GET_BOARD_SERIAL	0x00010004
+
+struct bcm2835_mbox_tag_get_board_serial {
+	struct bcm2835_mbox_tag_hdr tag_hdr;
+	union {
+		struct __packed {
+			u64 serial;
+		} resp;
+	} body;
+};
+
 #define BCM2835_MBOX_TAG_GET_ARM_MEMORY		0x00010005
 
 struct bcm2835_mbox_tag_get_arm_mem {
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 86a2232..7a75d43 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <inttypes.h>
 #include <config.h>
 #include <dm.h>
 #include <fdt_support.h>
@@ -57,6 +58,12 @@  struct msg_get_board_rev {
 	u32 end_tag;
 };
 
+struct msg_get_board_serial {
+	struct bcm2835_mbox_hdr hdr;
+	struct bcm2835_mbox_tag_get_board_serial get_board_serial;
+	u32 end_tag;
+};
+
 struct msg_get_mac_address {
 	struct bcm2835_mbox_hdr hdr;
 	struct bcm2835_mbox_tag_get_mac_address get_mac_address;
@@ -288,6 +295,30 @@  static void set_board_info(void)
 }
 #endif /* CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG */
 
+static void set_serial_number(void)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_board_serial, msg, 1);
+	int ret;
+	char serial_string[17] = { 0 };
+
+	if (getenv("serial#"))
+		return;
+
+	BCM2835_MBOX_INIT_HDR(msg);
+	BCM2835_MBOX_INIT_TAG_NO_REQ(&msg->get_board_serial, GET_BOARD_SERIAL);
+
+	ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg->hdr);
+	if (ret) {
+		printf("bcm2835: Could not query board serial\n");
+		/* Ignore error; not critical */
+		return;
+	}
+
+	snprintf(serial_string, sizeof(serial_string), "%016" PRIx64,
+		 msg->get_board_serial.body.resp.serial);
+	setenv("serial#", serial_string);
+}
+
 int misc_init_r(void)
 {
 	set_fdtfile();
@@ -295,6 +326,8 @@  int misc_init_r(void)
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 	set_board_info();
 #endif
+	set_serial_number();
+
 	return 0;
 }