From patchwork Mon Jun 22 20:27:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1314728 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=85.214.62.61; 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=MrEa4uEC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 49rLbW1MTwz9sRW for ; Tue, 23 Jun 2020 06:28:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2475881E47; Mon, 22 Jun 2020 22:28: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=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="MrEa4uEC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 538AF81E73; Mon, 22 Jun 2020 22:28:22 +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-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (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 5ADBC81E25 for ; Mon, 22 Jun 2020 22:28:18 +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-x243.google.com with SMTP id e4so20871472ljn.4 for ; Mon, 22 Jun 2020 13:28:18 -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=T3DAo/pJEObhjo1QM4J2+fe2Xy8BjNBE9SbclXwlmMA=; b=MrEa4uECxoHbN7sKG3dBn/UrFUKtiepVbSP52LFHDZCKY262Cm6SLLRJngOSBocE7g zR5Zfy5RCMUs4XjRUYv7c3DMabnCTjiWxJqakUj+N73L1CQP5zOzLFsGvlTvU6kxnaau YRvgn1JyGVxl9DZsvdpL1Ag5nYtL02vH1hlofGluOL5vMtVHInThuHMGpNXqJGhICI77 9QwduSKRU4BzT/lgBh0c5n+J9hSxD8TKgZOc8za1vXu9a+ZELjAIbp37gqJrtkDWs2l4 sdmj7k84/3lkXu/frSrClUCKkPam2yB4ZEu+6U3Qa68UwPJLQUOftYQWaykojWZUBu5+ QaBg== 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=T3DAo/pJEObhjo1QM4J2+fe2Xy8BjNBE9SbclXwlmMA=; b=LHVxh0DjvcCMnDOH4iST/WrXpBH3mqeWzTVkNHCunxgaX7S0L7mZge0z1L4Hkr7lXC WolnDVFAmGjzxvjQa7OYtW0hsTsczEvUwW90CLXXRuQhfLfs8Hu18stCW6VNCFfwvr7I 5j/oTq4noJaEwEHowePBZCFE/PJ5kiWm30+XBETl7kNAYHbprquarlZqu4ip/zn0Kvw4 ITU9ft6ef19G1yb2iuqp0CGayCV3/t8N4ZaN1+EufaAk2W+DmnsI6USTiMseGCl9srmt GqHBl1HeGXbGDJBDa/8nZTvI1aPstzM1NnYXDxz9buXIfwojxn/2ZwjTAAc9uA0xWzJB UrfQ== X-Gm-Message-State: AOAM533Z2xGmpBIIIL5fsASW7O8PTh6Jd6iSbZDd1LyaFkwSZ0ekCVzR ub9gWEC0RusoyDtnAxSy90+nj23G X-Google-Smtp-Source: ABdhPJwP7Scbl3eZo00aDeVKFbKrqr3AHaw4H5HNkdG/WpHhweEyZf38t9ThFlrUhE7uHqa6st2XmQ== X-Received: by 2002:a2e:7410:: with SMTP id p16mr1184034ljc.97.1592857697328; Mon, 22 Jun 2020 13:28:17 -0700 (PDT) Received: from localhost ([194.44.43.171]) by smtp.gmail.com with ESMTPSA id d3sm3395742lfe.93.2020.06.22.13.28.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 13:28:16 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: oleksandr.suvorov@toradex.com, marcel.ziswiler@toradex.com, sbabic@denx.de, max.krummenacher@toradex.com, stefan.agner@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk , Simon Glass Subject: [PATCH v1 4/7] toradex: tdx-cfg-clock: add migration routine from PID8 Date: Mon, 22 Jun 2020 23:27:57 +0300 Message-Id: <1592857680-637-5-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592857680-637-1-git-send-email-igor.opaniuk@gmail.com> References: <1592857680-637-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 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 --- 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 9699a50..9eb1edc 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[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]; diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index e18da33..8f91d9a 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 */