From: luozheng <1732036298@qq.com> Date: Thu, 24 Jul 2025 03:17:32 +0000 (+0800) Subject: drivers文件夹下chips文件夹合并提交 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~222 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d9a65b8cf909f8106168d15aa54079052eed6ae3;p=mirrors%2FFD230.git drivers文件夹下chips文件夹合并提交 --- diff --git a/code/sdk/drivers/chips/brandy/config/pmp_config.c b/code/sdk/drivers/chips/brandy/config/pmp_config.c index 0676c296e..d209b9802 100644 --- a/code/sdk/drivers/chips/brandy/config/pmp_config.c +++ b/code/sdk/drivers/chips/brandy/config/pmp_config.c @@ -40,18 +40,20 @@ typedef enum { BOOTROM_IDX = 0, ITCM_IDX = 1, - ITCM_SECOND_IDX = 2, - DTCM_IDX = 3, - L2RAM_IDX = 4, - SHARE_MEM_IDX = 5, - BT_RAM_APP_MAPPING_IDX = 6, - REG_ADDR_0_IDX = 7, /* reg 0x5x */ - REG_ADDR_1_IDX = 8, /* reg 0xa3 */ + DTCM_IDX = 2, + L2RAM_IDX = 3, + SHARE_MEM_IDX = 4, + BT_RAM_APP_MAPPING_IDX = 5, + REG_ADDR_0_IDX = 6, /* reg 0x5x */ + REG_ADDR_1_IDX = 7, + REG_ADDR_1_SECOND_IDX = 8, /* reg 0xa3 */ +#ifdef SUPPORT_GPU_GMMU + L2RAM_SECOND_IDX, +#endif #if defined(CONFIG_PSRAM_SUPPORT) || defined(TEST_SUITE) PSRAM_DYN_LOAD_IDX, PSRAM_TEXT_IDX, PSRAM_IDX, - PMP_DEBUG_IDX, /* pmp调测预留idx */ PSRAM_SECOND_IDX, #endif NOR_FLASH_IDX, @@ -74,22 +76,13 @@ static void pmp_init_config(void) /* ITCM 第一段 可读可执行不可写 */ g_region_attr[ITCM_IDX].idx = ITCM_IDX; - g_region_attr[ITCM_IDX].addr = APP_ITCM_ORIGIN; - g_region_attr[ITCM_IDX].size = ITCM_PMP_LENGTH; + g_region_attr[ITCM_IDX].addr = 0; + g_region_attr[ITCM_IDX].size = 0x40000; g_region_attr[ITCM_IDX].conf.pmp_attr = PMP_ATTR_NO_BUFFERABLE_AND_NO_CACHEABLE; g_region_attr[ITCM_IDX].conf.rwx_permission = (rwx_permission_t)PMPCFG_READ_ONLY_EXECUTE; g_region_attr[ITCM_IDX].conf.addr_match = PMPCFG_ADDR_MATCH_NAPOT; g_region_attr[ITCM_IDX].conf.lock = true; - /* ITCM 第二段 可读可执行不可写 */ - g_region_attr[ITCM_SECOND_IDX].idx = ITCM_SECOND_IDX; - g_region_attr[ITCM_SECOND_IDX].addr = (APP_ITCM_ORIGIN + ITCM_PMP_LENGTH); - g_region_attr[ITCM_SECOND_IDX].size = ITCM_PMP_SECOND_LENGTH; - g_region_attr[ITCM_SECOND_IDX].conf.pmp_attr = PMP_ATTR_NO_BUFFERABLE_AND_NO_CACHEABLE; - g_region_attr[ITCM_SECOND_IDX].conf.rwx_permission = (rwx_permission_t)PMPCFG_READ_ONLY_EXECUTE; - g_region_attr[ITCM_SECOND_IDX].conf.addr_match = PMPCFG_ADDR_MATCH_NAPOT; - g_region_attr[ITCM_SECOND_IDX].conf.lock = true; - /* DTCM 可读可写不可执行 */ g_region_attr[DTCM_IDX].idx = DTCM_IDX; g_region_attr[DTCM_IDX].addr = APP_DTCM_ORIGIN; @@ -101,8 +94,13 @@ static void pmp_init_config(void) /* L2MEM 可读可执行可写 no cache属性 */ g_region_attr[L2RAM_IDX].idx = L2RAM_IDX; +#ifndef CONFIG_PSRAM_SUPPORT g_region_attr[L2RAM_IDX].addr = 0x60000000; - g_region_attr[L2RAM_IDX].size = 0x2000000; + g_region_attr[L2RAM_IDX].size = 0x400000; +#else + g_region_attr[L2RAM_IDX].addr = 0x60200000; + g_region_attr[L2RAM_IDX].size = 0x200000; +#endif g_region_attr[L2RAM_IDX].conf.pmp_attr = PMP_ATTR_NO_BUFFERABLE_AND_NO_CACHEABLE; g_region_attr[L2RAM_IDX].conf.rwx_permission = (rwx_permission_t)PMPCFG_RW_EXECUTE; g_region_attr[L2RAM_IDX].conf.addr_match = PMPCFG_ADDR_MATCH_NAPOT; @@ -137,13 +135,21 @@ static void pmp_init_config(void) /* REG_ADDR_1_IDX 可读可写不可执行 不打开cache属性 */ g_region_attr[REG_ADDR_1_IDX].idx = REG_ADDR_1_IDX; - g_region_attr[REG_ADDR_1_IDX].addr = 0xA0000000; - g_region_attr[REG_ADDR_1_IDX].size = 0x20000000; + g_region_attr[REG_ADDR_1_IDX].addr = 0xA3000000; + g_region_attr[REG_ADDR_1_IDX].size = 0x10000; g_region_attr[REG_ADDR_1_IDX].conf.pmp_attr = PMP_ATTR_DEVICE_NO_BUFFERABLE; g_region_attr[REG_ADDR_1_IDX].conf.rwx_permission = (rwx_permission_t)PMPCFG_RW_NEXECUTE; g_region_attr[REG_ADDR_1_IDX].conf.addr_match = PMPCFG_ADDR_MATCH_NAPOT; g_region_attr[REG_ADDR_1_IDX].conf.lock = true; + g_region_attr[REG_ADDR_1_SECOND_IDX].idx = REG_ADDR_1_SECOND_IDX; + g_region_attr[REG_ADDR_1_SECOND_IDX].addr = 0xB0000000; + g_region_attr[REG_ADDR_1_SECOND_IDX].size = 0x10000000; + g_region_attr[REG_ADDR_1_SECOND_IDX].conf.pmp_attr = PMP_ATTR_DEVICE_NO_BUFFERABLE; + g_region_attr[REG_ADDR_1_SECOND_IDX].conf.rwx_permission = (rwx_permission_t)PMPCFG_RW_NEXECUTE; + g_region_attr[REG_ADDR_1_SECOND_IDX].conf.addr_match = PMPCFG_ADDR_MATCH_NAPOT; + g_region_attr[REG_ADDR_1_SECOND_IDX].conf.lock = true; + #if defined(CONFIG_PSRAM_SUPPORT) || defined(TEST_SUITE) /* PSRAM syn load 可读可写可执行 打开cache属性 */ g_region_attr[PSRAM_DYN_LOAD_IDX].idx = PSRAM_DYN_LOAD_IDX; @@ -209,18 +215,22 @@ void pmp_init(void) void pmp_gpu_psram_init(void) { -#if defined(SUPPORT_PMP_DEBUG) && defined(CONFIG_PSRAM_SUPPORT) - pmp_conf_t gpu_psram_pmp_region_attr[1] = {0}; - - /* PSRAM 第GPU段 可读不可写不可执行 关闭cache属性 */ - gpu_psram_pmp_region_attr[0].idx = PMP_DEBUG_IDX; - gpu_psram_pmp_region_attr[0].addr = PSRAM_GPU_ADDR_START; - gpu_psram_pmp_region_attr[0].size = PSRAM_GPU_ADDR_LEN; - gpu_psram_pmp_region_attr[0].conf.pmp_attr = PMP_ATTR_NO_BUFFERABLE_AND_NO_CACHEABLE; - gpu_psram_pmp_region_attr[0].conf.rwx_permission = (rwx_permission_t)PMPCFG_READ_ONLY_NEXECUTE; - gpu_psram_pmp_region_attr[0].conf.addr_match = PMPCFG_ADDR_MATCH_NAPOT; - gpu_psram_pmp_region_attr[0].conf.lock = true; - - uapi_pmp_config(gpu_psram_pmp_region_attr, 1); -#endif + } + +#ifdef SUPPORT_GPU_GMMU +void pmp_configure_gmmu_region(int32_t flag) +{ + pmp_conf_t gpu_gmmu_pmp_region_attr[1] = {0}; + gpu_gmmu_pmp_region_attr[0].idx = L2RAM_SECOND_IDX; + if (flag) { + gpu_gmmu_pmp_region_attr[0].addr = 0x61000000; + gpu_gmmu_pmp_region_attr[0].size = 0x1000000; + gpu_gmmu_pmp_region_attr[0].conf.pmp_attr = PMP_ATTR_NO_BUFFERABLE_AND_NO_CACHEABLE; + gpu_gmmu_pmp_region_attr[0].conf.rwx_permission = (rwx_permission_t)PMPCFG_RW_EXECUTE; + gpu_gmmu_pmp_region_attr[0].conf.addr_match = PMPCFG_ADDR_MATCH_NAPOT; + gpu_gmmu_pmp_region_attr[0].conf.lock = 0; + } + uapi_pmp_config(gpu_gmmu_pmp_region_attr, 1); +} +#endif diff --git a/code/sdk/drivers/chips/brandy/config/pmp_config.h b/code/sdk/drivers/chips/brandy/config/pmp_config.h index 210fb893d..52a95109b 100644 --- a/code/sdk/drivers/chips/brandy/config/pmp_config.h +++ b/code/sdk/drivers/chips/brandy/config/pmp_config.h @@ -18,6 +18,10 @@ void pmp_init(void); void pmp_gpu_psram_init(void); +#ifdef SUPPORT_GPU_GMMU +void pmp_configure_gmmu_region(int32_t flag); +#endif + /** * @} */ diff --git a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c index dc932567c..4ae9e54c0 100644 --- a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c +++ b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c @@ -347,11 +347,13 @@ uint32_t uart_port_get_clock_value(uart_bus_t bus) void uart_port_config_pinmux(uart_bus_t bus) { - UNUSED(bus); - uapi_pin_set_mode(g_uart_config[UART_BUS_1].pin.tx_pin, g_uart_config[UART_BUS_1].pin_mode.tx_pin_mode); - uapi_pin_set_mode(g_uart_config[UART_BUS_1].pin.rx_pin, g_uart_config[UART_BUS_1].pin_mode.rx_pin_mode); - uapi_pin_set_mode(g_uart_config[UART_BUS_0].pin.tx_pin, g_uart_config[UART_BUS_0].pin_mode.tx_pin_mode); - uapi_pin_set_mode(g_uart_config[UART_BUS_0].pin.rx_pin, g_uart_config[UART_BUS_0].pin_mode.rx_pin_mode); + if (bus == UART_BUS_1) { + uapi_pin_set_mode(g_uart_config[UART_BUS_1].pin.tx_pin, g_uart_config[UART_BUS_1].pin_mode.tx_pin_mode); + uapi_pin_set_mode(g_uart_config[UART_BUS_1].pin.rx_pin, g_uart_config[UART_BUS_1].pin_mode.rx_pin_mode); + } else if (bus == UART_BUS_0) { + uapi_pin_set_mode(g_uart_config[UART_BUS_0].pin.tx_pin, g_uart_config[UART_BUS_0].pin_mode.tx_pin_mode); + uapi_pin_set_mode(g_uart_config[UART_BUS_0].pin.rx_pin, g_uart_config[UART_BUS_0].pin_mode.rx_pin_mode); + } } void uart_port_register_irq(uart_bus_t bus)