From: Igor Opaniuk <igor.opaniuk@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8
Date: Wed, 15 Jul 2020 13:30:56 +0300 [thread overview]
Message-ID: <20200715103105.8622-6-igor.opaniuk@gmail.com> (raw)
In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com>
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Add migration routine from PID8 pre-stored values on EEPROM
(including sane value checks).
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/common/tdx-cfg-block.c | 78 ++++++++++++++++++++++++++++
board/toradex/common/tdx-cfg-block.h | 2 +
2 files changed, 80 insertions(+)
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 5162ed48b8..bf27b2fa66 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -649,6 +649,84 @@ out:
return ret;
}
+int check_pid8_sanity(char *pid8)
+{
+ char s_carrierid_verdin_dev[5];
+ char s_carrierid_dahlia[5];
+
+ sprintf(s_carrierid_verdin_dev, "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_dev, 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];
diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
index e18da3370e..8f91d9aec6 100644
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -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 */
--
2.17.1
next prev parent reply other threads:[~2020-07-15 10:30 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
2020-07-15 10:30 ` [PATCH v2 01/14] imx: mx7: fix DDRC size in A7-M4 mapping table Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers Igor Opaniuk
2020-07-27 12:49 ` Stefano Babic
2020-07-27 13:35 ` Tom Rini
2020-07-27 14:17 ` Stefano Babic
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 03/14] toradex: tdx-cfg-block: add carrier boards and display adapters Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 04/14] toradex: tdx-cfg-block: add support for EEPROM Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` Igor Opaniuk [this message]
2020-07-27 19:10 ` [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8 sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 06/14] toradex: tdx-cfg-block: add carrier board info printing Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 07/14] ARM: dts: imx8mm-verdin: eeprom nodes adjustments Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 08/14] verdin-imx8mm: add EEPROM support for carrier board Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 09/14] ARM: dts: imx6ull-colibri: move u-boot specific node Igor Opaniuk
2020-07-27 19:10 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 10/14] toradex: common: show boot logo Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 11/14] ARM: dts: imx7-colibri: multiple node updates Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 12/14] colibri-imx6ull: show boot logo Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 13/14] colibri-imx6ull: fix splash screen logo drawing Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 14/14] colibri-imx7: fix splash " Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-23 15:03 ` [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
2020-07-23 15:16 ` Stefano Babic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200715103105.8622-6-igor.opaniuk@gmail.com \
--to=igor.opaniuk@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox