From 88b594f2eeef00549cab84bdaee65f6cf80fde27 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 23 Jul 2025 10:34:43 +0800 Subject: [PATCH] =?utf8?q?middleware=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8Bch?= =?utf8?q?ips=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=88=E5=B9=B6=E6=8F=90?= =?utf8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../chips/brandy/dfx/include/log_def_app.h | 7 + .../chips/brandy/dfx/include/log_def_dsp.h | 1 + .../chips/brandy/dfx/include/log_def_gui.h | 19 + .../brandy/exception/chip_exception_utils.c | 78 +++++ .../brandy/exception/chip_exception_utils.h | 5 + .../chips/brandy/exception/exception.h | 2 +- .../chips/brandy/exception/exception_riscv.c | 9 +- .../chips/brandy/nv/include/nv_config.h | 2 +- .../brandy/nv/nv_config/include/common.h | 14 +- .../brandy/nv/nv_config/include/key_id.h | 81 +++-- .../chips/brandy/nv/nv_porting/CMakeLists.txt | 3 + .../chips/brandy/nv/nv_porting/nv_crypto.c | 325 ++++++++++++++++++ code/sdk/middleware/chips/brandy/pm/pm.c | 11 +- 13 files changed, 508 insertions(+), 49 deletions(-) create mode 100644 code/sdk/middleware/chips/brandy/nv/nv_porting/nv_crypto.c diff --git a/code/sdk/middleware/chips/brandy/dfx/include/log_def_app.h b/code/sdk/middleware/chips/brandy/dfx/include/log_def_app.h index 914a34d74..f2f56288f 100644 --- a/code/sdk/middleware/chips/brandy/dfx/include/log_def_app.h +++ b/code/sdk/middleware/chips/brandy/dfx/include/log_def_app.h @@ -13,8 +13,15 @@ typedef enum { MAINPRESENTER_CPP, KEYINPUTLISTENER_CPP, ABILITY_CPP, + ABILITYSLICE_CPP, NATIVEABILITY_CPP, NATIVELAUNCHER_CPP, + SETTINGMAINPAGE_CPP, + SLICEPAGE_CPP, + VIEW_CPP, + SLICEPAGEFACTORY_CPP, + SLICEPAGEMANAGER_CPP, + BACKDRAGLISTENER_CPP, MAINVIEW_CPP, MAINMODEL_CPP, ACTIVITYMODEL_CPP, diff --git a/code/sdk/middleware/chips/brandy/dfx/include/log_def_dsp.h b/code/sdk/middleware/chips/brandy/dfx/include/log_def_dsp.h index e1e4cabd5..33b537dcc 100644 --- a/code/sdk/middleware/chips/brandy/dfx/include/log_def_dsp.h +++ b/code/sdk/middleware/chips/brandy/dfx/include/log_def_dsp.h @@ -63,6 +63,7 @@ typedef enum { DRV_OVERLAY_LOAD_C, DRV_AUDIO_PROC_C, DRV_OVERLAY_LOAD_FROM_FLASH_C, + DRV_OVERLAY_LOAD_FROM_FILE_C, DRV_AUDIO_VENDOR_C, MPI_SYS_C, UAPI_SYS_C, diff --git a/code/sdk/middleware/chips/brandy/dfx/include/log_def_gui.h b/code/sdk/middleware/chips/brandy/dfx/include/log_def_gui.h index 7c59246ac..85fcd4331 100644 --- a/code/sdk/middleware/chips/brandy/dfx/include/log_def_gui.h +++ b/code/sdk/middleware/chips/brandy/dfx/include/log_def_gui.h @@ -332,6 +332,7 @@ typedef enum { UI_TOGGLE_BUTTON_CPP, UI_VIEW_CPP, UI_VIEW_GROUP_CPP, + UI_FRAGMENT_CPP, RENDER_MANAGER_CPP, TASK_MANAGER_CPP, CHECK_BOX_RES_CPP, @@ -436,6 +437,9 @@ typedef enum { UI_ICOSAHEDRON_VIEW_CPP, UI_MAP_VIEW_CPP, MAP_SVG_PARSER_CPP, + RECENTMANAGER_CPP, + RECENTAPPVIEW_CPP, + RECENTAPPPRESENTER_CPP, PAGETRANSITIONMGR_CPP, TRANSITIONRECORD_CPP, TRANSITIONMANAGER_CPP, @@ -461,6 +465,21 @@ typedef enum { DIALTIMEPUBLISHER_CPP, WATCHINTERFACE_CPP, DIALMODELTIME_CPP, + LOTT_PROPERTY_CPP, + LOTT_COMP_CPP, + LOTT_ELLIPSE_CPP, + LOTT_IMAGE_LAYER_CPP, + LOTT_LAYER_CPP, + LOTT_PAINT_CPP, + LOTT_PARSER_CPP, + LOTT_PATH_CPP, + LOTT_PRECOMP_LAYER_CPP, + LOTT_RECT_CPP, + LOTT_SHAPE_GROUP_CPP, + LOTT_SHAPE_LAYER_CPP, + LOTT_SHAPE_CPP, + LOTT_TRANSFORM_CPP, + UI_LOTT_VIEW_CPP, FILE_ID_MAX = 1024, } log_file_list_enum_gui_t; #endif diff --git a/code/sdk/middleware/chips/brandy/exception/chip_exception_utils.c b/code/sdk/middleware/chips/brandy/exception/chip_exception_utils.c index 55fd5cec1..19e2f0bf3 100644 --- a/code/sdk/middleware/chips/brandy/exception/chip_exception_utils.c +++ b/code/sdk/middleware/chips/brandy/exception/chip_exception_utils.c @@ -12,6 +12,7 @@ #include "fcntl.h" #include "unistd.h" #include "stdio.h" +#include "platform_core.h" #if defined(BUILD_APPLICATION_STANDARD) && !defined(BUILD_RECOVERY_IMAGE) #include "diag_filter.h" #endif @@ -128,4 +129,81 @@ void config_maintenance_b_function(void) printf("0x570007a0 %x \r\n", readw(B_MAINTENANCE_3)); printf("0x570007a8 =%x,0x570007ac =%x \r\n", readw(0x570007a8), readw(0x570007ac)); #endif +} + +__attribute__((noinline)) void test_msdio(void) +{ + uint16_t value = readw(SPI_HOST_REG_FOR_HADR_DOG_TEST); // SDIO HOST地址，访问会造成硬件狗超时 + writew(BUS_TEST_REG, value); + writew(BUS_TEST_REG, 1); +} + +// 5702c014这个寄存器是不掉电的寄存器，当芯片复位这个寄存器的值还会在的，所以用来记录程序跑到了哪里 +// 通过访问各个总线下面的寄存器来判断总线时钟是否正常，然后用5702c014记录时钟访问情况，然后在芯片复位后在ssb里面打印这个值 +__attribute__((noinline)) void test_uart_h0(void) +{ + uint16_t value = readw(UART1_BASE + 0x24); // uart h0 的整数分频系数配置寄存器 + writew(BUS_TEST_REG, value); + writew(BUS_TEST_REG, 2); +} + +__attribute__((noinline)) void test_timer0(void) +{ + uint16_t value = readw(TIMER_0_BASE_ADDR); //timer0的计数值的初始值 + writew(BUS_TEST_REG, value); + writew(BUS_TEST_REG, 3); +} + +__attribute__((noinline)) void test_mdma(void) +{ + uint16_t value = readw(DMA_BASE_ADDR); // mdma的通道0的源地址寄存器 + writew(BUS_TEST_REG, value); + writew(BUS_TEST_REG, 4); +} + +__attribute__((noinline)) void test_i2c(void) +{ + uint16_t value = readw(I2C_BUS_0_BASE_ADDR); // i2c0的控制寄存器，可以将基地址配置实际使用IP的基地址 + writew(BUS_TEST_REG, value); + writew(BUS_TEST_REG, 5); +} + +__attribute__((noinline)) void test_qspi(void) +{ + uint16_t value = readw(SPI_BUS_5_BASE_ADDR); // qspi2的控制寄存器 + writew(BUS_TEST_REG, value); + writew(BUS_TEST_REG, 6); +} + + +__attribute__((noinline)) void test_spi0(void) +{ + uint16_t value = readw(SPI_BUS_0_BASE_ADDR); // spi0的控制寄存器，可以将基地址配置实际使用IP的基地址 + writew(BUS_TEST_REG, value); + writew(BUS_TEST_REG, 7); +} + +__attribute__((noinline)) void test_nandflash(void) +{ + uint16_t value = readw(NAND_QSPI_BASE_ADDR); // qspi to nand的控制寄存器 + writew(BUS_TEST_REG, value); + writew(BUS_TEST_REG, 8); +} + +__attribute__((noinline)) void test_main_ahb_bus(void) +{ +#if defined(BUILD_APPLICATION_STANDARD) + test_uart_h0(); + test_timer0(); + test_mdma(); + // test_i2c(); 使用时候需要先开启时钟，时钟在clocks_config_pri.c里面配置 + // test_qspi(); 使用时候需要先开启时钟，时钟在clocks_config_pri.c里面配置 + // test_spi0(); 使用时候需要先开启时钟，时钟在clocks_config_pri.c里面配置 + test_nandflash(); +#endif +} + +void test_mcu_bus(void) +{ + test_main_ahb_bus(); } \ No newline at end of file diff --git a/code/sdk/middleware/chips/brandy/exception/chip_exception_utils.h b/code/sdk/middleware/chips/brandy/exception/chip_exception_utils.h index ffc4f6630..43e6f4aae 100644 --- a/code/sdk/middleware/chips/brandy/exception/chip_exception_utils.h +++ b/code/sdk/middleware/chips/brandy/exception/chip_exception_utils.h @@ -11,6 +11,9 @@ #include #include +#define BUS_TEST_REG 0x5702C014 +#define SPI_HOST_REG_FOR_HADR_DOG_TEST 0x52061000 +#define SPI_HOST_CLOCK_REG 0x52000124 /** * @brief Check if this is the first power-on since the device was battery-powered. * @return true if this is the first power-on, false otherwise. @@ -40,4 +43,6 @@ int32_t write_fileinfo(const char *path, uint32_t offset, const uint8_t *buf, ui * @return null */ void config_maintenance_b_function(void); + +void test_mcu_bus(void); #endif diff --git a/code/sdk/middleware/chips/brandy/exception/exception.h b/code/sdk/middleware/chips/brandy/exception/exception.h index 9e97332c6..d17008c08 100644 --- a/code/sdk/middleware/chips/brandy/exception/exception.h +++ b/code/sdk/middleware/chips/brandy/exception/exception.h @@ -447,7 +447,7 @@ typedef void (*hal_exception_dump_callback)(uint32_t id, uint32_t reason, uint32 void do_hard_fault_handler(exc_context_t *exc_buf_addr); #if defined(__LITEOS__) void do_fault_handler(uint32_t exc_type, exc_context_t *exc_buff_addr); -void nmi_fault_handler(uint32_t exc_type, exc_context_t *exc_buff_addr); +void nmi_fault_handler(exc_context_t *exc_buff_addr); #endif #if defined(__FREERTOS__) void do_fault_handler_freertos(void); diff --git a/code/sdk/middleware/chips/brandy/exception/exception_riscv.c b/code/sdk/middleware/chips/brandy/exception/exception_riscv.c index 5c5c54af8..df3ae7656 100644 --- a/code/sdk/middleware/chips/brandy/exception/exception_riscv.c +++ b/code/sdk/middleware/chips/brandy/exception/exception_riscv.c @@ -48,6 +48,7 @@ #if defined(__LITEOS__) #include "los_sched_pri.h" #include "los_task_pri.h" +#include "los_task.h" #endif #include "fcntl.h" #include "unistd.h" @@ -917,6 +918,9 @@ void do_hard_fault_handler(exc_context_t *exc_buf_addr) if (exc_buf_addr == NULL) { return; } #ifdef SUPPORT_CPU_TRACE cpu_trace_disable(); +#endif +#if defined(__LITEOS__) + LOS_TaskLock(); #endif /* Some exception apis are in the XIP region. Ensure the flash in XIP mode */ uapi_flash_switch_to_xip_mode(CHIP_FLASH_ID); @@ -1099,14 +1103,11 @@ void do_fault_handler_freertos(void) void do_fault_handler(uint32_t exc_type, exc_context_t *exc_buff_addr) { UNUSED(exc_type); - g_taskScheduled = 0; do_hard_fault_handler(exc_buff_addr); } -void nmi_fault_handler(uint32_t exc_type, exc_context_t *exc_buff_addr) +void nmi_fault_handler(exc_context_t *exc_buff_addr) { - UNUSED(exc_type); - g_taskScheduled = 0; uint16_t nmi_raw_status = non_os_get_nmi_raw_status(); uint16_t xip_cache_int_sts = readw(XIP_CACHE_CTL_INTR_STS); uint16_t xip_int_sts = readw(XIP_CTL_INTR_STS); diff --git a/code/sdk/middleware/chips/brandy/nv/include/nv_config.h b/code/sdk/middleware/chips/brandy/nv/include/nv_config.h index f053e883c..b0669836b 100644 --- a/code/sdk/middleware/chips/brandy/nv/include/nv_config.h +++ b/code/sdk/middleware/chips/brandy/nv/include/nv_config.h @@ -78,7 +78,7 @@ /* 特性： 支持NV加密 */ #ifndef CONFIG_NV_SUPPORT_ENCRYPT -#define CONFIG_NV_SUPPORT_ENCRYPT NV_NO +#define CONFIG_NV_SUPPORT_ENCRYPT NV_YES #endif /* 特性： 支持NV跳过被破坏的NV项 */ diff --git a/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h b/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h index e409bf702..276f50a9a 100644 --- a/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h +++ b/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h @@ -102,11 +102,17 @@ typedef struct { uint32_t data[NV_AUDIO_VQE_PARAM_SIZE]; } audio_vqe_param_t; -#define CUSTOM_KEY_SERIAL_NUM_SIZE 32 +/* sys language id */ typedef struct { - uint8_t size; /* 序列号长度 */ - uint8_t sn[CUSTOM_KEY_SERIAL_NUM_SIZE]; /* 序列号数组 */ -} custom_key_sn_t; + uint8_t language_id; +} sys_language_id_t; + +/* sys product info */ +#define NV_SYS_PRODUCT_INFO_NAME_LEN 32 +typedef struct { + uint8_t size; + uint8_t name[NV_SYS_PRODUCT_INFO_NAME_LEN]; +} sys_product_info_t; #endif /* __COMMON_H__ */ diff --git a/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h b/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h index 266871d66..cafc78637 100644 --- a/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h +++ b/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h @@ -3,42 +3,49 @@ * Description: NV - key_id. */ - #ifndef __KEY_ID_H__ - #define __KEY_ID_H__ - - #define REGION_KEY_NUMS 0x1000 /* 每个区域容纳key_id的个数 */ - - - /* Please use the format of NV_ID_XXX */ - - /* system factory key_id [0x0001,0x1000) */ - - - /* user factory key_id [0x1000,0x2000) */ +#ifndef __KEY_ID_H__ +#define __KEY_ID_H__ + +#define REGION_KEY_NUMS 0x1000 /* 每个区域容纳key_id的个数 */ + + +/* Please use the format of NV_ID_XXX */ + +/* system factory key_id [0x0001,0x1000) */ + + +/* user factory key_id [0x1000,0x2000) */ #define NV_ID_CUSTOM_KEY_SERIAL_NUM 0x1010 /* 序列号 */ - - /* system normal key_id [0x2000,0x3000) */ - #define NV_ID_SECURE_CONN 0x2001 /* secure connect */ - #define NV_ID_OFFLINELOG_ENBALE_FLAG 0x2002 /* Offline log enable flag */ - - #define NV_ID_BTSRV_LOCAL_DEV_INFO 0x2101 /* btsrv_local_device_info_t */ - #define NV_ID_BTSRV_PAIRED_DEV_INFO 0x2102 /* btsrv_paired_device_info_t */ - - #define NV_ID_BTSRV_CALIBRATION_CONFIG 0x2103 /* btsrv_local_tx_power_info_t */ - #define BTH_NV_SEC_ID 0x2104 /* bth_product_data_config_t */ - /* user normal key_id [0x3000,0x4000) */ - #define NV_ID_AUDIO_VQE_PARAM 0x320C /* 3A params for VOIP scene, audio_vqe_param_t */ - #define NV_ID_AUDIO_VQE_KWS_PARAM 0x320D /* 3A params for KWS scene, audio_vqe_param_t */ - - /* reserved key_id [0x4000,0xFFFF) */ - #define NV_ID_SAMPLE_0 0x4000 /* Eg. */ - #define NV_ID_SAMPLE_1 0x4001 /* Eg. */ - #define NV_ID_SAMPLE_2 0x4002 /* Eg. */ - #define NV_ID_SAMPLE_3 0x4003 /* Eg. */ - #define NV_ID_SAMPLE_4 0x4004 /* Eg. */ - #define NV_ID_FTM_CONFIG 0x4109 - #define NV_ID_RESTORE_ENABLE 0xA000 /* NV restore factory region flag */ - - - #endif /* __KEY_ID_H__ */ + +/* system normal key_id [0x2000,0x3000) */ +#define NV_ID_SECURE_CONN 0x2001 /* secure connect */ +#define NV_ID_OFFLINELOG_ENBALE_FLAG 0x2002 /* Offline log enable flag */ + +#define NV_ID_BTSRV_LOCAL_DEV_INFO 0x2101 /* btsrv_local_device_info_t */ +#define NV_ID_BTSRV_PAIRED_DEV_INFO 0x2102 /* btsrv_paired_device_info_t */ + +#define NV_ID_BTSRV_CALIBRATION_CONFIG 0x2103 /* btsrv_local_tx_power_info_t */ +#define BTH_NV_SEC_ID 0x2104 /* bth_product_data_config_t */ + +#define NV_ID_SYS_LANGUAGE_ID 0x2105 /* sys_language_id */ +#define NV_ID_SYS_PRODUCT_INFO 0x2106 /* sys_product_info */ + +/* dial market key_id [0x2500,0x2600) */ +#define NV_ID_SECURE_DIAL 0x2500 /* secure dial */ + +/* user normal key_id [0x3000,0x4000) */ +#define NV_ID_AUDIO_VQE_PARAM 0x320C /* 3A params for VOIP scene, audio_vqe_param_t */ +#define NV_ID_AUDIO_VQE_KWS_PARAM 0x320D /* 3A params for KWS scene, audio_vqe_param_t */ + +/* reserved key_id [0x4000,0xFFFF) */ +#define NV_ID_SAMPLE_0 0x4000 /* Eg. */ +#define NV_ID_SAMPLE_1 0x4001 /* Eg. */ +#define NV_ID_SAMPLE_2 0x4002 /* Eg. */ +#define NV_ID_SAMPLE_3 0x4003 /* Eg. */ +#define NV_ID_SAMPLE_4 0x4004 /* Eg. */ +#define NV_ID_FTM_CONFIG 0x4109 +#define NV_ID_RESTORE_ENABLE 0xA000 /* NV restore factory region flag */ + + +#endif /* __KEY_ID_H__ */ \ No newline at end of file diff --git a/code/sdk/middleware/chips/brandy/nv/nv_porting/CMakeLists.txt b/code/sdk/middleware/chips/brandy/nv/nv_porting/CMakeLists.txt index 5df8b72bd..f15e47c4a 100644 --- a/code/sdk/middleware/chips/brandy/nv/nv_porting/CMakeLists.txt +++ b/code/sdk/middleware/chips/brandy/nv/nv_porting/CMakeLists.txt @@ -9,6 +9,7 @@ endif() set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nv_flash.c + ${CMAKE_CURRENT_SOURCE_DIR}/nv_crypto.c ) set(PUBLIC_HEADER @@ -18,6 +19,7 @@ set(PUBLIC_HEADER ) set(PRIVATE_HEADER + ${ROOT_DIR}/include/driver/security_unified ) set(PRIVATE_DEFINES @@ -31,6 +33,7 @@ set(COMPONENT_PUBLIC_CCFLAGS ) set(COMPONENT_CCFLAGS + -Werror=all ) set(WHOLE_LINK diff --git a/code/sdk/middleware/chips/brandy/nv/nv_porting/nv_crypto.c b/code/sdk/middleware/chips/brandy/nv/nv_porting/nv_crypto.c new file mode 100644 index 000000000..71f9de879 --- /dev/null +++ b/code/sdk/middleware/chips/brandy/nv/nv_porting/nv_crypto.c @@ -0,0 +1,325 @@ +/** + * Copyright (c) @CompanyNameMagicTag 2023-2023. All rights reserved. + * + * Description: NV crypto + * Author: @CompanyNameTag + * History: + * 2023-04-27, Create file. + */ + +#include "nv_porting.h" + +#if (CONFIG_NV_SUPPORT_ENCRYPT == NV_YES) +#include "cipher.h" +#include "cipher_aead.h" +#include "common_def.h" +#include "efuse.h" +#include "trng.h" +#include "cipher_api.h" + +#define INVALID_HANDLE (0xFFFFFFFF) +#define NV_HEADER_LENGTH 16 +#define NV_KEY_LENGTH 16 +#define NV_IV_LENGTH 12 +#define NV_TAG_LENGTH 16 +#define NV_DIE_ID_LENGTH_BYTES 16 +#define NV_DIE_ID_LEN_WORDS 4 +#define NV_DIE_ID_HIGH_32 3 +#define NV_DIE_ID_LOW_32 0 +#define MATERIAL_LEN 16 +#define SALT_LEN 32 +#define PASSWORD_LEN 16 +#define OTP_RANDOM_POS 70 +#define DIE_ID_POS 0 + +STATIC uint8_t ta_uuid[] = {0xCA, 0x2B, 0xF7, 0x6A, 0xFF, 0x79, 0x4E, 0xAC, + 0xA6, 0x3D, 0x4E, 0x0A, 0xAA, 0xEE, 0x6C, 0x77}; + +typedef struct { + uint16_t enc_key; + uint16_t version; + uint32_t rnd; + uint32_t die_id; +} kv_crypto_iv_info_t; + +typedef struct { + uint8_t type; + uint8_t upgrade; + uint16_t key_id; + uint16_t enc_key; + uint16_t version; + uint32_t rnd; + uint32_t die_id; +} kv_crypto_key_info_t; + +static errcode_t make_section_key(uint8_t *section_key, + const kv_key_header_t *header, + uint32_t die_id_high32) +{ + kv_crypto_key_info_t *kv_crypto_key_info = + (kv_crypto_key_info_t *)(uintptr_t)section_key; + kv_crypto_key_info->type = header->type; + kv_crypto_key_info->upgrade = header->upgrade; + kv_crypto_key_info->key_id = header->key_id; + kv_crypto_key_info->enc_key = header->enc_key; + kv_crypto_key_info->version = header->version; + kv_crypto_key_info->rnd = header->rnd; + kv_crypto_key_info->die_id = die_id_high32; + + return ERRCODE_SUCC; +} + +static errcode_t make_iv(uint8_t *iv, const kv_key_header_t *header, + uint32_t die_id_low32) +{ + kv_crypto_iv_info_t *kv_crypto_iv_info = + (kv_crypto_iv_info_t *)(uintptr_t)iv; + kv_crypto_iv_info->enc_key = header->enc_key; + kv_crypto_iv_info->version = header->version; + kv_crypto_iv_info->rnd = header->rnd; + kv_crypto_iv_info->die_id = die_id_low32; + return ERRCODE_SUCC; +} + +// Random OTP(16bytes) +static errcode_t get_material1(uint8_t *material1, uint16_t material1_len) +{ + errcode_t ret = ERRCODE_FAIL; + + ret = uapi_efuse_read_buffer(material1, OTP_RANDOM_POS, material1_len); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] uapi_efuse_read_buffer failed!! ret = 0x%x\r\n", ret); + return ret; + } + + return ret; +} +// salt component: sectionkey || ta_uuid; +// sectionkey component: type || owner || key_id || enc_key || version || rnd || +// DIE_ID +static errcode_t get_salt(uint8_t *salt, uint32_t salt_len, uint32_t *die_id, + const kv_key_header_t *header) +{ + errcode_t ret = ERRCODE_FAIL; + uint8_t section_key[NV_KEY_LENGTH] = {0}; + + ret = make_section_key(section_key, header, die_id[NV_DIE_ID_HIGH_32]); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] make_section_key failed! ret = 0x%x\r\n", ret); + goto err_exit; + } + if (memcpy_s(salt, salt_len, section_key, NV_KEY_LENGTH) != EOK) { + nv_log_err("[NV] memcpy_s failed!\r\n"); + goto err_exit; + } + if (memcpy_s(salt + NV_KEY_LENGTH, salt_len - NV_KEY_LENGTH, ta_uuid, sizeof(ta_uuid)) != EOK) { + nv_log_err("[NV] memcpy_s failed!\r\n"); + goto err_exit; + } + +err_exit: + (void)memset_s(section_key, sizeof(section_key), 0, sizeof(section_key)); + return ret; +} + +// Using material1(16bytes) and salt(16bytes) to derive rootkey by HKDF +static errcode_t get_password(uint8_t *password, uint32_t password_len, + const kv_key_header_t *header, uint32_t *die_id) +{ + uint8_t salt[SALT_LEN] = {0}; + uint8_t material1[MATERIAL_LEN] = {0}; + errcode_t ret = ERRCODE_FAIL; + uapi_drv_cipher_hkdf_t hkdf_param = {0}; + + ret = get_salt(salt, SALT_LEN, die_id, header); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] get salt failed!\r\n"); + goto err_exit; + } + + ret = get_material1(material1, MATERIAL_LEN); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] get material1 failed!\r\n"); + goto err_exit; + } + + hkdf_param.hmac_type = UAPI_DRV_CIPHER_HASH_TYPE_HMAC_SHA256; + hkdf_param.ikm = material1; + hkdf_param.ikm_length = MATERIAL_LEN; + hkdf_param.info = NULL; + hkdf_param.info_length = 0; + hkdf_param.salt = salt; + hkdf_param.salt_length = SALT_LEN; + + ret = uapi_drv_cipher_hkdf(&hkdf_param, password, password_len); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] uapi_drv_cipher_hkdf failed!\r\n"); + goto err_exit; + } + + ret = ERRCODE_SUCC; +err_exit: + (void)memset_s(salt, sizeof(salt), 0, sizeof(salt)); + (void)memset_s(material1, sizeof(material1), 0, sizeof(material1)); + return ret; +} + +/* 创建加解密通道 */ +errcode_t nv_crypto_claim_aes(uint32_t *crypto_handle, + const kv_key_header_t *header) +{ + uint32_t cipher = INVALID_HANDLE; + uint32_t die_id[NV_DIE_ID_LEN_WORDS] = {0}; + uint8_t password[PASSWORD_LEN] = {0}; + uint8_t iv[NV_IV_LENGTH] = {0}; + errcode_t ret; + + /* 获取Die_id */ + ret = uapi_efuse_get_die_id((uint8_t *)die_id, NV_DIE_ID_LENGTH_BYTES); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] get_die_id failed!\r\n"); + goto err_exit; + } + + /* 获取密钥 */ + ret = get_password(password, PASSWORD_LEN, header, die_id); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] get_password failed!\r\n"); + goto err_exit; + } + + /* 获取iv */ + ret = make_iv(iv, header, die_id[NV_DIE_ID_LOW_32]); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] make_iv failed!\r\n"); + goto err_exit; + } + + ret = + uapi_drv_cipher_symc_gcm_create(&cipher, password, PASSWORD_LEN, 0, iv, + sizeof(iv), NULL, 0, NV_TAG_LENGTH); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] uapi_drv_cipher_symc_gcm_create failed!\r\n"); + goto err_exit; + } + + *crypto_handle = cipher; +err_exit: + (void)memset_s(password, sizeof(password), 0, sizeof(password)); + (void)memset_s(die_id, sizeof(die_id), 0, sizeof(die_id)); + (void)memset_s(iv, sizeof(iv), 0, sizeof(iv)); + return ret; +} + +/* 释放加解密通道 */ +void nv_crypto_release_aes(uint32_t crypto_handle) +{ + if (crypto_handle != INVALID_HANDLE) { + uapi_drv_cipher_symc_gcm_destroy(crypto_handle); + } +} + +/* NV数据加密 */ +errcode_t nv_crypto_encode(uint32_t crypto_handle, const uintptr_t src, + uintptr_t dest, uint32_t length) +{ + errcode_t ret; + ret = uapi_drv_cipher_symc_gcm_encrypt_update(crypto_handle, (uint8_t *)src, + (uint8_t *)dest, length); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] encrypt failed!\r\n"); + return ret; + } + return ret; +} + +/* NV数据解密 */ +errcode_t nv_crypto_decode(uint32_t crypto_handle, const uintptr_t src, + uintptr_t dest, uint32_t length) +{ + errcode_t ret; + ret = uapi_drv_cipher_symc_gcm_decrypt_update(crypto_handle, (uint8_t *)src, + (uint8_t *)dest, length); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] decrypt failed!\r\n"); + return ret; + } + return ret; +} + +/* 获取加密Tag */ +errcode_t nv_crypto_get_tag(uint32_t crypto_handle, uint8_t *tag, + uint32_t *tag_len) +{ + errcode_t ret; + if (*tag_len < NV_TAG_LENGTH) { + return ERRCODE_NV_INVALID_PARAMS; + } + + /* get tag */ + ret = uapi_drv_cipher_symc_gcm_encrypt_get_tag(crypto_handle, tag, + NV_TAG_LENGTH); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] get tag failed!\r\n"); + return ret; + } + + *tag_len = NV_TAG_LENGTH; + return ERRCODE_SUCC; +} + +/* 设置当前NV的Tag */ +errcode_t nv_crypto_set_tag(uint32_t crypto_handle, uint8_t *tag, + uint32_t tag_len) +{ + errcode_t ret; + + ret = uapi_drv_cipher_symc_gcm_decrypt_set_tag(crypto_handle, tag, tag_len); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] set tag failed!\r\n"); + return ret; + } + + return ret; +} + +/* 校验Tag */ +errcode_t nv_crypto_validate_tag(uint32_t crypto_handle) +{ + errcode_t ret; + + ret = uapi_drv_cipher_symc_gcm_decrypt_verify_tag(crypto_handle); + if (ret != ERRCODE_SUCC) { + nv_log_err("[NV] verify tag failed!\r\n"); + return ret; + } + + return ret; +} + +/* 获取随机数 */ +void nv_crypto_generate_random(uint32_t *rnd) +{ + (void)uapi_drv_cipher_trng_get_random(rnd); +} + +/* 以下函数预留，可不实现 */ +errcode_t nv_crypto_start_hash(void) +{ + return ERRCODE_SUCC; +} + +errcode_t nv_crypto_update_hash(const uint8_t *src, uint32_t length) +{ + unused(src); + unused(length); + return ERRCODE_SUCC; +} + +errcode_t nv_crypto_complete_hash(uint8_t *hash) +{ + unused(hash); + return ERRCODE_SUCC; +} + +#endif /* #if (CONFIG_NV_SUPPORT_ENCRYPT == NV_YES) */ diff --git a/code/sdk/middleware/chips/brandy/pm/pm.c b/code/sdk/middleware/chips/brandy/pm/pm.c index 150c65d29..088827076 100644 --- a/code/sdk/middleware/chips/brandy/pm/pm.c +++ b/code/sdk/middleware/chips/brandy/pm/pm.c @@ -170,8 +170,9 @@ void uapi_sys_force_mcu_only_deep_sleep_mode(uint32_t arg) void uapi_sys_shipmode(uint32_t arg) { - uapi_calendar_calibration_enable(); - UNUSED(arg); + if (arg == 0) { + uapi_calendar_calibration_enable(); + } uint32_t irq = osal_irq_lock(); uapi_pm_control(PM_BT_POWER_OFF); uapi_pm_control(PM_DSP_POWER_OFF); @@ -213,6 +214,12 @@ void uapi_sys_shipmode(uint32_t arg) writew(0x570040e0, 0x1); osal_irq_restore(irq); } + +void uapi_sys_shipmode_no_calibration(void) +{ + uapi_sys_shipmode(1); +} + const char* pm_id_name_arr[] ={ "PM_ID_BSP", "PM_ID_SYS", -- 2.17.1