From patchwork Wed Jul 15 10:30:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329363 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dBrX4Y/l; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DGC2JZ9z9sTM for ; Wed, 15 Jul 2020 20:32:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 99EA781BF0; Wed, 15 Jul 2020 12:31:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dBrX4Y/l"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED39681E6F; Wed, 15 Jul 2020 12:31:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4875F81C21 for ; Wed, 15 Jul 2020 12:31:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x22e.google.com with SMTP id e4so2011783ljn.4 for ; Wed, 15 Jul 2020 03:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C2ty0UqRlCA43A+s6hHkSz7Y8NFYIH/D74yVtUnOiCM=; b=dBrX4Y/lP8eUB2WpWl+7xy5rKMq/xS6GYQdgKtCAhmukp6OpCWLlH54nvEVW6qknys z7t7gG5cPQ37Ry5CHOdkuTm2O+qhi0dnWeGpd/KZ9uNeQKDxeVOR+M3e425ozaL6F44r 4r+3r4Z44rn9sLRw51ks1kgLy2J6x+/eiCDTQv8l+LbfyIiBvV+7XApS+lM8lYKBnHlz jpo9T/6eZsurUixB6HOigP2Rc3Kj9zETrk/at3ecD8AC9Kt9T6camni3zT1bJecK6Y5U NUfkEQ+MmkYm27y9UlCPnT3ReTba2Emc5gYYagOHMI9HGtzDdV/pz428FqwF2eKBHE9u 022w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C2ty0UqRlCA43A+s6hHkSz7Y8NFYIH/D74yVtUnOiCM=; b=mIw3Rp0FHDmBjprn6xjeG+Oi55SSPenQ+GNqYtwdY4wiUbdpaBMlrKlexaN96mqY3t YnKWCmqQ3BTRwa6tj+5ctg9mDYAlcrbIZw7lQweSDrGGXt9/O2nXlDpmuJjms3K0IGqr PTB11abBFdVQFslsD9n3vdkdasb9FIxS5sjqa2iboD11Jy/Z/JurZgrsPD9QooJuJTGz aIH/ocLvtItfA7xvfB0EJ5kLZAybsbfRD1uSXfkGvEhcTqewE8PuloU46wO4qmfNwkyh cQ6KWAubQwZUfSeMEPBzjgqs1ZOv7Rz3FwXVevQ2GtGL7xzuUxiXP1I62rN4VSIJbwHu 4wqA== X-Gm-Message-State: AOAM533Bvsf5NzlIbk/cMLHksVpb3Mfojz7/BXCpGP9iFeYqBscWeteG tSJzdqfGC4GBYuOeIFpvwxe9Mz3rD3o= X-Google-Smtp-Source: ABdhPJw8Qv1TwrjLAhNDlhwI5hD+AnNZKT15yGzjp+eN/QuVAKUplskrYepdwTswYunmJmk7PrpVSg== X-Received: by 2002:a2e:8043:: with SMTP id p3mr4735411ljg.469.1594809088192; Wed, 15 Jul 2020 03:31:28 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id c14sm369800ljj.112.2020.07.15.03.31.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:27 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , Simon Glass , Stefan Agner Subject: [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8 Date: Wed, 15 Jul 2020 13:30:56 +0300 Message-Id: <20200715103105.8622-6-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Add migration routine from PID8 pre-stored values on EEPROM (including sane value checks). Signed-off-by: Igor Opaniuk --- (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 */