Skip to contentSkip to conversation

Toradex: EEPROM storage support for Config Block

PATCH New Igor Opaniuk 1 participant 8 messages Jun 22, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Toradex: EEPROM storage support for Config Block

This series introduces support for EEPROM as a storage for the main Toradex config block and additional config blocks on extra EEPROM chips (on carrier board or video adapters).

To enable EEPROM as a storage for the main config block:
TDX_HAVE_EEPROM=y.

For additional EEPROMs please enable this Kconfig symbol:
TDX_CFG_BLOCK_EXTRA=y.

Information about existing EEPROM chips is provided via Device Tree using aliases.

You can also write configuration for the carrier board using create_carrier subcommand for cfgblock. Example:

Verdin iMX8MM # cfgblock create_carrier
Supported carrier boards:
UNKNOWN CARRIER = [0]
Verdin Carrier Board = [1]
Choose your carrier board (provide ID): 1
Enter carrier board version (e.g. V1.1B): V1.0A
Enter carrier board serial number: 10622780

Also with barcode:
Verdin iMX8MM # cfgblock create carrier -y 0156100010622780

Igor Opaniuk (7):
toradex: tdx-cfg-block: add EEPROM read/store wrappers
toradex: tdx-cfg-block: add carrier boards and display adapters
toradex: tdx-cfg-block: add support for EEPROM
toradex: tdx-cfg-clock: add migration routine from PID8
toradex: tdx-cfg-block: add carrier board info printing
ARM: dts: imx8mm-verdin: eeprom nodes adjustments
verdin-imx8mm: add EEPROM support for carrier board

 arch/arm/dts/imx8mm-verdin.dts       |  22 +-
 board/toradex/common/Kconfig         |  18 ++
 board/toradex/common/Makefile        |   1 +
 board/toradex/common/tdx-cfg-block.c | 402 +++++++++++++++++++++++++++++++----
 board/toradex/common/tdx-cfg-block.h |  16 ++
 board/toradex/common/tdx-common.c    |  28 +++
 board/toradex/common/tdx-eeprom.c    |  90 ++++++++
 board/toradex/common/tdx-eeprom.h    |  14 ++
 board/toradex/verdin-imx8mm/Kconfig  |   6 +
 configs/verdin-imx8mm_defconfig      |   1 +
 10 files changed, 551 insertions(+), 47 deletions(-)
 create mode 100644 board/toradex/common/tdx-eeprom.c
 create mode 100644 board/toradex/common/tdx-eeprom.h
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/7 toradex: tdx-cfg-block: add EEPROM read/store wrappers

From: Igor Opaniuk <[email protected]>

These functions wrap functionality for storing config blocks in EEPROM.

---

 board/toradex/common/Makefile     |  1 +
 board/toradex/common/tdx-eeprom.c | 90 +++++++++++++++++++++++++++++++++++++++
 board/toradex/common/tdx-eeprom.h | 14 ++++++
 3 files changed, 105 insertions(+)
 create mode 100644 board/toradex/common/tdx-eeprom.c
 create mode 100644 board/toradex/common/tdx-eeprom.h
board/toradex/common/Makefile +1 -0
index 6b9fccb..7b19b6e 100644
@@ -8,4 +8,5 @@ obj- := __dummy__.o
 else
 obj-$(CONFIG_TDX_CFG_BLOCK) += tdx-cfg-block.o
 obj-y += tdx-common.o
+obj-y += tdx-eeprom.o
 endif
board/toradex/common/tdx-eeprom.c new file +90 -0

90 lines not on this page · raw message

board/toradex/common/tdx-eeprom.h new file +14 -0
new file mode 100644
index 0000000..a6772d2
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2020 Toradex
+ */
+
+#ifndef _TDX_EEPROM_H
+#define _TDX_EEPROM_H
+
+#include <i2c_eeprom.h>
+
+int read_tdx_eeprom_data(u32 eeprom_id, int offset, uint8_t *buf, int size);
+int write_tdx_eeprom_data(u32 eeprom_id, int offset, uint8_t *buf, int size);
+
+#endif /* _TDX_EEPROM_H */
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/7 toradex: tdx-cfg-block: add carrier boards and display adapters

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Add defines for supported carrier boards and display adapters.

---

 board/toradex/common/tdx-cfg-block.c | 12 ++++++++++++
 board/toradex/common/tdx-cfg-block.h | 11 +++++++++++
 2 files changed, 23 insertions(+)
board/toradex/common/tdx-cfg-block.c +12 -0
index 75216ec..48d2d0f 100644
@@ -124,6 +124,18 @@ const char * const toradex_modules[] = {
 	[57] = "Verdin iMX8M Mini DualLite 1GB",
 };
 
+const char * const toradex_carrier_boards[] = {
+	[0] = "UNKNOWN CARRIER",
+	[155] = "Dahlia",
+	[156] = "Verdin Development Board",
+};
+
+const char * const toradex_display_adapters[] = {
+	[0] = "UNKNOWN ADAPTER",
+	[157] = "Verdin DSI to HDMI Adapter",
+	[159] = "Verdin DSI to LVDS Adapter",
+};
+
 #ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC
 static int tdx_cfg_block_mmc_storage(u8 *config_block, int write)
 {
board/toradex/common/tdx-cfg-block.h +11 -0
index d8f3941..d58be23 100644
@@ -80,7 +80,18 @@ enum {
 	VERDIN_IMX8MMDL,
 };
 
+enum {
+	DAHLIA = 155,
+	VERDIN_DEVELOPMENT_BOARD = 156,
+};
+
+enum {
+	VERDIN_DSI_TO_HDMI_ADAPTER = 157,
+	VERDIN_DSI_TO_LVDS_ADAPTER = 159,
+};
+
 extern const char * const toradex_modules[];
+extern const char * const toradex_carrier_boards[];
 extern bool valid_cfgblock;
 extern struct toradex_hw tdx_hw_tag;
 extern struct toradex_eth_addr tdx_eth_addr;
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/7 toradex: tdx-cfg-block: add support for EEPROM

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

This introduces support for EEPROM as a storage for the main Toradex config block and additional config blocks on extra EEPROM chips (on carrier board or video adapters).

To enable EEPROM as a storage for the main config block:
TDX_HAVE_EEPROM=y.

For additional EEPROMs please enable this Kconfig symbol:
TDX_CFG_BLOCK_EXTRA=y.

Information about existing EEPROM chips is provided via Device Tree using aliases.

You can also write configuration for the carrier board using create_carrier subcommand for cfgblock. Example:

Verdin iMX8MM # cfgblock create_carrier
Supported carrier boards:
UNKNOWN CARRIER = [0]
Verdin Carrier Board = [1]
Choose your carrier board (provide ID): 1
Enter carrier board version (e.g. V1.1B): V1.0A
Enter carrier board serial number: 10622780

Also with barcode:
Verdin iMX8MM # cfgblock create carrier -y 0156100010622780

---

 board/toradex/common/Kconfig         |  18 ++
 board/toradex/common/tdx-cfg-block.c | 312 ++++++++++++++++++++++++++++++-----
 board/toradex/common/tdx-cfg-block.h |   3 +
 3 files changed, 294 insertions(+), 39 deletions(-)
board/toradex/common/Kconfig +18 -0
index 11f4aab..36068d2 100644
@@ -20,6 +20,12 @@ config TDX_HAVE_NAND
 config TDX_HAVE_NOR
 	bool
 
+config TDX_HAVE_EEPROM
+	bool
+
+config TDX_HAVE_EEPROM_EXTRA
+	bool
+
 if TDX_CFG_BLOCK
 
 config TDX_CFG_BLOCK_IS_IN_MMC
@@ -37,6 +43,11 @@ config TDX_CFG_BLOCK_IS_IN_NOR
 	depends on TDX_HAVE_NOR
 	default y
 
+config TDX_CFG_BLOCK_IS_IN_EEPROM
+	bool
+	depends on TDX_HAVE_EEPROM
+	default y
+
 config TDX_CFG_BLOCK_DEV
 	int "Toradex config block eMMC device ID"
 	depends on TDX_CFG_BLOCK_IS_IN_MMC
@@ -66,4 +77,11 @@ config TDX_CFG_BLOCK_2ND_ETHADDR
 	  Ethernet carrier boards. This options enables the code to set the
 	  second Ethernet address as environment variable (eth1addr).
 
+config TDX_CFG_BLOCK_EXTRA
+	bool "Support for additional EEPROMs (carrier board, display adapter)"
+	depends on TDX_HAVE_EEPROM_EXTRA
+	help
+	  Enables fetching auxilary config blocks from carrier board/display
+	  adapter EEPROMs.
+
 endif
board/toradex/common/tdx-cfg-block.c +273 -39

438 lines not on this page · raw message

board/toradex/common/tdx-cfg-block.h +3 -0
index d58be23..e18da33 100644
@@ -94,9 +94,12 @@ extern const char * const toradex_modules[];
 extern const char * const toradex_carrier_boards[];
 extern bool valid_cfgblock;
 extern struct toradex_hw tdx_hw_tag;
+extern struct toradex_hw tdx_car_hw_tag;
 extern struct toradex_eth_addr tdx_eth_addr;
 extern u32 tdx_serial;
+extern u32 tdx_car_serial;
 
 int read_tdx_cfg_block(void);
+int read_tdx_cfg_block_carrier(void);
 
 #endif /* _TDX_CFG_BLOCK_H */
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/7 toradex: tdx-cfg-clock: add migration routine from PID8

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Add migration routine from PID8 pre-stored values on EEPROM (including sane value checks).

---

 board/toradex/common/tdx-cfg-block.c | 78 ++++++++++++++++++++++++++++++++++++
 board/toradex/common/tdx-cfg-block.h |  2 +
 2 files changed, 80 insertions(+)
board/toradex/common/tdx-cfg-block.c +78 -0
index 9699a50..9eb1edc 100644
@@ -649,6 +649,84 @@ out:
 	return ret;
 }
 
+int check_pid8_sanity(char *pid8)
+{
+	char s_carrierid_verdin[5];
+	char s_carrierid_dahlia[5];
+
+	sprintf(s_carrierid_verdin, "0%d", VERDIN_DEVELOPMENT_BOARD);
+	sprintf(s_carrierid_dahlia, "0%d", DAHLIA);
+
+	/* sane value check, first 4 chars which represent carrier id */
+	if (!strncmp(pid8, s_carrierid_verdin, 4))
+		return 0;
+
+	if (!strncmp(pid8, s_carrierid_dahlia, 4))
+		return 0;
+
+	return -EINVAL;
+}
+
+int try_migrate_tdx_cfg_block_carrier(void)
+{
+	char pid8[8];
+	int offset = 0;
+	int ret = CMD_RET_SUCCESS;
+	size_t size = TDX_CFG_BLOCK_EXTRA_MAX_SIZE;
+	u8 *config_block;
+
+	memset(pid8, 0x0, 8);
+	ret = read_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, (u8 *)pid8, 8);
+	if (ret)
+		return ret;
+
+	if (check_pid8_sanity(pid8))
+		return -EINVAL;
+
+	/* Allocate RAM area for config block */
+	config_block = memalign(ARCH_DMA_MINALIGN, size);
+	if (!config_block) {
+		printf("Not enough malloc space available!\n");
+		return CMD_RET_FAILURE;
+	}
+
+	memset(config_block, 0xff, size);
+	/* we try parse PID8 concatenating zeroed serial number */
+	tdx_car_hw_tag.ver_major = pid8[4] - '0';
+	tdx_car_hw_tag.ver_minor = pid8[5] - '0';
+	tdx_car_hw_tag.ver_assembly = pid8[7] - '0';
+
+	pid8[4] = '\0';
+	tdx_car_hw_tag.prodid = simple_strtoul(pid8, NULL, 10);
+
+	/* Valid Tag */
+	write_tag(config_block, &offset, TAG_VALID, NULL, 0);
+
+	/* Product Tag */
+	write_tag(config_block, &offset, TAG_HW, (u8 *)&tdx_car_hw_tag,
+		  sizeof(tdx_car_hw_tag));
+
+	/* Serial Tag */
+	write_tag(config_block, &offset, TAG_CAR_SERIAL, (u8 *)&tdx_car_serial,
+		  sizeof(tdx_car_serial));
+
+	memset(config_block + offset, 0, 32 - offset);
+	ret = write_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, config_block,
+				    size);
+	if (ret) {
+		printf("Failed to write Toradex Extra config block: %d\n",
+		       ret);
+		ret = CMD_RET_FAILURE;
+		goto out;
+	}
+
+	printf("Successfully migrated to Toradex Config Block from PID8\n");
+
+out:
+	free(config_block);
+	return ret;
+}
+
 static int get_cfgblock_carrier_interactive(void)
 {
 	char message[CONFIG_SYS_CBSIZE];
board/toradex/common/tdx-cfg-block.h +2 -0
index e18da33..8f91d9a 100644
@@ -102,4 +102,6 @@ extern u32 tdx_car_serial;
 int read_tdx_cfg_block(void);
 int read_tdx_cfg_block_carrier(void);
 
+int try_migrate_tdx_cfg_block_carrier(void);
+
 #endif /* _TDX_CFG_BLOCK_H */
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/7 toradex: tdx-cfg-block: add carrier board info printing

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Add carrier board info printing during boot time:

U-Boot 2020.07-rc4-02435-g1756e05 (Jun 22 2020 - 22:43:59 +0300)

CPU: Freescale i.MX8MMQ rev1.0 at 1200 MHz
....
Carrier: Toradex Verdin Development Board V1.0A, Serial# 10622780 Verdin iMX8MM #

---

 board/toradex/common/tdx-common.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
board/toradex/common/tdx-common.c +28 -0
index e8de923..7e353b4 100644
@@ -19,6 +19,12 @@
 static char tdx_serial_str[9];
 static char tdx_board_rev_str[6];
 
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+static char tdx_car_serial_str[9];
+static char tdx_car_rev_str[6];
+static char *tdx_carrier_board_name;
+#endif
+
 #ifdef CONFIG_REVISION_TAG
 u32 get_board_rev(void)
 {
@@ -88,6 +94,28 @@ int show_board_info(void)
 		       toradex_modules[tdx_hw_tag.prodid],
 		       tdx_board_rev_str,
 		       tdx_serial_str);
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+		if (read_tdx_cfg_block_carrier()) {
+			printf("MISSING TORADEX CARRIER CONFIG BLOCKS\n");
+			try_migrate_tdx_cfg_block_carrier();
+		} else {
+			tdx_carrier_board_name = (char *)
+				toradex_carrier_boards[tdx_car_hw_tag.prodid];
+
+			sprintf(tdx_car_serial_str, "%08u", tdx_car_serial);
+			sprintf(tdx_car_rev_str, "V%1d.%1d%c",
+				tdx_car_hw_tag.ver_major,
+				tdx_car_hw_tag.ver_minor,
+				(char)tdx_car_hw_tag.ver_assembly +
+				'A');
+
+			env_set("carrier_serial#", tdx_car_serial_str);
+			printf("Carrier: Toradex %s %s, Serial# %s\n",
+			       tdx_carrier_board_name,
+			       tdx_car_rev_str,
+			       tdx_car_serial_str);
+		}
+#endif
 	}
 
 	/*
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/7 ARM: dts: imx8mm-verdin: eeprom nodes adjustments

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Rename EEPROM nodes.
Create aliases for EEPROM to unify their order:
eeprom0 - on-module EEPROM
eeprom1 - carrier-board EEPROM
eeprom2 - MIPI-DSI to HDMI adapter EEPROM

---

 arch/arm/dts/imx8mm-verdin.dts | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
arch/arm/dts/imx8mm-verdin.dts +14 -8
index b86f46e..1c67c08 100644
@@ -16,6 +16,12 @@
 		stdout-path = &uart1;
 	};
 
+	aliases {
+		eeprom0 = &eeprom_module;
+		eeprom1 = &eeprom_carrier_board;
+		eeprom2 = &eeprom_display_adapter;
+	};
+
 	/* fixed clock dedicated to SPI CAN controller */
 	clk20m: oscillator {
 		compatible = "fixed-clock";
@@ -321,8 +327,8 @@
 		vcc-supply = <&ldo5_reg>;
 	};
 
-	eeprom at 50 {
-		compatible = "st,24c02";
+	eeprom_module: eeprom at 50 {
+		compatible = "st,24c02", "atmel,24c02", "i2c-eeprom";
 		pagesize = <16>;
 		reg = <0x50>;
 	};
@@ -377,16 +383,16 @@
 		status = "okay";
 	};
 
-	/* EEPROM on MIPI-DSI to HDMI adapter */
-	eeprom_50: eeprom at 50 {
-		compatible = "st,24c02";
+	/* EEPROM on display adapter (MIPI DSI Display Adapter) */
+	eeprom_display_adapter: eeprom at 50 {
+		compatible = "st,24c02", "atmel,24c02", "i2c-eeprom";
 		pagesize = <16>;
 		reg = <0x50>;
 	};
 
-	/* EEPROM on Verdin Development board */
-	eeprom_57: eeprom at 57 {
-		compatible = "st,24c02";
+	/* EEPROM on carrier board */
+	eeprom_carrier_board: eeprom at 57 {
+		compatible = "st,24c02", "atmel,24c02", "i2c-eeprom";
 		pagesize = <16>;
 		reg = <0x57>;
 	};
Signature · 1 line
2.7.4
#7 lore raw

PATCH 7/7 verdin-imx8mm: add EEPROM support for carrier board

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Enable these Kconfig symbols:
TDX_CFG_BLOCK_EXTRA=y
TDX_HAVE_EEPROM_EXTRA=y

---

 board/toradex/verdin-imx8mm/Kconfig | 6 ++++++
 configs/verdin-imx8mm_defconfig     | 1 +
 2 files changed, 7 insertions(+)
board/toradex/verdin-imx8mm/Kconfig +6 -0
index 8a2fe98..149aed6 100644
@@ -12,9 +12,15 @@ config SYS_CONFIG_NAME
 config TDX_CFG_BLOCK
 	default y
 
+config TDX_CFG_BLOCK_EXTRA
+	default y
+
 config TDX_HAVE_MMC
 	default y
 
+config TDX_HAVE_EEPROM_EXTRA
+	default y
+
 config TDX_CFG_BLOCK_DEV
 	default "0"
 
configs/verdin-imx8mm_defconfig +1 -0
index f5b6e03..74cc8dd 100644
@@ -74,6 +74,7 @@ CONFIG_MXC_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC_IMX=y
Signature · 1 line
2.7.4