riscv: telink: load DAC key/cert from flash zone. #366

pulin1103 · 2025-01-09T06:31:29Z

No description provided.

andy-liu-telink · 2025-01-09T06:47:49Z

src/platform/telink/FactoryDataParser.c

+    {
+        return false;
+    }
+    if (efuse_get_chip_id(chip_id))


efuse_get_chip_id在B92和TL321x中的返回值不同的，处理逻辑刚好相反。可以参考金邈的这个PR里面的处理方式：telink-semi/mcuboot#3

liucoldstar · 2025-01-09T06:59:17Z

src/platform/telink/FactoryDataParser.c

+    }
+
+    size_t dac_cert_len;
+    dac_cert_len = buffer[100];


100用宏表示一下吧。比如
static constexpr uint32_t kDacContentsOffset = 100;

liucoldstar · 2025-01-09T07:01:13Z

src/platform/telink/FactoryDataParser.c

+
+    size_t dac_cert_len;
+    dac_cert_len = buffer[100];
+    dac_cert_len |= (uint16_t) buffer[101] << 8;


按照上面的处理方式，这里可以101可以替换成kDacContentsOffset + 1

liucoldstar · 2025-01-09T07:01:32Z

src/platform/telink/FactoryDataParser.c

+    {
+        return false;
+    }
+    factoryData->dac_cert.data = buffer + 102;


kDacContentsOffset + 2

fengtai-telink · 2025-01-09T06:43:36Z

src/platform/telink/FactoryDataParser.c

+
+#if CHIP_DEVICE_SECURE_PROGRAMMING
+
+#if defined(CONFIG_SOC_RISCV_TELINK_B92)


是不是可以改成 #ifdef CONFIG_SOC_RISCV_TELINK_B92

可以统一到#ifdef

fengtai-telink · 2025-01-09T06:44:12Z

src/platform/telink/FactoryDataParser.c

+#include "aes.h"
+#endif
+
+#if defined(CONFIG_SOC_RISCV_TELINK_TL321X)


#if defined -> #ifdef

fengtai-telink · 2025-01-09T06:46:41Z

config/telink/chip-module/Kconfig

+config SECURE_PROGRAMMING
+	bool "Enable reading DAC and keys from the DAC partition"
+    depends on CHIP_FACTORY_DATA
+    default n


代码没对齐

还有就是，我记得海文说过，Kconfig里面不要Enable xxx，CI会不过，直接Read DAC and keys from the DAC partition会不会简单点

可以看CI结果确认一下。

刚和海文确认了下，matter这边没这个问题，那应该没什么问题

Signed-off-by: Zhenghuan Zhang <[email protected]>

- add plaintext vid, pid & discriminator at the beginning. - add optional argument --secure-programming-verification and --chip-id to generate factory data and independent DAC. Signed-off-by: Damien Ji <[email protected]> Signed-off-by: Zhenghuan Zhang <[email protected]>

Signed-off-by: Zhenghuan Zhang <[email protected]>

- modify mfg_tool code format. - add merge_factorydata_dac. Signed-off-by: Damien Ji <[email protected]>

to fix code style issues. Signed-off-by: Damien Ji <[email protected]>

andy-liu-telink · 2025-01-10T13:00:20Z

src/platform/telink/FactoryDataParser.c

+    }
+    else
+    {
+        LOG_ERR("Private key decryption failed.");


这个错误信息应该改成“Failed to retrieve chip ID.”

@pulin1103 How about we add this change to my next Pull Request?

pulin1103 requested review from damien0x0023, andy-liu-telink, haiwentelink and fengtai-telink January 9, 2025 06:31

pulin1103 requested a review from s07641069 as a code owner January 9, 2025 06:31

github-actions bot added platform config telink labels Jan 9, 2025

andy-liu-telink reviewed Jan 9, 2025

View reviewed changes

liucoldstar reviewed Jan 9, 2025

View reviewed changes

pulin1103 force-pushed the develop_dual_dac_loader branch from acda9b6 to 9f99531 Compare January 9, 2025 07:18

fengtai-telink reviewed Jan 9, 2025

View reviewed changes

pulin1103 force-pushed the develop_dual_dac_loader branch from 9f99531 to f20f19e Compare January 9, 2025 08:05

riscv: telink: load DAC key/cert from flash zone.

f23f72a

Signed-off-by: Zhenghuan Zhang <[email protected]>

pulin1103 force-pushed the develop_dual_dac_loader branch from f20f19e to f23f72a Compare January 9, 2025 08:17

github-actions bot added the scripts label Jan 9, 2025

pulin1103 force-pushed the develop_dual_dac_loader branch from 099e852 to 0abcf93 Compare January 10, 2025 02:04

Zhenghuan Zhang and others added 2 commits January 10, 2025 11:40

riscv: telink: fix error format

1ad7162

Signed-off-by: Zhenghuan Zhang <[email protected]>

telink: update factory data and dac

8ca9ce4

- modify mfg_tool code format. - add merge_factorydata_dac. Signed-off-by: Damien Ji <[email protected]>

damien0x0023 assigned damien0x0023 and pulin1103 Jan 10, 2025

telink update mfg_tool and merge_factorydata_dac

9bac534

to fix code style issues. Signed-off-by: Damien Ji <[email protected]>

damien0x0023 force-pushed the develop_dual_dac_loader branch from 1724e4c to 9bac534 Compare January 10, 2025 06:30

damien0x0023 requested review from fengtai-telink, andy-liu-telink and liucoldstar January 10, 2025 12:53

andy-liu-telink reviewed Jan 10, 2025

View reviewed changes

damien0x0023 approved these changes Jan 13, 2025

View reviewed changes

damien0x0023 merged commit 390d6be into develop_dual Jan 13, 2025
64 checks passed

damien0x0023 deleted the develop_dual_dac_loader branch January 13, 2025 01:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

riscv: telink: load DAC key/cert from flash zone. #366

riscv: telink: load DAC key/cert from flash zone. #366

pulin1103 commented Jan 9, 2025

andy-liu-telink Jan 9, 2025 •

edited

Loading

liucoldstar Jan 9, 2025

liucoldstar Jan 9, 2025

liucoldstar Jan 9, 2025

fengtai-telink Jan 9, 2025

liucoldstar Jan 9, 2025

fengtai-telink Jan 9, 2025

fengtai-telink Jan 9, 2025

fengtai-telink Jan 9, 2025

andy-liu-telink Jan 9, 2025

fengtai-telink Jan 9, 2025

andy-liu-telink Jan 10, 2025

damien0x0023 Jan 13, 2025


		#if CHIP_DEVICE_SECURE_PROGRAMMING

		#if defined(CONFIG_SOC_RISCV_TELINK_B92)

riscv: telink: load DAC key/cert from flash zone. #366

riscv: telink: load DAC key/cert from flash zone. #366

Conversation

pulin1103 commented Jan 9, 2025

andy-liu-telink Jan 9, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andy-liu-telink Jan 9, 2025 •

edited

Loading