On 28.09.2016 02:35, Marcel Ziswiler wrote:
> Add Toradex factory configuration block handling. The config block is a
> data structure which gets stored to flash during production testing. The
> structure holds such information as board resp. hardware revision,
> product ID and serial number which is used as the NIC part of the
> Ethernet MAC address as well. The config block will be read upon boot by
> the checkboard() function, displayed as part of the board information
> and passed to Linux via device tree or ATAGs.
>
> Signed-off-by: Marcel Ziswiler <[email protected]>
> ---
>
> Changes in v2: None
>
> board/toradex/common/Kconfig | 80 ++++++
> board/toradex/common/Makefile | 11 +
> board/toradex/common/tdx-cfg-block.c | 544
> +++++++++++++++++++++++++++++++++++
> board/toradex/common/tdx-cfg-block.h | 68 +++++
> board/toradex/common/tdx-common.c | 180 ++++++++++++
> board/toradex/common/tdx-common.h | 13 +
> 6 files changed, 896 insertions(+)
> create mode 100644 board/toradex/common/Kconfig
> create mode 100644 board/toradex/common/Makefile
> create mode 100644 board/toradex/common/tdx-cfg-block.c
> create mode 100644 board/toradex/common/tdx-cfg-block.h
> create mode 100644 board/toradex/common/tdx-common.c
> create mode 100644 board/toradex/common/tdx-common.h
>
> diff --git a/board/toradex/common/Kconfig b/board/toradex/common/Kconfig
> new file mode 100644
> index 0000000..e269875
> --- /dev/null
> +++ b/board/toradex/common/Kconfig
> @@ -0,0 +1,80 @@
> +# Copyright (c) 2016 Toradex, Inc.
> +# SPDX-License-Identifier: GPL-2.0+
> +
> +# Not from device tree model node
> +config CUSTOM_BOARDINFO
> + bool
This Kconfig option seems to be hardly at the right place: We make use
of that config in common/board_info.c
But I have a completely different proposal, why don't we remove a config
option for once:
First, drop CONFIG_CUSTOM_BOARDINFO, it does not have widespread use
yet, so it shouldn't be a problem... Also it ifdefs almost the whole
function so not that much value. Then convert show_board_info to a weak
function instead... The implementer of show_board_info can then decide
whether checkboard should be called or not.
That way we can leave the checkboard() functions in all our boards as
is, and simply reimplement show_board_info in tdx-cfg-block.c (with a
call to checkboard only if the config block is corrupt/missing)...
Thoughts?
--
Stefan
> +
> +menuconfig TDX_CFG_BLOCK
> + bool "Enable Toradex config block support"
> + select OF_BOARD_SETUP
> + help
> + The Toradex config block stored production data on the on-module
> + flash device (NAND, NOR or eMMC). The area is normally preserved by
> + software and contains the serial number (out of which the MAC
> + address is generated) and the exact module type.
> +
> +# Helper config to determine the correct default location of the cfg block
> +config TDX_HAVE_MMC
> + bool
> +
> +config TDX_HAVE_NAND
> + bool
> +
> +config TDX_HAVE_NOR
> + bool
> +
> +if TDX_CFG_BLOCK
> +
> +choice TDX_CFG_BLOCK_LOCATION
> + prompt "Toradex config block location"
> + depends on TDX_CFG_BLOCK
> + default TDX_CFG_BLOCK_IS_IN_MMC if TDX_HAVE_MMC
> + default TDX_CFG_BLOCK_IS_IN_NAND if TDX_HAVE_NAND
> + default TDX_CFG_BLOCK_IS_IN_NOR if TDX_HAVE_NOR
> + help
> + Configure the location of the Toradex config block. By default, the
> + factory version of the Toradex config block is on the NAND, NOR or
> + eMMC flash device on the module.
> +
> +config TDX_CFG_BLOCK_IS_IN_MMC
> + bool "Location of the config block is in eMMC"
> +
> +config TDX_CFG_BLOCK_IS_IN_NAND
> + bool "Location of the config block is in NAND"
> +
> +config TDX_CFG_BLOCK_IS_IN_NOR
> + bool "Location of the config block is in NOR"
> +
> +endchoice
> +
> +config TDX_CFG_BLOCK_DEV
> + int "Toradex config block eMMC device ID"
> + depends on TDX_CFG_BLOCK_IS_IN_MMC
> +
> +config TDX_CFG_BLOCK_PART
> + int "Toradex config block eMMC partition ID"
> + depends on TDX_CFG_BLOCK_IS_IN_MMC
> +
> +config TDX_CFG_BLOCK_OFFSET
> + int "Toradex config block offset"
> + help
> + Specify the byte offset of the Toradex config block within the flash
> + device the config block is stored on.
> +
> +config TDX_CFG_BLOCK_OFFSET2
> + int "Toradex config block offset, second instance"
> + default 0
> + help
> + Specify the byte offset of the 2nd instance of the Toradex config
> block
> + within the flash device the config block is stored on.
> + Set to 0 on modules which have no 2nd instance.
> +
> +config TDX_CFG_BLOCK_2ND_ETHADDR
> + bool "Set the second Ethernet address"
> + help
> + For each serial number two Ethernet addresses are available for dual
> + Ethernet carrier boards. This options enables the code to set the
> + second Ethernet address as environment variable (eth1addr).
> +
> +endif
> diff --git a/board/toradex/common/Makefile b/board/toradex/common/Makefile
> new file mode 100644
> index 0000000..d645f5a
> --- /dev/null
> +++ b/board/toradex/common/Makefile
> @@ -0,0 +1,11 @@
> +# Copyright (c) 2016 Toradex, Inc.
> +# SPDX-License-Identifier: GPL-2.0+
> +
> +# Common for all Toradex modules
> +ifeq ($(CONFIG_SPL_BUILD),y)
> +# Necessary to create built-in.o
> +obj- := __dummy__.o
> +else
> +obj-$(CONFIG_TDX_CFG_BLOCK) += tdx-cfg-block.o
> +obj-y += tdx-common.o
> +endif
> diff --git a/board/toradex/common/tdx-cfg-block.c
> b/board/toradex/common/tdx-cfg-block.c
> new file mode 100644
> index 0000000..0014ce8
> --- /dev/null
> +++ b/board/toradex/common/tdx-cfg-block.c
> @@ -0,0 +1,544 @@
> +/*
> + * Copyright (c) 2016 Toradex, Inc.
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include "tdx-cfg-block.h"
> +
> +#if defined(CONFIG_TARGET_APALIS_IMX6) || defined(CONFIG_TARGET_COLIBRI_IMX6)
> +#include <asm/arch/sys_proto.h>
> +#else
> +#define is_cpu_type(cpu) (0)
> +#endif
> +#if defined(CONFIG_CPU_PXA27X)
> +#include <asm/arch-pxa/pxa.h>
> +#else
> +#define cpu_is_pxa27x(cpu) (0)
> +#endif
> +#include <cli.h>
> +#include <console.h>
> +#include <flash.h>
> +#include <malloc.h>
> +#include <mmc.h>
> +#include <nand.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +#define TAG_VALID 0xcf01
> +#define TAG_MAC 0x0000
> +#define TAG_HW 0x0008
> +#define TAG_INVALID 0xffff
> +
> +#define TAG_FLAG_VALID 0x1
> +
> +#if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_MMC)
> +#define TDX_CFG_BLOCK_MAX_SIZE 512
> +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND)
> +#define TDX_CFG_BLOCK_MAX_SIZE 64
> +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR)
> +#define TDX_CFG_BLOCK_MAX_SIZE 64
> +#else
> +#error Toradex config block location not set
> +#endif
> +
> +struct toradex_tag {
> + u32 len:14;
> + u32 flags:2;
> + u32 id:16;
> +};
> +
> +bool valid_cfgblock;
> +struct toradex_hw tdx_hw_tag;
> +struct toradex_eth_addr tdx_eth_addr;
> +u32 tdx_serial;
> +
> +const char * const toradex_modules[] = {
> + [0] = "UNKNOWN MODULE",
> + [1] = "Colibri PXA270 312MHz",
> + [2] = "Colibri PXA270 520MHz",
> + [3] = "Colibri PXA320 806MHz",
> + [4] = "Colibri PXA300 208MHz",
> + [5] = "Colibri PXA310 624MHz",
> + [6] = "Colibri PXA320 806MHz IT",
> + [7] = "Colibri PXA300 208MHz XT",
> + [8] = "Colibri PXA270 312MHz",
> + [9] = "Colibri PXA270 520MHz",
> + [10] = "Colibri VF50 128MB", /* not currently on sale */
> + [11] = "Colibri VF61 256MB",
> + [12] = "Colibri VF61 256MB IT",
> + [13] = "Colibri VF50 128MB IT",
> + [14] = "Colibri iMX6 Solo 256MB",
> + [15] = "Colibri iMX6 DualLite 512MB",
> + [16] = "Colibri iMX6 Solo 256MB IT",
> + [17] = "Colibri iMX6 DualLite 512MB IT",
> + [18] = "UNKNOWN MODULE",
> + [19] = "UNKNOWN MODULE",
> + [20] = "Colibri T20 256MB",
> + [21] = "Colibri T20 512MB",
> + [22] = "Colibri T20 512MB IT",
> + [23] = "Colibri T30 1GB",
> + [24] = "Colibri T20 256MB IT",
> + [25] = "Apalis T30 2GB",
> + [26] = "Apalis T30 1GB",
> + [27] = "Apalis iMX6 Quad 1GB",
> + [28] = "Apalis iMX6 Quad 2GB IT",
> + [29] = "Apalis iMX6 Dual 512MB",
> + [30] = "Colibri T30 1GB IT",
> + [31] = "Apalis T30 1GB IT",
> + [32] = "Colibri iMX7 Solo 256MB",
> + [33] = "Colibri iMX7 Dual 512MB",
> + [34] = "Apalis TK1 2GB",
> + [35] = "Apalis iMX6 Dual 1GB IT",
> +};
> +
> +#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC
> +static int tdx_cfg_block_mmc_storage(u8 *config_block, int write)
> +{
> + struct mmc *mmc;
> + int dev = CONFIG_TDX_CFG_BLOCK_DEV;
> + int offset = CONFIG_TDX_CFG_BLOCK_OFFSET;
> + uint part = CONFIG_TDX_CFG_BLOCK_PART;
> + uint blk_start;
> + int ret = 0;
> +
> + /* Read production parameter config block from eMMC */
> + mmc = find_mmc_device(dev);
> + if (!mmc) {
> + puts("No MMC card found\n");
> + ret = -ENODEV;
> + goto out;
> + }
> + if (part != mmc->block_dev.hwpart) {
> + if (blk_select_hwpart_devnum(IF_TYPE_MMC, dev, part)) {
> + puts("MMC partition switch failed\n");
> + ret = -ENODEV;
> + goto out;
> + }
> + }
> + if (offset < 0)
> + offset += mmc->capacity;
> + blk_start = ALIGN(offset, mmc->write_bl_len) / mmc->write_bl_len;
> +
> + if (!write) {
> + /* Careful reads a whole block of 512 bytes into config_block */
> + if (blk_dread(mmc_get_blk_desc(mmc), blk_start, 1,
> + (unsigned char *)config_block) != 1) {
> + ret = -EIO;
> + goto out;
> + }
> + /* Flush cache after read */
> + flush_cache((ulong)(unsigned char *)config_block, 512);
> + } else {
> + /* Just writing one 512 byte block */
> + if (blk_dwrite(mmc_get_blk_desc(mmc), blk_start, 1,
> + (unsigned char *)config_block) != 1) {
> + ret = -EIO;
> + goto out;
> + }
> + }
> +
> +out:
> + /* Switch back to regular eMMC user partition */
> + blk_select_hwpart_devnum(IF_TYPE_MMC, 0, 0);
> +
> + return ret;
> +}
> +#endif
> +
> +#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_NAND
> +static int read_tdx_cfg_block_from_nand(unsigned char *config_block)
> +{
> + size_t size = TDX_CFG_BLOCK_MAX_SIZE;
> +
> + /* Read production parameter config block from NAND page */
> + return nand_read_skip_bad(nand_info[0], CONFIG_TDX_CFG_BLOCK_OFFSET,
> + &size, NULL, TDX_CFG_BLOCK_MAX_SIZE, config_block);
> +}
> +
> +static int write_tdx_cfg_block_to_nand(unsigned char *config_block)
> +{
> + size_t size = TDX_CFG_BLOCK_MAX_SIZE;
> +
> + /* Write production parameter config block to NAND page */
> + return nand_write_skip_bad(nand_info[0], CONFIG_TDX_CFG_BLOCK_OFFSET,
> + &size, NULL, TDX_CFG_BLOCK_MAX_SIZE,
> + config_block, WITH_WR_VERIFY);
> +}
> +#endif
> +
> +#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_NOR
> +static int read_tdx_cfg_block_from_nor(unsigned char *config_block)
> +{
> + /* Read production parameter config block from NOR flash */
> + memcpy(config_block, (void *)CONFIG_TDX_CFG_BLOCK_OFFSET,
> + TDX_CFG_BLOCK_MAX_SIZE);
> + return 0;
> +}
> +
> +static int write_tdx_cfg_block_to_nor(unsigned char *config_block)
> +{
> + /* Write production parameter config block to NOR flash */
> + return flash_write((void *)config_block, CONFIG_TDX_CFG_BLOCK_OFFSET,
> + TDX_CFG_BLOCK_MAX_SIZE);
> +}
> +#endif
> +
> +int read_tdx_cfg_block(void)
> +{
> + int ret = 0;
> + u8 *config_block = NULL;
> + struct toradex_tag *tag;
> + size_t size = TDX_CFG_BLOCK_MAX_SIZE;
> + int offset;
> +
> + /* Allocate RAM area for config block */
> + config_block = memalign(ARCH_DMA_MINALIGN, size);
> + if (!config_block) {
> + printf("Not enough malloc space available!\n");
> + return -ENOMEM;
> + }
> +
> + memset(config_block, 0, size);
> +
> +#if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_MMC)
> + ret = tdx_cfg_block_mmc_storage(config_block, 0);
> +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND)
> + ret = read_tdx_cfg_block_from_nand(config_block);
> +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR)
> + ret = read_tdx_cfg_block_from_nor(config_block);
> +#else
> + ret = -EINVAL;
> +#endif
> + if (ret)
> + goto out;
> +
> + /* Expect a valid tag first */
> + tag = (struct toradex_tag *)config_block;
> + if (tag->flags != TAG_FLAG_VALID || tag->id != TAG_VALID) {
> + valid_cfgblock = false;
> + ret = -EINVAL;
> + goto out;
> + }
> + valid_cfgblock = true;
> + offset = 4;
> +
> + while (offset < TDX_CFG_BLOCK_MAX_SIZE) {
> + tag = (struct toradex_tag *)(config_block + offset);
> + offset += 4;
> + if (tag->id == TAG_INVALID)
> + break;
> +
> + if (tag->flags == TAG_FLAG_VALID) {
> + switch (tag->id) {
> + case TAG_MAC:
> + memcpy(&tdx_eth_addr, config_block + offset,
> + 6);
> +
> + /* NIC part of MAC address is serial number */
> + tdx_serial = ntohl(tdx_eth_addr.nic) >> 8;
> + break;
> + case TAG_HW:
> + memcpy(&tdx_hw_tag, config_block + offset, 8);
> + break;
> + }
> + }
> +
> + /* Get to next tag according to current tags length */
> + offset += tag->len * 4;
> + }
> +
> + /* Cap product id to avoid issues with a yet unknown one */
> + if (tdx_hw_tag.prodid > (sizeof(toradex_modules) /
> + sizeof(toradex_modules[0])))
> + tdx_hw_tag.prodid = 0;
> +
> +out:
> + free(config_block);
> + return ret;
> +}
> +
> +static int get_cfgblock_interactive(void)
> +{
> + char message[CONFIG_SYS_CBSIZE];
> + char *soc;
> + char it = 'n';
> + int len;
> +
> + if (cpu_is_pxa27x())
> + sprintf(message, "Is the module the 312 MHz version? [y/N] ");
> + else
> + sprintf(message, "Is the module an IT version? [y/N] ");
> +
> + len = cli_readline(message);
> + it = console_buffer[0];
> +
> + soc = getenv("soc");
> + if (!strcmp("mx6", soc)) {
> +#ifdef CONFIG_MACH_TYPE
> + if (it == 'y' || it == 'Y')
> + if (is_cpu_type(MXC_CPU_MX6Q))
> + tdx_hw_tag.prodid = APALIS_IMX6Q_IT;
> + else
> + tdx_hw_tag.prodid = APALIS_IMX6D_IT;
> + else
> + if (is_cpu_type(MXC_CPU_MX6Q))
> + tdx_hw_tag.prodid = APALIS_IMX6Q;
> + else
> + tdx_hw_tag.prodid = APALIS_IMX6D;
> +#else
> + if (it == 'y' || it == 'Y')
> + if (is_cpu_type(MXC_CPU_MX6DL))
> + tdx_hw_tag.prodid = COLIBRI_IMX6DL_IT;
> + else
> + tdx_hw_tag.prodid = COLIBRI_IMX6S_IT;
> + else
> + if (is_cpu_type(MXC_CPU_MX6DL))
> + tdx_hw_tag.prodid = COLIBRI_IMX6DL;
> + else
> + tdx_hw_tag.prodid = COLIBRI_IMX6S;
> +#endif /* CONFIG_MACH_TYPE */
> + } else if (!strcmp("imx7d", soc)) {
> + tdx_hw_tag.prodid = COLIBRI_IMX7D;
> + } else if (!strcmp("imx7s", soc)) {
> + tdx_hw_tag.prodid = COLIBRI_IMX7S;
> + } else if (!strcmp("tegra20", soc)) {
> + if (it == 'y' || it == 'Y')
> + if (gd->ram_size == 0x10000000)
> + tdx_hw_tag.prodid = COLIBRI_T20_256MB_IT;
> + else
> + tdx_hw_tag.prodid = COLIBRI_T20_512MB_IT;
> + else
> + if (gd->ram_size == 0x10000000)
> + tdx_hw_tag.prodid = COLIBRI_T20_256MB;
> + else
> + tdx_hw_tag.prodid = COLIBRI_T20_512MB;
> + } else if (cpu_is_pxa27x()) {
> + if (it == 'y' || it == 'Y')
> + tdx_hw_tag.prodid = COLIBRI_PXA270_312MHZ;
> + else
> + tdx_hw_tag.prodid = COLIBRI_PXA270_520MHZ;
> +#ifdef CONFIG_MACH_TYPE
> + } else if (!strcmp("tegra30", soc)) {
> + if (CONFIG_MACH_TYPE == MACH_TYPE_APALIS_T30) {
> + if (it == 'y' || it == 'Y')
> + tdx_hw_tag.prodid = APALIS_T30_IT;
> + else
> + if (gd->ram_size == 0x40000000)
> + tdx_hw_tag.prodid = APALIS_T30_1GB;
> + else
> + tdx_hw_tag.prodid = APALIS_T30_2GB;
> + } else {
> + if (it == 'y' || it == 'Y')
> + tdx_hw_tag.prodid = COLIBRI_T30_IT;
> + else
> + tdx_hw_tag.prodid = COLIBRI_T30;
> + }
> +#endif /* CONFIG_MACH_TYPE */
> + } else if (!strcmp("tegra124", soc)) {
> + tdx_hw_tag.prodid = APALIS_TK1_2GB;
> + } else if (!strcmp("vf500", soc)) {
> + if (it == 'y' || it == 'Y')
> + tdx_hw_tag.prodid = COLIBRI_VF50_IT;
> + else
> + tdx_hw_tag.prodid = COLIBRI_VF50;
> + } else if (!strcmp("vf610", soc)) {
> + if (it == 'y' || it == 'Y')
> + tdx_hw_tag.prodid = COLIBRI_VF61_IT;
> + else
> + tdx_hw_tag.prodid = COLIBRI_VF61;
> + } else {
> + printf("Module type not detectable due to unknown SoC\n");
> + return -1;
> + }
> +
> + while (len < 4) {
> + sprintf(message, "Enter the module version (e.g. V1.1B): V");
> + len = cli_readline(message);
> + }
> +
> + tdx_hw_tag.ver_major = console_buffer[0] - '0';
> + tdx_hw_tag.ver_minor = console_buffer[2] - '0';
> + tdx_hw_tag.ver_assembly = console_buffer[3] - 'A';
> +
> + if (cpu_is_pxa27x() && (tdx_hw_tag.ver_major == 1))
> + tdx_hw_tag.prodid -= (COLIBRI_PXA270_312MHZ -
> + COLIBRI_PXA270_V1_312MHZ);
> +
> + while (len < 8) {
> + sprintf(message, "Enter module serial number: ");
> + len = cli_readline(message);
> + }
> +
> + tdx_serial = simple_strtoul(console_buffer, NULL, 10);
> +
> + return 0;
> +}
> +
> +static int get_cfgblock_barcode(char *barcode)
> +{
> + if (strlen(barcode) < 16) {
> + printf("Argument too short, barcode is 16 chars long\n");
> + return -1;
> + }
> +
> + /* Get hardware information from the first 8 digits */
> + tdx_hw_tag.ver_major = barcode[4] - '0';
> + tdx_hw_tag.ver_minor = barcode[5] - '0';
> + tdx_hw_tag.ver_assembly = barcode[7] - '0';
> +
> + barcode[4] = '\0';
> + tdx_hw_tag.prodid = simple_strtoul(barcode, NULL, 10);
> +
> + /* Parse second part of the barcode (serial number */
> + barcode += 8;
> + tdx_serial = simple_strtoul(barcode, NULL, 10);
> +
> + return 0;
> +}
> +
> +static int do_cfgblock_create(cmd_tbl_t *cmdtp, int flag, int argc,
> + char * const argv[])
> +{
> + u8 *config_block;
> + struct toradex_tag *tag;
> + size_t size = TDX_CFG_BLOCK_MAX_SIZE;
> + int offset = 0;
> + int ret = CMD_RET_SUCCESS;
> + int err;
> +
> + /* 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);
> +
> + read_tdx_cfg_block();
> + if (valid_cfgblock) {
> +#if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND)
> + /*
> + * On NAND devices, recreation is only allowed if the page is
> + * empty (config block invalid...)
> + */
> + printf("NAND erase block %d need to be erased before creating a
> Toradex config block\n",
> + CONFIG_TDX_CFG_BLOCK_OFFSET / nand_info[0]->erasesize);
> + goto out;
> +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR)
> + /*
> + * On NOR devices, recreation is only allowed if the sector is
> + * empty and write protection is off (config block invalid...)
> + */
> + printf("NOR sector at offset 0x%02x need to be erased and
> unprotected before creating a Toradex config block\n",
> + CONFIG_TDX_CFG_BLOCK_OFFSET);
> + goto out;
> +#else
> + char message[CONFIG_SYS_CBSIZE];
> + sprintf(message,
> + "A valid Toradex config block is present, still
> recreate? [y/N] ");
> +
> + if (!cli_readline(message))
> + goto out;
> +
> + if (console_buffer[0] != 'y' && console_buffer[0] != 'Y')
> + goto out;
> +#endif
> + }
> +
> + /* Parse new Toradex config block data... */
> + if (argc < 3)
> + err = get_cfgblock_interactive();
> + else
> + err = get_cfgblock_barcode(argv[2]);
> +
> + if (err) {
> + ret = CMD_RET_FAILURE;
> + goto out;
> + }
> +
> + /* Convert serial number to MAC address (the storage format) */
> + tdx_eth_addr.oui = htonl(0x00142dUL << 8);
> + tdx_eth_addr.nic = htonl(tdx_serial << 8);
> +
> + /* Valid Tag */
> + tag = (struct toradex_tag *)config_block;
> + tag->id = TAG_VALID;
> + tag->flags = TAG_FLAG_VALID;
> + tag->len = 0;
> + offset += 4;
> +
> + /* Product Tag */
> + tag = (struct toradex_tag *)(config_block + offset);
> + tag->id = TAG_HW;
> + tag->flags = TAG_FLAG_VALID;
> + tag->len = 2;
> + offset += 4;
> +
> + memcpy(config_block + offset, &tdx_hw_tag, 8);
> + offset += 8;
> +
> + /* MAC Tag */
> + tag = (struct toradex_tag *)(config_block + offset);
> + tag->id = TAG_MAC;
> + tag->flags = TAG_FLAG_VALID;
> + tag->len = 2;
> + offset += 4;
> +
> + memcpy(config_block + offset, &tdx_eth_addr, 6);
> + offset += 6;
> + memset(config_block + offset, 0, 32 - offset);
> +
> +#if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_MMC)
> + err = tdx_cfg_block_mmc_storage(config_block, 1);
> +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND)
> + err = write_tdx_cfg_block_to_nand(config_block);
> +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR)
> + err = write_tdx_cfg_block_to_nor(config_block);
> +#else
> + err = -EINVAL;
> +#endif
> + if (err) {
> + printf("Failed to write Toradex config block: %d\n", ret);
> + ret = CMD_RET_FAILURE;
> + goto out;
> + }
> +
> + printf("Toradex config block successfully written\n");
> +
> +out:
> + free(config_block);
> + return ret;
> +}
> +
> +static int do_cfgblock(cmd_tbl_t *cmdtp, int flag, int argc,
> + char * const argv[])
> +{
> + int ret;
> +
> + if (argc < 2)
> + return CMD_RET_USAGE;
> +
> + if (!strcmp(argv[1], "create")) {
> + return do_cfgblock_create(cmdtp, flag, argc, argv);
> + } else if (!strcmp(argv[1], "reload")) {
> + ret = read_tdx_cfg_block();
> + if (ret) {
> + printf("Failed to reload Toradex config block: %d\n",
> + ret);
> + return CMD_RET_FAILURE;
> + }
> + return CMD_RET_SUCCESS;
> + }
> +
> + return CMD_RET_USAGE;
> +}
> +
> +U_BOOT_CMD(
> + cfgblock, 3, 0, do_cfgblock,
> + "Toradex config block handling commands",
> + "create [barcode] - (Re-)create Toradex config block\n"
> + "cfgblock reload - Reload Toradex config block from flash"
> +);
> diff --git a/board/toradex/common/tdx-cfg-block.h
> b/board/toradex/common/tdx-cfg-block.h
> new file mode 100644
> index 0000000..fd7c362
> --- /dev/null
> +++ b/board/toradex/common/tdx-cfg-block.h
> @@ -0,0 +1,68 @@
> +/*
> + * Copyright (c) 2016 Toradex, Inc.
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#ifndef _TDX_CFG_BLOCK_H
> +#define _TDX_CFG_BLOCK_H
> +
> +#include "tdx-common.h"
> +
> +struct toradex_hw {
> + u16 ver_major;
> + u16 ver_minor;
> + u16 ver_assembly;
> + u16 prodid;
> +};
> +
> +struct toradex_eth_addr {
> + u32 oui:24;
> + u32 nic:24;
> +} __attribute__((__packed__));
> +
> +enum {
> + COLIBRI_PXA270_V1_312MHZ = 1,
> + COLIBRI_PXA270_V1_520MHZ,
> + COLIBRI_PXA320,
> + COLIBRI_PXA300,
> + COLIBRI_PXA310,
> + COLIBRI_PXA320_IT,
> + COLIBRI_PXA300_XT,
> + COLIBRI_PXA270_312MHZ,
> + COLIBRI_PXA270_520MHZ,
> + COLIBRI_VF50, /* not currently on sale */
> + COLIBRI_VF61,
> + COLIBRI_VF61_IT,
> + COLIBRI_VF50_IT,
> + COLIBRI_IMX6S,
> + COLIBRI_IMX6DL,
> + COLIBRI_IMX6S_IT,
> + COLIBRI_IMX6DL_IT,
> + COLIBRI_T20_256MB = 20,
> + COLIBRI_T20_512MB,
> + COLIBRI_T20_512MB_IT,
> + COLIBRI_T30,
> + COLIBRI_T20_256MB_IT,
> + APALIS_T30_2GB,
> + APALIS_T30_1GB,
> + APALIS_IMX6Q,
> + APALIS_IMX6Q_IT,
> + APALIS_IMX6D,
> + COLIBRI_T30_IT,
> + APALIS_T30_IT,
> + COLIBRI_IMX7S,
> + COLIBRI_IMX7D,
> + APALIS_TK1_2GB,
> + APALIS_IMX6D_IT,
> +};
> +
> +extern const char * const toradex_modules[];
> +extern bool valid_cfgblock;
> +extern struct toradex_hw tdx_hw_tag;
> +extern struct toradex_eth_addr tdx_eth_addr;
> +extern u32 tdx_serial;
> +
> +int read_tdx_cfg_block(void);
> +
> +#endif /* _TDX_CFG_BLOCK_H */
> diff --git a/board/toradex/common/tdx-common.c
> b/board/toradex/common/tdx-common.c
> new file mode 100644
> index 0000000..e1a81cb
> --- /dev/null
> +++ b/board/toradex/common/tdx-common.c
> @@ -0,0 +1,180 @@
> +/*
> + * Copyright (c) 2016 Toradex, Inc.
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <g_dnl.h>
> +#include <libfdt.h>
> +
> +#include "tdx-cfg-block.h"
> +#include "tdx-common.h"
> +
> +__weak int checkboard_fallback(void)
> +{
> + return 0;
> +}
> +
> +#ifdef CONFIG_TDX_CFG_BLOCK
> +static char tdx_serial_str[9];
> +static char tdx_board_rev_str[6];
> +
> +#ifdef CONFIG_REVISION_TAG
> +u32 get_board_rev(void)
> +{
> + /* Check validity */
> + if (!tdx_hw_tag.ver_major)
> + return 0;
> +
> + return ((tdx_hw_tag.ver_major & 0xff) << 8) |
> + ((tdx_hw_tag.ver_minor & 0xf) << 4) |
> + ((tdx_hw_tag.ver_assembly & 0xf) + 0xa);
> +}
> +#endif /* CONFIG_TDX_CFG_BLOCK */
> +
> +#ifdef CONFIG_SERIAL_TAG
> +void get_board_serial(struct tag_serialnr *serialnr)
> +{
> + int array[8];
> + unsigned int serial = tdx_serial;
> + int i;
> +
> + serialnr->low = 0;
> + serialnr->high = 0;
> +
> + /* Check validity */
> + if (serial) {
> + /*
> + * Convert to Linux serial number format (hexadecimal coded
> + * decimal)
> + */
> + i = 7;
> + while (serial) {
> + array[i--] = serial % 10;
> + serial /= 10;
> + }
> + while (i >= 0)
> + array[i--] = 0;
> + serial = array[0];
> + for (i = 1; i < 8; i++) {
> + serial *= 16;
> + serial += array[i];
> + }
> +
> + serialnr->low = serial;
> + }
> +}
> +#endif /* CONFIG_SERIAL_TAG */
> +
> +int checkboard(void)
> +{
> + unsigned char ethaddr[6];
> +
> + if (read_tdx_cfg_block()) {
> + printf("Missing Toradex config block\n");
> + checkboard_fallback();
> + return 0;
> + }
> +
> + /* board serial-number */
> + sprintf(tdx_serial_str, "%08u", tdx_serial);
> + sprintf(tdx_board_rev_str, "V%1d.%1d%c",
> + tdx_hw_tag.ver_major,
> + tdx_hw_tag.ver_minor,
> + (char)tdx_hw_tag.ver_assembly + 'A');
> +
> + setenv("serial#", tdx_serial_str);
> +
> + /*
> + * Check if environment contains a valid MAC address,
> + * set the one from config block if not
> + */
> + if (!eth_getenv_enetaddr("ethaddr", ethaddr))
> + eth_setenv_enetaddr("ethaddr", (u8 *)&tdx_eth_addr);
> +
> +#ifdef CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR
> + if (!eth_getenv_enetaddr("eth1addr", ethaddr)) {
> + /*
> + * Secondary MAC address is allocated from block
> + * 0x100000 higher then the first MAC address
> + */
> + memcpy(ethaddr, &tdx_eth_addr, 6);
> + ethaddr[3] += 0x10;
> + eth_setenv_enetaddr("eth1addr", ethaddr);
> + }
> +#endif
> +
> + printf("Model: Toradex %s %s, Serial# %s\n",
> + toradex_modules[tdx_hw_tag.prodid],
> + tdx_board_rev_str,
> + tdx_serial_str);
> +
> + return 0;
> +}
> +
> +#ifdef CONFIG_USBDOWNLOAD_GADGET
> +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
> +{
> + unsigned short usb_pid;
> +
> + usb_pid = TORADEX_USB_PRODUCT_NUM_OFFSET + tdx_hw_tag.prodid;
> + put_unaligned(usb_pid, &dev->idProduct);
> +
> + return 0;
> +}
> +#endif /* CONFIG_USBDOWNLOAD_GADGET */
> +
> +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
> +int ft_board_setup(void *blob, bd_t *bd)
> +{
> + if (tdx_serial) {
> + fdt_setprop(blob, 0, "serial-number", tdx_serial_str,
> + strlen(tdx_serial_str) + 1);
> + }
> +
> + if (tdx_hw_tag.ver_major) {
> + char prod_id[5];
> +
> + sprintf(prod_id, "%04u", tdx_hw_tag.prodid);
> + fdt_setprop(blob, 0, "toradex,product-id", prod_id, 5);
> +
> + fdt_setprop(blob, 0, "toradex,board-rev", tdx_board_rev_str,
> + strlen(tdx_board_rev_str) + 1);
> + }
> +
> + return 0;
> +}
> +#endif
> +
> +#else /* CONFIG_TDX_CFG_BLOCK */
> +
> +#ifdef CONFIG_REVISION_TAG
> +u32 get_board_rev(void)
> +{
> + return 0;
> +}
> +#endif /* CONFIG_REVISION_TAG */
> +
> +#ifdef CONFIG_SERIAL_TAG
> +u32 get_board_serial(void)
> +{
> + return 0;
> +}
> +#endif /* CONFIG_SERIAL_TAG */
> +
> +int checkboard(void)
> +{
> + checkboard_fallback();
> +
> + return 0;
> +}
> +
> +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
> +int ft_board_setup(void *blob, bd_t *bd)
> +{
> + return 0;
> +}
> +#endif
> +
> +#endif /* CONFIG_TDX_CFG_BLOCK */
> diff --git a/board/toradex/common/tdx-common.h
> b/board/toradex/common/tdx-common.h
> new file mode 100644
> index 0000000..f308ebd
> --- /dev/null
> +++ b/board/toradex/common/tdx-common.h
> @@ -0,0 +1,13 @@
> +/*
> + * Copyright (c) 2016 Toradex, Inc.
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#ifndef _TDX_COMMON_H
> +#define _TDX_COMMON_H
> +
> +#define TORADEX_USB_PRODUCT_NUM_OFFSET 0x4000
> +#define TDX_USB_VID 0x1B67
> +
> +#endif /* _TDX_COMMON_H */
_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot
